Changeset 587 for GPL/trunk/lib32

Timestamp:

Jun 9, 2016, 10:38:13 PM (9 years ago)

Author:

David Azarewicz

Message:

Rearrange directory structure
rework makefiles
cleanup files

Location:

GPL/trunk/lib32

Files:

• Makefile (added)
• initcall.h (modified) (2 diffs)
• makefile.os2 (deleted)
• malloc.c (added)
• malloc.cpp (deleted)
• memory.c (added)
• memory.cpp (deleted)
• ossidc.c (added)
• ossidc.cpp (deleted)
• pci.c (modified) (5 diffs)
• pci_iomap_compat.c (added)
• soundmidi.c (modified) (1 diff)
• stack.c (added)
• stack.cpp (deleted)

GPL/trunk/lib32/initcall.h

@@ -8 +8 @@
 typedef void (*exitcall_t)(void);
 
-extern "C" int use_internal_drums;
+extern int use_internal_drums;
 
 #define __initcall(fn)                                                          \
@@ -19 +19 @@
 #define module_exit(x)  __exitcall(x);
 
-#define extern_module_init(x)   extern "C" initcall_t __initcall_##x;
-#define extern_module_exit(x)   extern "C" exitcall_t __exitcall_##x;
+#define extern_module_init(x)   extern initcall_t __initcall_##x;
+#define extern_module_exit(x)   extern exitcall_t __exitcall_##x;
 
 #define call_module_init(x)     __initcall_##x()

GPL/trunk/lib32/pci.c

@@ -31 +31 @@
 #include <asm/hardirq.h>
 #include <asm/io.h>
-#include <sound/config.h>
+#include <config.h>
 #include <sound/core.h>
 #include <sound/asound.h>
@@ -55 +55 @@
 #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 +136 @@
         int             resNo, addr;
         u32 devNr, busNr, funcNr, detectedId, cfgaddrreg, ulPciAdr, ulTmp1, ulTmp2;
-#ifdef ACPI
-        APIRET                   rc;
-        ULONG                    PicIRQ, ApicIRQ;
-#endif
         u8              headerType;
 
@@ -239 +231 @@
                                 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 +948 @@
 }
 
-#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/trunk/lib32/soundmidi.c

@@ -30 +30 @@
 #include <sound/minors.h>
 #include <sound/asequencer.h>
-#include <sound/seqmid.h>
+#include <seqmid.h>
 #include <sound/seq_kernel.h>
 #include <linux/file.h>