Changeset 319

Timestamp:

03/25/08 00:48:35 (8 months ago)

Author:

psmedley

Message:

Cleanups + reinstante bt87x support

Location:

GPL/branches/uniaud-2.0

Files:

• alsa-kernel/core/hwdep.c (modified) (1 diff)
• alsa-kernel/core/misc.inc (modified) (2 diffs)
• alsa-kernel/core/pcm_native.c (modified) (3 diffs)
• alsa-kernel/core/timer.c (modified) (1 diff)
• alsa-kernel/include/sound/pcm.h (modified) (1 diff)
• alsa-kernel/pci/bt87x.c (modified) (5 diffs)
• alsa-kernel/pci/makefile.os2 (modified) (1 diff)
• include/linux/kernel.h (modified) (1 diff)
• lib32/ossidc.cpp (modified) (2 diffs)

GPL/branches/uniaud-2.0/alsa-kernel/core/hwdep.c

@@ -343 +343 @@
  */
 
+#ifndef TARGET_OS2
 static const struct file_operations snd_hwdep_f_ops =
+#else
+static struct file_operations snd_hwdep_f_ops =
+#endif
 {
 #ifndef TARGET_OS2

GPL/branches/uniaud-2.0/alsa-kernel/core/misc.inc

@@ -251 +251 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 45)
 
-static int work_caller(void *data)
-{
-        struct work_struct *works = data;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 8)
-        reparent_to_init();
-#endif
-        strcpy(current->comm, "snd"); /* FIXME: different names? */
-
-        works->func(works->data);
-
-        return 0;
-}
-
 #ifndef TARGET_OS2
 int snd_compat_schedule_work(struct work_struct *works)
@@ -337 +323 @@
 }
 
-static int xworker_thread(void *data)
-{
-        struct workqueue_struct *wq = data;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 8)
-        reparent_to_init();
-#endif
-        strcpy(current->comm, wq->name);
-
-        do {
-                run_workqueue(wq);
-                wait_event_interruptible(wq->more_work, !list_empty(&wq->worklist));
-        } while (!signal_pending(current));
-
-        complete_and_exit(&wq->thread_exited, 0);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0)
-        return 0;
-#endif
-}
-
 struct workqueue_struct *snd_compat_create_workqueue(const char *name)
 {

GPL/branches/uniaud-2.0/alsa-kernel/core/pcm_native.c

@@ -2860 +2860 @@
 }
 
+#ifdef SND_PCM_USE_READV
 #ifdef SND_PCM_USE_AIO
 static ssize_t snd_pcm_aio_read(struct kiocb *iocb, const struct iovec *iov,
@@ -2949 +2950 @@
         return result;
 }
+#endif /* SND_PCM_USE_READV */
 
 static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait)
@@ -3459 +3461 @@
  */
 
+#ifndef TARGET_OS2
 const struct file_operations snd_pcm_f_ops[2] = {
+#else
+struct file_operations snd_pcm_f_ops[2] = {
+#endif
         {
 #ifndef TARGET_OS2

GPL/branches/uniaud-2.0/alsa-kernel/core/timer.c

@@ -1946 +1946 @@
 #endif
 
+#ifndef TARGET_OS2
 static const struct file_operations snd_timer_f_ops =
+#else
+static struct file_operations snd_timer_f_ops =
+#endif
 {
 #ifndef TARGET_OS2

GPL/branches/uniaud-2.0/alsa-kernel/include/sound/pcm.h

@@ -445 +445 @@
  */
 
+#ifndef TARGET_OS2
 extern const struct file_operations snd_pcm_f_ops[2];
+#else
+extern struct file_operations snd_pcm_f_ops[2];
+#endif
 
 int snd_pcm_new(struct snd_card *card, char *id, int device,

GPL/branches/uniaud-2.0/alsa-kernel/pci/bt87x.c

@@ -22 +22 @@
  */
 
+#ifdef TARGET_OS2
+#include <asm/bitops.h>
+#endif
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -41 +44 @@
                 "{Brooktree,Bt879}}");
 
+#ifndef TARGET_OS2
 static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -2}; /* Exclude the first card */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
+#else
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
+#endif
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
 static int digital_rate[SNDRV_CARDS];   /* digital input rate */
@@ -818 +826 @@
         /* Pinnacle  Studio PCTV rave */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0xbd11, 0x1200, GENERIC),
-        { }
+        {0}
 };
 MODULE_DEVICE_TABLE(pci, snd_bt87x_ids);
@@ -847 +855 @@
         int i;
         const struct pci_device_id *supported;
-
+#ifdef TARGET_OS2
+        u16 subsystem_vendor, subsystem_device;
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
         supported = pci_match_id(snd_bt87x_ids, pci);
+#else
+        supported = pci_match_device(snd_bt87x_ids, pci);
+#endif
         if (supported && supported->driver_data > 0)
                 return supported->driver_data;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 0)
+        subsystem_vendor = pci->subsystem_vendor;
+        subsystem_device = pci->subsystem_device;
+#else
+        pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
+        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
+#endif
         for (i = 0; i < ARRAY_SIZE(blacklist); ++i)
+#ifndef TARGET_OS2
                 if (blacklist[i].subvendor == pci->subsystem_vendor &&
                     blacklist[i].subdevice == pci->subsystem_device) {
+#else
+                if (blacklist[i].subvendor == subsystem_vendor &&
+                    blacklist[i].subdevice == subsystem_device) {
+#endif
                         snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n",
+#ifndef TARGET_OS2
                                     pci->device, pci->subsystem_vendor, pci->subsystem_device);
+#else
+                                    pci->device, subsystem_vendor, subsystem_device);
+#endif
                         return -EBUSY;
                 }
 
         snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x\n",
+#ifndef TARGET_OS2
                    pci->device, pci->subsystem_vendor, pci->subsystem_device);
+#else
+                   pci->device, subsystem_vendor, subsystem_device);
+#endif
         snd_printk(KERN_DEBUG "please mail id, board name, and, "
                    "if it works, the correct digital_rate option to "
@@ -965 +1000 @@
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
-        { }
+        {0}
 };
 

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

@@ -34 +34 @@
 FILE1    = pci_iomap_compat.obj ens1370.obj ens1371.obj cs4281.obj  es1938.obj
 FILE2    = es1968.obj intel8x0.obj maestro3.obj via82xx.obj 
-FILE3    = fm801.obj atiixp.obj cmipci.obj als4000.obj
+FILE3    = fm801.obj atiixp.obj cmipci.obj als4000.obj bt87x.obj
 FILE4    =  
 FILE5    = 

GPL/branches/uniaud-2.0/include/linux/kernel.h

@@ -98 +98 @@
 };
 
+static void complete_and_exit(struct completion *, long);
+
 #endif

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

@@ -259 +259 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);
     }
-#if 0
     if((ForceCard == CARD_NONE || ForceCard == CARD_BT87X) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_bt87x_init) == 0)
@@ -265 +264 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_bt87x_exit);
     }
-#endif
 #endif
     fStrategyInit = FALSE;