Changeset 580 for GPL/branches/DAZ/lib32

Timestamp:

Jul 9, 2014, 9:59:13 PM (11 years ago)

Author:

David Azarewicz

Message:

Cleanup build environment

Location:

GPL/branches/DAZ/lib32

Files:

• Makefile (moved) (moved from GPL/branches/DAZ/lib32/makefile.os2 ) (5 diffs)
• pci.c (modified) (4 diffs)

GPL/branches/DAZ/lib32/Makefile

@@ -1 @@
-CINCLUDES = ..\include;..\runtime;..\alsa-kernel\include;$(%WATCOM)\H;$(%WATCOM)\H\OS2;
-AINCLUDES = $(DDK_BASE)\H
+!ifndef %ROOT
+!error ROOT is not defined. Please check your SETENV.CMD.
+!endif
+ROOT=$(%ROOT)
+
+!include $(ROOT)\tools\header.mif
+
+CINCLUDES = ..\include;..\runtime;..\alsa-kernel\include;$(WATCOM)\H;$(WATCOM)\H\OS2;
+AINCLUDES = $(DDK)\base\H
 
 CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
@@ -8 +15 @@
 !endif
 
-32BIT=1
-!include ..\makefile.inc
-
-
 #===================================================================
 #
@@ -17 +20 @@
 #
 #===================================================================
-FILE1    = spinlock.obj malloc.obj pci.obj irq.obj ioctl.obj
-FILE2    = memory.obj debug.obj sound.obj soundmixer.obj soundmidi.obj 
-#FILE3    = ossidc.obj semaphore.obj waitqueue.obj misc.obj fminstrload.obj
-FILE3    = ossidc.obj semaphore.obj waitqueue.obj misc.obj 
-FILE4    = strncpy.obj task.obj 
-FILE5    = strncmp.obj timer.obj
-FILE6    = instropl2.obj instropl3.obj vsprintf.obj
+FILES = spinlock.obj malloc.obj pci.obj irq.obj ioctl.obj &
+  memory.obj debug.obj sound.obj soundmixer.obj soundmidi.obj &
+  ossidc.obj semaphore.obj waitqueue.obj misc.obj &
+  strncpy.obj task.obj &
+  strncmp.obj timer.obj &
+  instropl2.obj instropl3.obj vsprintf.obj
+# ossidc.obj semaphore.obj waitqueue.obj misc.obj fminstrload.obj
 !if $(KEE) == 0
-FILE7    = stack.obj
-!else
-FILE7    = 
+FILES += stack.obj
 !endif
-FILE8    = 
-FILELAST =
-FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
 
-TARGET   = linuxlib
+TARGET = linuxlib
 
-LNKFILE  = $(OBJDIR)\$(TARGET).lnk
-
+LNKFILE = $(OBJDIR)\$(TARGET).lnk
 
 #===================================================================
@@ -46 +43 @@
 
 
-$(LNKFILE): makefile.os2
+$(LNKFILE): Makefile
     @%create $(LNKFILE)
     @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
@@ -57 +54 @@
 clean: .SYMBOLIC
     -@rm *.err
-    @cd $(OBJDIR)
-    -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
-    @cd ../..
+    @if exist obj @rm.exe -r obj
+    @if exist bin @rm.exe -r bin
+

GPL/branches/DAZ/lib32/pci.c

@@ -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