Changeset 328
- Timestamp:
- 03/30/08 08:59:18 (8 months ago)
- Location:
- GPL/trunk
- Files:
-
- 13 modified
-
Configure.cmd (modified) (2 diffs)
-
alsa-kernel/core/makefile.os2 (modified) (1 diff)
-
alsa-kernel/core/seq/makefile.os2 (modified) (1 diff)
-
alsa-kernel/drivers/makefile.os2 (modified) (1 diff)
-
alsa-kernel/include/sound/pcm.h (modified) (1 diff)
-
alsa-kernel/isa/makefile.os2 (modified) (1 diff)
-
alsa-kernel/makefile.os2 (modified) (1 diff)
-
alsa-kernel/pci/makefile.os2 (modified) (1 diff)
-
alsa-kernel/synth/makefile.os2 (modified) (1 diff)
-
drv32/makefile.os2 (modified) (6 diffs)
-
include/watcom32.mk (modified) (1 diff)
-
lib32/pci.c (modified) (3 diffs)
-
makefile.os2 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
GPL/trunk/Configure.cmd
r327 r328 44 44 call lineout sIncFile, 'ALSA_LIB_ =' sAlsaBase'\lib'; 45 45 call lineout sIncFile, 'ALSA_BIN_ =' sAlsaBase'\bin'; 46 call lineout sIncFile, '!ifdef 32BIT'47 46 call lineout sIncFile, 'ALSA_INCLUDE =' sAlsaBase'\include'; 48 47 call lineout sIncFile, 'ALSA_TOOLS =' sAlsaBase'\tools'; 49 call lineout sIncFile, '!else'50 call lineout sIncFile, 'ALSA_INCLUDE =' sAlsaBase'\OCO\include';51 call lineout sIncFile, 'ALSA_TOOLS =' sAlsaBase'\OCO\tools';52 call lineout sIncFile, '!endif'53 48 call lineout sIncFile, '' 54 49 say 'Enter DDK base directory (e.g. c:\ddk\base)'; … … 60 55 call lineout sIncFile, 'WATCOM =' sWatcomPath; 61 56 57 say 'Enter directory location for AcpiDrv.lib (e.g. C:\ACPI)'; 58 say 'Or leave blank if not present.' 59 sAcpiLibPath = linein(); 60 call lineout sIncFile, 'ACPI_LIB =' sAcpiLibPath; 61 62 62 call lineout sIncFile, '################################################################################' 63 63 call lineout sIncFile, '# Include the right watcom makefile' 64 64 call lineout sIncFile, '################################################################################' 65 call lineout sIncFile, '!ifdef 32BIT'66 65 call lineout sIncFile, '!include 'sAlsaBase'\include\watcom32.mk' 67 66 call lineout sIncFile, '!include 'sAlsaBase'\include\watcom32.mak' 68 call lineout sIncFile, '!else'69 call lineout sIncFile, '!include 'sAlsaBase'\OCO\include\watcom16.mk'70 call lineout sIncFile, '!include 'sAlsaBase'\OCO\include\watcom16.mak'71 call lineout sIncFile, '!endif'72 67 call lineout sIncFile, '' 73 68 -
GPL/trunk/alsa-kernel/core/makefile.os2
r327 r328 7 7 !include ..\..\makefile.inc 8 8 9 NMAKEOPTS=-f makefile.os2 $(LOGO) 9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 10 10 11 !if "$(DEBUG)" == "1"12 NMAKEOPTS += DEBUG=113 !endif14 15 !if "$(KEE)" == "0"16 NMAKEOPTS += KEE=017 KEE=018 !else19 NMAKEOPTS += KEE=120 KEE=121 !endif22 23 !if "$(DEBUG)" == "1"24 !Message BUILDING DEBUG VERSION25 !else26 !Message BUILDING RELEASE VERSION27 !endif28 11 29 12 #=================================================================== -
GPL/trunk/alsa-kernel/core/seq/makefile.os2
r327 r328 7 7 !include ..\..\..\makefile.inc 8 8 9 NMAKEOPTS=-f makefile.os2 $(LOGO) 9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 10 10 11 !if "$(DEBUG)" == "1"12 NMAKEOPTS += DEBUG=113 !endif14 15 !if "$(KEE)" == "0"16 NMAKEOPTS += KEE=017 KEE=018 !else19 NMAKEOPTS += KEE=120 KEE=121 !endif22 23 !if "$(DEBUG)" == "1"24 !Message BUILDING DEBUG VERSION25 !else26 !Message BUILDING RELEASE VERSION27 !endif28 11 29 12 #=================================================================== -
GPL/trunk/alsa-kernel/drivers/makefile.os2
r327 r328 7 7 !include ..\..\makefile.inc 8 8 9 NMAKEOPTS=-f makefile.os2 $(LOGO) 9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 10 10 11 !if "$(DEBUG)" == "1"12 NMAKEOPTS += DEBUG=113 !endif14 15 !if "$(KEE)" == "0"16 NMAKEOPTS += KEE=017 KEE=018 !else19 NMAKEOPTS += KEE=120 KEE=121 !endif22 23 !if "$(DEBUG)" == "1"24 !Message BUILDING DEBUG VERSION25 !else26 !Message BUILDING RELEASE VERSION27 !endif28 11 29 12 #=================================================================== -
GPL/trunk/alsa-kernel/include/sound/pcm.h
r61 r328 654 654 { 655 655 snd_pcm_sframes_t avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr; 656 657 #if defined TARGET_OS2 && ACPI 658 if ( runtime->buffer_size > runtime->control->appl_ptr) 659 avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr; 660 else 661 { 662 663 avail = runtime->control->appl_ptr - runtime->status->hw_ptr; 664 if ( avail > runtime->buffer_size ) 665 avail = 0; 666 else 667 avail = runtime->buffer_size - avail; 668 } 669 #endif /* TARGET_OS2 && ACPI */ 656 670 if (avail < 0) 657 671 avail += runtime->boundary; -
GPL/trunk/alsa-kernel/isa/makefile.os2
r327 r328 7 7 !include ..\..\makefile.inc 8 8 9 NMAKEOPTS=-f makefile.os2 $(LOGO) 9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 10 10 11 !if "$(DEBUG)" == "1"12 NMAKEOPTS += DEBUG=113 !endif14 15 !if "$(KEE)" == "0"16 NMAKEOPTS += KEE=017 KEE=018 !else19 NMAKEOPTS += KEE=120 KEE=121 !endif22 23 !if "$(DEBUG)" == "1"24 !Message BUILDING DEBUG VERSION25 !else26 !Message BUILDING RELEASE VERSION27 !endif28 11 29 12 #=================================================================== -
GPL/trunk/alsa-kernel/makefile.os2
r111 r328 1 1 LOGO=-h 2 2 3 NMAKEOPTS=-f makefile.os2 $(LOGO) 4 5 !if "$(DEBUG)" == "1" 6 NMAKEOPTS += DEBUG=1 7 !endif 8 9 !if "$(KEE)" == "0" 10 NMAKEOPTS += KEE=0 11 KEE=0 12 !else 13 NMAKEOPTS += KEE=1 14 KEE=1 15 !endif 16 17 18 !if "$(DEBUG)" == "1" 19 !Message BUILDING DEBUG VERSION 20 !else 21 !Message BUILDING RELEASE VERSION 22 !endif 3 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 23 4 24 5 -
GPL/trunk/alsa-kernel/pci/makefile.os2
r327 r328 7 7 !include ..\..\makefile.inc 8 8 9 NMAKEOPTS=-f makefile.os2 $(LOGO) 9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 10 10 11 !if "$(DEBUG)" == "1"12 NMAKEOPTS += DEBUG=113 !endif14 15 !if "$(KEE)" == "0"16 NMAKEOPTS += KEE=017 KEE=018 !else19 NMAKEOPTS += KEE=120 KEE=121 !endif22 23 !if "$(DEBUG)" == "1"24 !Message BUILDING DEBUG VERSION25 !else26 !Message BUILDING RELEASE VERSION27 !endif28 11 29 12 #=================================================================== -
GPL/trunk/alsa-kernel/synth/makefile.os2
r327 r328 7 7 !include ..\..\makefile.inc 8 8 9 NMAKEOPTS=-f makefile.os2 $(LOGO) 10 11 !if "$(DEBUG)" == "1" 12 NMAKEOPTS += DEBUG=1 13 !endif 14 15 !if "$(KEE)" == "0" 16 NMAKEOPTS += KEE=0 17 KEE=0 18 !else 19 NMAKEOPTS += KEE=1 20 KEE=1 21 !endif 22 23 !if "$(DEBUG)" == "1" 24 !Message BUILDING DEBUG VERSION 25 !else 26 !Message BUILDING RELEASE VERSION 27 !endif 9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG) 28 10 29 11 -
GPL/trunk/drv32/makefile.os2
r327 r328 1 # $Id: makefile.os2,v 1.3 2003/07/21 18:35:39 vladest Exp $2 1 # 3 2 # Makefile for the 32bit UNIAUD driver … … 88 87 @%write $^@ option alignment=16 89 88 @%write $^@ option map=$(WMAPNAME) 90 !if "$(KEE)" == "1" 89 !if "$(ACPI) == "1" 90 @%write $^@ option description '$(%BUILDLEVEL) (ACPI)' 91 !else if "$(KEE)" == "1" 91 92 @%write $^@ option description '$(%BUILDLEVEL) (KEE)' 92 93 !else … … 96 97 @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f 97 98 @for %f in ($(LIBS)) do @%append $^@ library %f 99 !if "$(ACPI) == "1" 100 @%write $^@ library $(ACPI_LIB)\AcpiDrv.lib 101 !endif 98 102 @%write $^@ library $(%WATCOM)\lib386\os2\clib3r.lib 99 103 @%write $^@ library $(%WATCOM)\lib386\os2\os2386.lib … … 104 108 @for %f in ($(FILES)) do @%append $^@ $(OBJDIR)\%f 105 109 @for %f in ($(LIBS)) do @%append $^@ %f 110 !if "$(ACPI)" == "1" 111 @%write $^@ $(ACPI_LIB)\AcpiDrv.lib 112 !endif 106 113 @%write $^@ $(%WATCOM)\lib386\os2\clib3r.lib 107 114 @%write $^@ $(%WATCOM)\lib386\os2\os2386.lib … … 110 117 111 118 $(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS) 112 !if "$(KEE)" == "1" 119 !if "$(ACPI)" == "1" 120 @%write $(DEFFILE) description '$(%BUILDLEVEL) (ACPI)' 121 !else if "$(KEE)" == "1" 113 122 @%write $(DEFFILE) description '$(%BUILDLEVEL) (KEE)' 114 123 !else … … 119 128 120 129 copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN) 121 !if "$( KEE)" == "1"122 # copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)\$(TARGET)kee.sys123 130 !if "$(ACPI)" == "1" 131 copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)acpi.sys 132 !else if "$(KEE)" == "1" 124 133 copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)kee.sys 125 134 !else 126 # copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)\$(TARGET)w4.sys127 135 copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)w4.sys 128 136 !endif -
GPL/trunk/include/watcom32.mk
r32 r328 6 6 DIREXT = W4 7 7 KEE = 0 8 !else if "$(ACPI)" == "1" 9 DIREXT = ACP 10 ACPI = 1 11 KEE = 1 8 12 !else 9 13 DIREXT = KEE -
GPL/trunk/lib32/pci.c
r289 r328 54 54 #define PCI_CONFIG_DATA 0xCFC 55 55 56 #ifdef ACPI 57 APIRET APIENTRY ACPIFindPCIDevice(ULONG Bus, ULONG Dev, ULONG Fun, ULONG *PicIRQ, ULONG *ApicIRQ, ULONG *Hdl, char *Component); 58 #endif 56 59 57 60 //****************************************************************************** … … 134 137 struct pci_dev near *pcidev, int idx) 135 138 { 139 #ifdef ACPI 140 APIRET rc; 141 #endif 136 142 int resNo, addr, found = 0; 137 143 u32 devNr, busNr, funcNr, detectedId, pciId, cfgaddrreg, temp, temp2; 144 #ifdef ACPI 145 ULONG temp1,temp3; //PS++ 146 #endif 138 147 u8 headerType; 139 148 … … 220 229 // IRQ and PIN 221 230 pci_read_config_dword(pcidev, PCI_INTERRUPT_LINE, &temp); 231 #ifdef ACPI 232 temp2 = temp3 = 0; 233 rc = ACPIFindPCIDevice( (ULONG)busNr, // Bus 234 (ULONG)devNr, // Dev 235 (ULONG)(pcidev->devfn >> 8) & 7, // Function 236 &temp1, // PIC IRQ 237 &temp3, // APIC IRQ 238 NULL, // ACPI handle to finding device 239 "Uniaud32"); // Name for acpi log 240 if (!rc) 241 { 242 // Check APIC IRQ, if we have /SMP /APIC, must be set 243 if (temp3) 244 temp = (temp & (~0xff)) | (temp3 & 0xff); 245 // Check PIC IRQ 246 else if (temp1) 247 temp = (temp & (~0xff)) | (temp1 & 0xff); 248 dprintf(("pci_query_device: IRQs ACPI PIC%d APIC%d", temp1, temp3)); 249 } 250 #endif /* ACPI */ 222 251 if( (u8)temp && (u8)temp != 0xff ) 223 252 { -
GPL/trunk/makefile.os2
r32 r328 5 5 !if "$(DEBUG)" == "1" 6 6 NMAKEOPTS += DEBUG=1 7 !else 8 NMAKEOPTS += DEBUG=0 7 9 !endif 8 10 … … 10 12 NMAKEOPTS += KEE=0 11 13 KEE=0 14 !Message KEE=0, so ACPI=0 15 NMAKEOPTS += ACPI=0 16 ACPI=0 12 17 !else 13 18 NMAKEOPTS += KEE=1 14 19 KEE=1 20 !endif 21 22 !include Makefile.inc 23 !if "$(ACPI_LIB)" == "" || "$(ACPI)" == "0" 24 NMAKEOPTS += ACPI=0 25 ACPI=0 26 !else 27 NMAKEOPTS += ACPI=1 28 ACPI=1 15 29 !endif 16 30
