Changeset 382

Timestamp:

09/27/08 11:10:33 (2 months ago)

Author:

psmedley

Message:

Reinstate support for emu10k1 cards

Location:

GPL/branches/uniaud32-2.0

Files:

• alsa-kernel/include/sound/config.h (modified) (2 diffs)
• alsa-kernel/pci/emu10k1/memory.c (modified) (2 diffs)
• alsa-kernel/pci/makefile.os2 (modified) (2 diffs)
• drv32/makefile.os2 (modified) (1 diff)
• lib32/ossidc.cpp (modified) (2 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/include/sound/config.h

@@ -575 +575 @@
 
 #define assert(a)
-#define CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
-#define CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
 
 #ifndef fastcall
@@ -620 +618 @@
 #endif
 
+#define GFP_DMA32 0             /* driver must check for 32-bit address */
+#define __GFP_COMP      0
+#define __GFP_NOWARN    0
+#define __GFP_NORETRY   0
+
+#define page_to_pfn(page)       (page_to_phys(page) >> PAGE_SHIFT)
+
 #endif //__ALSA_CONFIG_H__

GPL/branches/uniaud32-2.0/alsa-kernel/pci/emu10k1/memory.c

@@ -456 +456 @@
 static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
 {
+#ifndef TARGET_OS2
         int page, first_page, last_page;
 
@@ -481 +482 @@
         }
         return 0;
+#else
+    int page, first_page, last_page;
+    struct snd_dma_buffer dmab;
+
+    emu10k1_memblk_init(blk);
+    get_single_page_range(emu->memhdr, blk, &first_page, &last_page);
+    /* allocate kernel pages */
+    for (page = first_page; page <= last_page; page++) {
+        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci),
+                                PAGE_SIZE, &dmab) < 0)
+            goto __fail;
+        if (! is_valid_page(emu, dmab.addr)) {
+            snd_dma_free_pages(&dmab);
+            goto __fail;
+        }
+        emu->page_addr_table[page] = dmab.addr;
+        emu->page_ptr_table[page] = dmab.area;
+    }
+    return 0;
+
+__fail:
+    /* release allocated pages */
+    last_page = page - 1;
+    for (page = first_page; page <= last_page; page++) {
+        dmab.area = emu->page_ptr_table[page];
+        dmab.addr = emu->page_addr_table[page];
+        dmab.bytes = PAGE_SIZE;
+        snd_dma_free_pages(&dmab);
+        emu->page_addr_table[page] = 0;
+        emu->page_ptr_table[page] = NULL;
+    }
+
+    return -ENOMEM;
+#endif
 }
 

GPL/branches/uniaud32-2.0/alsa-kernel/pci/makefile.os2

@@ -66 +66 @@
     @echo BUILDING emu10k1
     @cd emu10k1
-#    @wmake $(NMAKEOPTS)
+    @wmake $(NMAKEOPTS)
     @cd ..
     @echo BUILDING ca0106
@@ -101 +101 @@
 
 clean: .SYMBOLIC
+    @echo CLEANING hda
+    @cd hda
+    @wmake $(NMAKEOPTS) clean
+    @cd ..
     @echo CLEANING ac97
     @cd ac97

GPL/branches/uniaud32-2.0/drv32/makefile.os2

@@ -69 +69 @@
 FILES    = $(FILEFIRST) $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10)
 
-LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib 
+LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib 
 WMAPNAME = $(OBJDIR)\$(TARGET).wmap
 # $(ALSA_LIB)\au88xx.lib 

GPL/branches/uniaud32-2.0/lib32/ossidc.cpp

@@ -166 +166 @@
     }
 
-#if 0
+
     if((ForceCard == CARD_NONE || ForceCard == CARD_SBLIVE) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_emu10k1_init) == 0)
@@ -172 +172 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_emu10k1_exit);
     }
-#endif
+
     if((ForceCard == CARD_NONE || ForceCard == CARD_CMEDIA) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cmipci_init) == 0)