Changeset 530

Timestamp:

Jul 27, 2010, 6:32:21 PM (15 years ago)

Author:

David Azarewicz

Message:

pci bus scan changes, xrun recovery

Location:

GPL/trunk

Files:

• lib32/misc.c (modified) (2 diffs)
• lib32/pci.c (modified) (6 diffs)
• lib32/sound.c (modified) (7 diffs)
• uniaud.inc (modified) (2 diffs)

GPL/trunk/lib32/misc.c

@@ -269 +269 @@
 void flush_workqueue(struct workqueue_struct *wq)
 {
-        short sDAZ;
 
         if (wq->task == current) {
@@ -280 +279 @@
                 spin_lock_irq(&wq->lock);
                 add_wait_queue(&wq->work_done, &wait);
-                sDAZ = 0;
+#ifndef TARGET_OS2
                 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();  // DAZ system hangs here because this function does nothing
                         spin_lock_irq(&wq->lock);
                 }
+#endif
                 set_current_state(TASK_RUNNING);
                 remove_wait_queue(&wq->work_done, &wait);

GPL/trunk/lib32/pci.c

@@ -41 +41 @@
 #include <osspci.h>
 
-#define MAX_PCI_BUSSES          16
+#define MAX_PCI_BUSSES          256
 #define MAX_PCI_DEVICES         16
 
 struct pci_dev pci_devices[MAX_PCI_DEVICES] = {0};
-struct pci_bus pci_busses[MAX_PCI_BUSSES] = {0};
+//struct pci_bus pci_busses[MAX_PCI_BUSSES] = {0};
 
 BOOL    fSuspended = FALSE;
@@ -158 +158 @@
         u8              headerType;
 
-        busNr = (ulLast >> 8) & 0x1f;
+        busNr = (ulLast >> 8) & 0xff;
         devNr = PCI_SLOT(ulLast);
         funcNr = PCI_FUNC(ulLast);
@@ -200 +200 @@
                                 pcidev->vendor          = detectedId & 0xffff;
                                 pcidev->device          = detectedId >> 16;
-                                pcidev->bus             = &pci_busses[busNr];
+                                //pcidev->bus           = &pci_busses[busNr];
+                                pcidev->bus             = kmalloc(sizeof(struct pci_bus), GFP_KERNEL);
+                                if (pcidev->bus == NULL) return 0;
+                                memset (pcidev->bus, 0, sizeof(struct pci_bus));
                                 pcidev->bus->number = busNr;
                                 pcidev->devfn           = PCI_DEVFN(devNr, funcNr);
@@ -507 +510 @@
                 while( (ulLast = pci_query_device(&driver->id_table[iTableIx], pcidev, ulLast)) ) {
 
-
                         RMInit();
                         dprintf(("pci_register_driver: found=%x:%x searching for %x:%x\n",
@@ -526 +528 @@
                                 if (iTmp >= MAX_PCI_DEVICES) break;
                                 pcidev = &pci_devices[iTmp];
-                        } else pcidev->devfn = 0;
+                        } else {
+                                kfree(pcidev->bus);
+                                pcidev->devfn = 0;
+                        }
 
                         RMDone(0);
@@ -553 +558 @@
                         pcidev = &pci_devices[j];
                         if (pcidev->devfn == 0) continue;
-                        if(pcidev->vendor != driver->id_table[i].vendor) 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);
+                        if (driver->remove) driver->remove(pcidev);
+                        kfree(pcidev->bus);
+                        pcidev->devfn = 0;
                 }
         }

GPL/trunk/lib32/sound.c

@@ -1104 +1104 @@
 
                 if (ulSize == 0) {
-                        rprintf(("OSS32_WaveAddBuffer: no room left in hardware buffer!!\n"));
-                        rprintf(("state=%x avail=%x ReqSize=%x\n", status.state, status.avail, ulReqSize));
+                        rprintf(("OSS32_WaveAddBuffer: no room left in hardware buffer!!"));
+                        rprintf(("state=%x avail=%x ReqSize=%x", status.state, status.avail, ulReqSize));
                         *pulTransferred = 0;
                         return OSSERR_BUFFER_FULL;
                 }
 
+                //rprintf(("AddBuffer: state=%x avail=%x ReqSize=%x", status.state, status.avail, ulReqSize));
                 if (status.state == SNDRV_PCM_STATE_XRUN) {
-                        rprintf(("Internal Error: Xrun\n"));
+                        rprintf(("Internal Error: Xrun"));
+                        iRet = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+                        if (iRet < 0) {
+                                rprintf(("Prepare failed: state=%x avail=%x ReqSize=%x", status.state, status.avail, ulReqSize));
+                                return UNIXToOSSError(iRet);
+                        }
+                        iRet = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+                        rprintf(("Xrun restarted: state=%x avail=%x ReqSize=%x", status.state, status.avail, ulReqSize));
+                        if (iRet < 0) return UNIXToOSSError(iRet);
                 }
 
                 iRet = pHandle->file.f_op->write(&pHandle->file, (char *)ulBuffer, ulSize, &pHandle->file.f_pos);
 
-                if (iRet != ulSize) rprintf(("WaveAddBuffer: ReqSize=%x Size=%x iRet=%x\n", ulReqSize, ulSize, iRet));
-
-                if (iRet < 0 ) break;
+                if (iRet != ulSize) rprintf(("WaveAddBuffer: ReqSize=%x Size=%x iRet=%x", ulReqSize, ulSize, iRet));
+
+                if (iRet < 0) return UNIXToOSSError(iRet);
                 ulTransferred = iRet;
 #else
@@ -1126 +1135 @@
                 ulSize = min(ulReqSize, samples_to_bytes(status.avail));
 
-                //printk("OSS32_WaveAddBuffer N:%d hw=%x app=%x avail=%x req size=%x size=%x\n",
+                //printk("OSS32_WaveAddBuffer N:%d hw=%x app=%x avail=%x req size=%x size=%x",
                 //      CountWv, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), ulSize, ulReqSize);
 
                 if (ulSize == 0) {
-                        rprintf(("OSS32_WaveAddBuffer: no room left in hardware buffer!!\n"));
-                        rprintf(("state=%x avail=%x SizeReq=%x\n", status.state, status.avail, ulReqSize));
+                        rprintf(("OSS32_WaveAddBuffer: no room left in hardware buffer!!"));
+                        rprintf(("state=%x avail=%x SizeReq=%x", status.state, status.avail, ulReqSize));
                         *pulTransferred = 0;
                         return OSSERR_BUFFER_FULL;
                 }
 
-                rprintf(("WaveAddBuffer: ReqSize=%x Size=%x\n", ulReqSize, ulSize));
+                rprintf(("WaveAddBuffer: ReqSize=%x Size=%x", ulReqSize, ulSize));
 
                 // size should be aligned to channels number * samplesize  //PS+++ what is it and why?!?!?!
@@ -1147 +1156 @@
                                 if ((status.state != SNDRV_PCM_STATE_XRUN ) && samples_to_bytes(status.avail) ) break;
                                 if (status.state == SNDRV_PCM_STATE_XRUN) {
-                                        rprintf(("Internal Error: Xrun\n"));
+                                        rprintf(("Internal Error: Xrun"));
                                 }
                                 if (ulI > 998) {
@@ -1156 +1165 @@
 
                         if (iRet1 < 0) {
-                                rprintf(("iRet1=%i trans=%x ReqSize=%x Size=%x\n", iRet1, ulTransferred, ulReqSize, ulSize));
+                                rprintf(("iRet1=%i trans=%x ReqSize=%x Size=%x", iRet1, ulTransferred, ulReqSize, ulSize));
                                 break;     // We have any global error, don't try more
                         }
@@ -1176 +1185 @@
                         }
                         ulTransferred += iRet;
-                        // printk("written: now: %d, trans: %d need %d tot:%d\n", iRet, ulTransferred, ulReqSize,ulSize);
+                        // printk("written: now: %d, trans: %d need %d tot:%d", iRet, ulTransferred, ulReqSize,ulSize);
                         ulBuffer += iRet;
                         if (ulSize > iRet) ulSize       -= iRet;
@@ -1184 +1193 @@
                 break;
         case SNDRV_MINOR_PCM_CAPTURE:
-                //printk("OSS32_WaveAddBuffer N:%d state=%x hw=%x app=%x avail=%x size=%x\n",
+                //printk("OSS32_WaveAddBuffer N:%d state=%x hw=%x app=%x avail=%x size=%x",
                 //      CountWv, status.state, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), ulReqSize);
 //              Need to handle overrun condition when reading
@@ -1208 +1217 @@
 //        if (*pulTransferred < ulSize)
 //        {
-//                printk("warning: ulTransferred [%d] less than requested [%d]\n", *pulTransferred, ulSize);
+//                printk("warning: ulTransferred [%d] less than requested [%d]", *pulTransferred, ulSize);
 //                iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
 //        }

GPL/trunk/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # It is best that 2'nd number is always 2 digits, eg at least 10
-BUILDVERSION = 1.9.23
+BUILDVERSION = 1.9.24
 
 # Fixpack version
@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVN r522
+FIXPACK = SVN r530
 
 # ALSA BUILD VERSION