Context Navigation

← Previous Change
Next Change →

Changeset 349 for GPL/branches

Timestamp:

Apr 21, 2008, 3:00:45 AM (17 years ago)

Author:

Brendan Oakley

Message:

Merge latest trunk to alsa-resync1 branch

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

: 32 edited

core/makefile.os2 (modified) (1 diff)
core/seq/instr/makefile.os2 (modified) (1 diff)
core/seq/makefile.os2 (modified) (1 diff)
drivers/makefile.os2 (modified) (1 diff)
drivers/mpu401/makefile.os2 (modified) (1 diff)
drivers/opl3/makefile.os2 (modified) (1 diff)
include/sound/pcm.h (modified) (1 diff)
isa/ad1816a/makefile.os2 (modified) (1 diff)
isa/ad1848/makefile.os2 (modified) (1 diff)
isa/cs423x/makefile.os2 (modified) (1 diff)
isa/es1688/makefile.os2 (modified) (1 diff)
isa/gus/makefile.os2 (modified) (1 diff)
isa/makefile.os2 (modified) (1 diff)
isa/opti9xx/makefile.os2 (modified) (1 diff)
isa/sb/makefile.os2 (modified) (1 diff)
isa/wavefront/makefile.os2 (modified) (1 diff)
makefile.os2 (modified) (1 diff)
pci/ac97/makefile.os2 (modified) (1 diff)
pci/ali5451/makefile.os2 (modified) (1 diff)
pci/au88x0/makefile.os2 (modified) (1 diff)
pci/ca0106/makefile.os2 (modified) (1 diff)
pci/cs46xx/makefile.os2 (modified) (1 diff)
pci/emu10k1/makefile.os2 (modified) (1 diff)
pci/hda/makefile.os2 (modified) (1 diff)
pci/korg1212/makefile.os2 (modified) (1 diff)
pci/makefile.os2 (modified) (1 diff)
pci/nm256/makefile.os2 (modified) (1 diff)
pci/rme9652/makefile.os2 (modified) (1 diff)
pci/trident/makefile.os2 (modified) (1 diff)
pci/ymfpci/makefile.os2 (modified) (1 diff)
synth/emux/makefile.os2 (modified) (1 diff)
synth/makefile.os2 (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

GPL/branches/alsa-resync1/alsa-kernel/core/makefile.os2

-              r299
+              r349
 BIT=1
 !include ..\..\..\makefile.inc
+!include ..\..\makefile.inc
 NMAKEOPTS=-f makefile.os2 $(LOGO)
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
-!if "$(DEBUG)" == "1"
-NMAKEOPTS += DEBUG=1
-!endif
-!if "$(KEE)" == "0"
-NMAKEOPTS += KEE=0
-KEE=0
-!else
-NMAKEOPTS += KEE=1
-KEE=1
-!endif
-!if "$(DEBUG)" == "1"
-!Message BUILDING DEBUG VERSION
-!else
-!Message BUILDING RELEASE VERSION
-!endif
 #===================================================================

GPL/branches/alsa-resync1/alsa-kernel/core/seq/instr/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/core/seq/makefile.os2

-              r112
+              r349
 BIT=1
 !include ..\..\..\..\makefile.inc
+!include ..\..\..\makefile.inc
 NMAKEOPTS=-f makefile.os2 $(LOGO)
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
-!if "$(DEBUG)" == "1"
-NMAKEOPTS += DEBUG=1
-!endif
-!if "$(KEE)" == "0"
-NMAKEOPTS += KEE=0
-KEE=0
-!else
-NMAKEOPTS += KEE=1
-KEE=1
-!endif
-!if "$(DEBUG)" == "1"
-!Message BUILDING DEBUG VERSION
-!else
-!Message BUILDING RELEASE VERSION
-!endif
 #===================================================================

GPL/branches/alsa-resync1/alsa-kernel/drivers/makefile.os2

-              r32
+              r349
 BIT=1
 !include ..\..\..\makefile.inc
+!include ..\..\makefile.inc
 NMAKEOPTS=-f makefile.os2 $(LOGO)
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
-!if "$(DEBUG)" == "1"
-NMAKEOPTS += DEBUG=1
-!endif
-!if "$(KEE)" == "0"
-NMAKEOPTS += KEE=0
-KEE=0
-!else
-NMAKEOPTS += KEE=1
-KEE=1
-!endif
-!if "$(DEBUG)" == "1"
-!Message BUILDING DEBUG VERSION
-!else
-!Message BUILDING RELEASE VERSION
-!endif
 #===================================================================

GPL/branches/alsa-resync1/alsa-kernel/drivers/mpu401/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/drivers/opl3/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm.h

-              r290
+              r349
+{
         snd_pcm_sframes_t avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
+#if defined TARGET_OS2 && ACPI
+       if ( runtime->buffer_size > runtime->control->appl_ptr)
+          avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
+       else
+       {
+          avail = runtime->control->appl_ptr - runtime->status->hw_ptr;
+          if ( avail > runtime->buffer_size )
+             avail = 0;
+          else
+             avail = runtime->buffer_size - avail;
+       }
+#endif /* TARGET_OS2 && ACPI */
         if (avail < 0)
                 avail += runtime->boundary;

GPL/branches/alsa-resync1/alsa-kernel/isa/ad1816a/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/ad1848/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/cs423x/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/es1688/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/gus/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/makefile.os2

-              r210
+              r349
 BIT=1
 !include ..\..\..\makefile.inc
+!include ..\..\makefile.inc
 NMAKEOPTS=-f makefile.os2 $(LOGO)
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
-!if "$(DEBUG)" == "1"
-NMAKEOPTS += DEBUG=1
-!endif
-!if "$(KEE)" == "0"
-NMAKEOPTS += KEE=0
-KEE=0
-!else
-NMAKEOPTS += KEE=1
-KEE=1
-!endif
-!if "$(DEBUG)" == "1"
-!Message BUILDING DEBUG VERSION
-!else
-!Message BUILDING RELEASE VERSION
-!endif
 #===================================================================

GPL/branches/alsa-resync1/alsa-kernel/isa/opti9xx/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/sb/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/isa/wavefront/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/makefile.os2

-              r110
+              r349
 LOGO=-h
+NMAKEOPTS=-f makefile.os2 $(LOGO)
+!if "$(DEBUG)" == "1"
+NMAKEOPTS += DEBUG=1
+!endif
+!if "$(KEE)" == "0"
+NMAKEOPTS += KEE=0
+KEE=0
+!else
+NMAKEOPTS += KEE=1
+KEE=1
+!endif
+!if "$(DEBUG)" == "1"
+!Message BUILDING DEBUG VERSION
+!else
+!Message BUILDING RELEASE VERSION
+!endif
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)

GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/ali5451/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/au88x0/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/ca0106/makefile.os2

r76	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/cs46xx/makefile.os2

r76	r349
6	6
7	7	32BIT=1
8		!include ..\..\..\~~..\~~makefile.inc
	8	!include ..\..\..\makefile.inc
9	9
10	10

GPL/branches/alsa-resync1/alsa-kernel/pci/emu10k1/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/hda/makefile.os2

r86	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/korg1212/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/makefile.os2

-              r212
+              r349
 BIT=1
 !include ..\..\..\makefile.inc
+!include ..\..\makefile.inc
 NMAKEOPTS=-f makefile.os2 $(LOGO)
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
-!if "$(DEBUG)" == "1"
-NMAKEOPTS += DEBUG=1
-!endif
-!if "$(KEE)" == "0"
-NMAKEOPTS += KEE=0
-KEE=0
-!else
-NMAKEOPTS += KEE=1
-KEE=1
-!endif
-!if "$(DEBUG)" == "1"
-!Message BUILDING DEBUG VERSION
-!else
-!Message BUILDING RELEASE VERSION
-!endif
 #===================================================================

GPL/branches/alsa-resync1/alsa-kernel/pci/nm256/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/makefile.os2

r250	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/trident/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/synth/emux/makefile.os2

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	7	!include ..\..\..\makefile.inc
8	8
9	9

GPL/branches/alsa-resync1/alsa-kernel/synth/makefile.os2

-              r32
+              r349
 BIT=1
 !include ..\..\..\makefile.inc
+!include ..\..\makefile.inc
+NMAKEOPTS=-f makefile.os2 $(LOGO)
+!if "$(DEBUG)" == "1"
+NMAKEOPTS += DEBUG=1
+!endif
+!if "$(KEE)" == "0"
+NMAKEOPTS += KEE=0
+KEE=0
+!else
+NMAKEOPTS += KEE=1
+KEE=1
+!endif
+!if "$(DEBUG)" == "1"
+!Message BUILDING DEBUG VERSION
+!else
+!Message BUILDING RELEASE VERSION
+!endif
+NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 349 for GPL/branches

Legend:

Download in other formats: