Changeset 328 for GPL/trunk/alsa-kernel


Ignore:
Timestamp:
Mar 30, 2008, 8:59:18 AM (18 years ago)
Author:
Brendan Oakley
Message:

Added option for ACPI support provided by Pavel, requires AcpiDrv.lib

Location:
GPL/trunk/alsa-kernel
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/alsa-kernel/core/makefile.os2

    r327 r328  
    77!include ..\..\makefile.inc
    88
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     9NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
    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
    2811
    2912#===================================================================

  • GPL/trunk/alsa-kernel/core/seq/makefile.os2

    r327 r328  
    77!include ..\..\..\makefile.inc
    88
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     9NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
    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
    2811
    2912#===================================================================

  • GPL/trunk/alsa-kernel/drivers/makefile.os2

    r327 r328  
    77!include ..\..\makefile.inc
    88
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     9NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
    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
    2811
    2912#===================================================================

  • GPL/trunk/alsa-kernel/include/sound/pcm.h

    r61 r328  
    654654{
    655655        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 */
    656670        if (avail < 0)
    657671                avail += runtime->boundary;

  • GPL/trunk/alsa-kernel/isa/makefile.os2

    r327 r328  
    77!include ..\..\makefile.inc
    88
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     9NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
    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
    2811
    2912#===================================================================

  • GPL/trunk/alsa-kernel/makefile.os2

    r111 r328  
    11LOGO=-h
    22
    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
     3NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    234
    245

  • GPL/trunk/alsa-kernel/pci/makefile.os2

    r327 r328  
    77!include ..\..\makefile.inc
    88
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     9NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
    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
    2811
    2912#===================================================================

  • GPL/trunk/alsa-kernel/synth/makefile.os2

    r327 r328  
    77!include ..\..\makefile.inc
    88
    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
     9NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    2810
    2911
Note: See TracChangeset for help on using the changeset viewer.