Changeset 592

Timestamp:

Mar 9, 2017, 1:01:06 AM (8 years ago)

Author:

David Azarewicz

Message:

Remove dead code. update build system. Fix api interrupt defect.

Location:

GPL/branches/uniaud32-2.1.x

Files:

• alsa-kernel/core/memalloc.c (modified) (1 diff)
• alsa-kernel/core/pcm_lib.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_intel.c (modified) (2 diffs)
• drv32/Makefile (modified) (1 diff)
• drv32/idc.c (modified) (2 diffs)
• drv32/strategy.c (modified) (2 diffs)
• lib32/pci.c (modified) (5 diffs)
• uniaud.inc (modified) (1 diff)

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

@@ -216 +216 @@
                         struct snd_dma_buffer *dmab)
 {
-    dprintf(("snd_dma_alloc_pages with size = %d", size));
+    dprintf(("snd_dma_alloc_pages with size = %d",size));
         if (WARN_ON(!size))
                 return -ENXIO;

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

@@ -1728 +1728 @@
         struct snd_pcm_runtime *runtime;
         unsigned long flags;
-
+        
         if (PCM_RUNTIME_CHECK(substream))
                 return;

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

@@ -495 +495 @@
         [AZX_DRIVER_ULI] = "HDA ULI M5461",
         [AZX_DRIVER_NVIDIA] = "HDA NVidia",
-        [AZX_DRIVER_TERA] = "HDA Teradici", 
-        [AZX_DRIVER_CTX] = "HDA Creative", 
+        [AZX_DRIVER_TERA] = "HDA Teradici",
+        [AZX_DRIVER_CTX] = "HDA Creative",
         [AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
@@ -1971 +1971 @@
         if (WARN_ONCE(!azx_dev->period_bytes,
                       "hda-intel: zero azx_dev->period_bytes"))
+                return -1; /* this shouldn't happen! */
 #endif
-                return -1; /* this shouldn't happen! */
         if (wallclk < (azx_dev->period_wallclk * 5) / 4 &&
             pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)

GPL/branches/uniaud32-2.1.x/drv32/Makefile

@@ -105 +105 @@
 $(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
   @%create $(DEFFILE)
-  $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 and eCS (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
+  $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
   $(LINK) @$(LNKFILE)
   copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)

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

@@ -40 +40 @@
 extern int pcm_device;
 WORD32 OSS32IDC(ULONG cmd, PIDC32_PACKET pPacket);
-extern BOOL fRewired; //pci.c
 
 //packet pointer must reference a structure on the stack
@@ -50 +49 @@
     ULONG  oldfileid;
     OSSRET rc;
-
-        if (fRewired) {
-                fRewired = FALSE;
-                rprintf(("AlsaIDC: Resuming"));
-                OSS32_APMResume();
-                DbgPrintIrq();
-        }
 
     //Sets file id in current task structure

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

@@ -43 +43 @@
 ULONG deviceOwner = DEV_NO_OWNER;
 ULONG numOS2Opens = 0;
-extern BOOL fRewired; //pci.c
 
 extern DBGINT DbgInt;
@@ -170 +169 @@
 ULONG Strategy(REQPACKET __far* rp)
 {
-  if (fRewired)
-  {
-    fRewired = FALSE;
-    rprintf(("Strategy: Resuming"));
-    OSS32_APMResume();
-    DbgPrintIrq();
-  }
-
   if (rp->bCommand < sizeof(StratDispatch)/sizeof(StratDispatch[0])) return(StratDispatch[rp->bCommand](rp));
   else return(RPERR_BADCOMMAND | RPDONE);

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

@@ -47 +47 @@
 //struct pci_bus pci_busses[MAX_PCI_BUSSES] = {0};
 
-BOOL    fRewired = FALSE;
 extern int nrCardsDetected;
 
@@ -55 +54 @@
 #define PCI_CONFIG_DATA                 0xCFC
 
-#ifdef ACPI
-APIRET APIENTRY ACPIFindPCIDevice(ULONG Bus, ULONG Dev, ULONG Fun, ULONG *PicIRQ, ULONG *ApicIRQ, ULONG *Hdl, char *Component);
-#endif
-
 //******************************************************************************
 #define CONFIG_CMD(dev, where)  \
@@ -140 +135 @@
         int             resNo, addr;
         u32 devNr, busNr, funcNr, detectedId, cfgaddrreg, ulPciAdr, ulTmp1, ulTmp2;
-#ifdef ACPI
-        APIRET                   rc;
-        ULONG                    PicIRQ, ApicIRQ;
-#endif
         u8              headerType;
 
@@ -239 +230 @@
                                 pci_read_config_dword(pcidev, PCI_INTERRUPT_LINE, &ulTmp1);
                                 rprintf(("pci_query_device: PCI config IRQ=%d", ulTmp1&0xff));
-#ifdef ACPI
-                                rc = ACPIFindPCIDevice( (ULONG)busNr,                                            // Bus
-                                                                                (ULONG)devNr,                                            // Dev
-                                                                                (ULONG)(pcidev->devfn >> 8) & 7,         // Function
-                                                                                &PicIRQ,                                                         // PIC IRQ
-                                                                                &ApicIRQ,                                                        // APIC IRQ
-                                                                                NULL,                                                            // ACPI handle to finding device
-                                                                                "Uniaud32");                                             // Name for acpi log
-                                if (!rc) {
-                                        if (PicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (PicIRQ & 0xff); // Choose Pic interrupt for init time processing
-                                        else if (ApicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (ApicIRQ & 0xff);
-                                        rprintf(("pci_query_device: IRQs ACPI PIC=%ld APIC=%ld chosen=%d", PicIRQ, ApicIRQ, ulTmp1&0xff));
-                                        pcidev->picirq = PicIRQ;   // Save the Pic and
-                                        pcidev->apicirq = ApicIRQ; // Save the Apic interrupt for switching later
-                                }
-#endif /* ACPI */
                                 if( (u8)ulTmp1 && (u8)ulTmp1 != 0xff ) {
                                         pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
@@ -972 +947 @@
 }
 
-#ifdef ACPI
-void PciAdjustInterrupts() {
-        int i;
-        struct pci_dev *pcidev;
-        struct pci_driver *driver;
-        ULONG ulTmp1, rc;
-
-        for (i=0; i<MAX_PCI_DEVICES; i++) {
-                if (!pci_devices[i].devfn) continue;
-                pcidev = &pci_devices[i];
-                ulTmp1 = pcidev->irq;
-                if (pcidev->apicirq) ulTmp1 = pcidev->apicirq;
-                else if (pcidev->picirq) ulTmp1 = pcidev->picirq;
-                rprintf(("PciAdjustInterrupts: IRQs ACPI PIC=%ld APIC=%ld was=%d chosen=%ld", pcidev->picirq, pcidev->apicirq, pcidev->irq, ulTmp1));
-                if( (u8)ulTmp1 && ((u8)ulTmp1 != 0xff) && ((u8)ulTmp1 != pcidev->irq) ) {
-                        RMSetHandles(pcidev->hAdapter, pcidev->hDevice); /* DAZ - dirty hack */
-                        driver = pcidev->pcidriver;
-                        if(driver && driver->suspend) driver->suspend(pcidev, SNDRV_CTL_POWER_D0);
-
-                        pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
-                        pcidev->irq_resource[0].start = pcidev->irq_resource[0].end   = ulTmp1 & 0xffff;
-                        pcidev->irq = (u8)ulTmp1;
-
-                        fRewired = TRUE;
-                        // if(driver && driver->resume) driver->resume(pcidev);
-                }
-        } /* for loop */
-}
-#endif

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 SVN574
+FIXPACK = BETA
 
 # ALSA BUILD VERSION