Changeset 523

Timestamp:

Jul 22, 2010, 7:29:34 PM (15 years ago)

Author:

David Azarewicz

Message:

flush_workqueue hack, misc code cleanups

Location:

GPL/branches/uniaud32-2.1.x

Files:

• alsa-kernel/core/device.c (modified) (1 diff)
• alsa-kernel/include/sound/config.h (modified) (1 diff)
• alsa-kernel/pci/emu10k1/memory.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_hwdep.c (modified) (1 diff)
• drv32/strategy.c (modified) (3 diffs)
• include/dbgos2.h (modified) (1 diff)
• lib32/misc.c (modified) (2 diffs)
• lib32/ossidc.cpp (modified) (3 diffs)
• lib32/pci.c (modified) (1 diff)
• uniaud.inc (modified) (1 diff)

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/device.c

@@ -87 +87 @@
                 /* unlink */
                 list_del(&dev->list);
-                if (dev->state == SNDRV_DEV_REGISTERED &&
-                    dev->ops->dev_disconnect)
+                if (dev->state == SNDRV_DEV_REGISTERED && dev->ops->dev_disconnect) {
                         if (dev->ops->dev_disconnect(dev))
-                                snd_printk(KERN_ERR
-                                           "device disconnect failure\n");
+                                snd_printk(KERN_ERR "device disconnect failure\n");
+                }
                 if (dev->ops->dev_free) {
                         if (dev->ops->dev_free(dev))

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

@@ -84 +84 @@
 #define CONFIG_PM
 #define CONFIG_PROC_FS
+#ifdef DEBUG
 #define CONFIG_SND_DEBUG_DETECT
 #define CONFIG_SND_DEBUG_VERBOSE
+#endif
 #define CONFIG_SND_DMA_SGBUF
 #define CONFIG_SND_HDA_CODEC_ANALOG

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

@@ -304 +304 @@
         if (snd_BUG_ON(!emu))
                 return NULL;
-        if (snd_BUG_ON(runtime->dma_bytes == 0 ||
+        if (snd_BUG_ON(runtime->dma_bytes == 0 || /* DAZ was unsigned <= 0 */
                        runtime->dma_bytes >= MAXPAGES * EMUPAGESIZE))
                 return NULL;

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/hda_hwdep.c

@@ -100 +100 @@
 {
 #ifndef CONFIG_SND_DEBUG_VERBOSE
-        if (!capable(CAP_SYS_RAWIO))
-                return -EACCES;
+//      if (!capable(CAP_SYS_RAWIO))
+//              return -EACCES;
 #endif
         return 0;

GPL/branches/uniaud32-2.1.x/drv32/strategy.c

@@ -70 +70 @@
         RPInit __far* rp = (RPInit __far*)_rp;
         rc = DiscardableInit(rp);
-        dprintf(("StratInit End rc=%d", rc));
+        //dprintf(("StratInit End rc=%d", rc));
         return rc;
 }
@@ -119 +119 @@
 #endif
 //PS++ End
-        dprintf(("StratInitComplete"));
-  return(RPDONE);
+        //dprintf(("StratInitComplete"));
+        return(RPDONE);
 }
 //******************************************************************************
@@ -130 +130 @@
         RPShutdown __far *rp = (RPShutdown __far *)_rp;
 
-        dprintf(("StratShutdown Start %d", rp->Function));
+        //dprintf(("StratShutdown %d", rp->Function));
         if(rp->Function == 1) {//end of shutdown
                 OSS32_Shutdown();
         }
-        dprintf(("StratShutdown End"));
-  return(RPDONE);
+        return(RPDONE);
 }
 //******************************************************************************

GPL/branches/uniaud32-2.1.x/include/dbgos2.h

@@ -32 +32 @@
 extern int wrOffset;
 extern char *szprintBuf;
-//void _cdecl DPE(char *x, ...) ; /* not debugging: nothing */
 int _cdecl printk(const char * fmt, ...);
 #ifdef __cplusplus

GPL/branches/uniaud32-2.1.x/lib32/misc.c

@@ -269 +269 @@
 void flush_workqueue(struct workqueue_struct *wq)
 {
+        short sDAZ;
+
         if (wq->task == current) {
                 run_workqueue(wq);
@@ -278 +280 @@
                 spin_lock_irq(&wq->lock);
                 add_wait_queue(&wq->work_done, &wait);
+                sDAZ = 0;
                 while (!list_empty(&wq->worklist)) {
+                        if (sDAZ++ > 20) { // Temporary hack to prevent system hangs
+                                rprintf(("flush_workqueue: can't empty list"));
+                                break;
+                        }                       
                         spin_unlock_irq(&wq->lock);
-                        schedule();
+                        schedule();  // DAZ system hangs here because this function does nothing
                         spin_lock_irq(&wq->lock);
                 }

GPL/branches/uniaud32-2.1.x/lib32/ossidc.cpp

@@ -162 +162 @@
                         FillCaps(i);
                 }
-                dprintf(("OSS32_Initialize: SUCCESS. Cards=%d", nrCardsDetected));
+                rprintf(("OSS32_Initialize: SUCCESS. Cards=%d", nrCardsDetected));
                 return OSSERR_SUCCESS;
         }
@@ -173 +173 @@
 OSSRET OSS32_Shutdown()
 {
-        dprintf(("OSS32_Shutdown 1"));
         CallOSS16(IDC16_EXIT, 0, 0);
-        dprintf(("OSS32_Shutdown 2"));
 
         for(int i=0;i<nrCardsDetected;i++) {
@@ -181 +179 @@
         }
 
-        dprintf(("OSS32_Shutdown 3"));
         call_module_exit(alsa_mpu401_uart_exit);
-        dprintf(("OSS32_Shutdown 4"));
         call_module_exit(alsa_opl3_seq_exit);
-        dprintf(("OSS32_Shutdown 5"));
         call_module_exit(alsa_opl3_exit);
-        dprintf(("OSS32_Shutdown 6"));
         call_module_exit(alsa_seq_exit);
-        dprintf(("OSS32_Shutdown 7"));
         call_module_exit(alsa_rawmidi_exit);
-        dprintf(("OSS32_Shutdown 8"));
         call_module_exit(alsa_timer_exit);
-        dprintf(("OSS32_Shutdown 9"));
         call_module_exit(alsa_hwdep_exit);
-        dprintf(("OSS32_Shutdown 10"));
         call_module_exit(alsa_pcm_exit);
-        dprintf(("OSS32_Shutdown 11"));
         call_module_exit(alsa_sound_exit);
-        dprintf(("OSS32_Shutdown 12"));
 
         return OSSERR_SUCCESS;

GPL/branches/uniaud32-2.1.x/lib32/pci.c

@@ -547 +547 @@
 {
         struct pci_dev *pcidev;
-        int i = 0, j;
-
-        while(driver->id_table[i].vendor)
-        {
-                for(j=0;j<MAX_PCI_DEVICES;j++)
-                {
-                        if(pci_devices[j].vendor == driver->id_table[i].vendor &&
-                           pci_devices[j].device == driver->id_table[i].device)
-                        {
-                                if(driver->remove) {
-                                        driver->remove(&pci_devices[j]);
-                                }
-                        }
-                }
-                i++;
+        int i, j;
+
+        for (i=0; driver->id_table[i].vendor; i++) {
+                for(j=0; j<MAX_PCI_DEVICES; j++) {
+                        pcidev = &pci_devices[j];
+                        if (pcidev->devfn == 0) continue;
+                        if(pcidev->vendor != driver->id_table[i].vendor) continue;
+                        if ( (driver->id_table[i].device != PCI_ANY_ID) && (pcidev->device != driver->id_table[i].device) ) continue;
+                        dprintf(("pci unreg match: %x:%x %x:%x", pci_devices[j].vendor, pci_devices[j].device, driver->id_table[i].vendor, driver->id_table[i].device));
+                        if(!driver->remove) continue;
+                        driver->remove(pcidev);
+                }
         }
         return 0;

GPL/branches/uniaud32-2.1.x/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = BETA SVNr519
+FIXPACK = BETA SVNr523
 
 # ALSA BUILD VERSION