Context Navigation

← Previous Changeset
Next Changeset →

Changeset 349

Timestamp:

04/21/08 03:00:45 (8 months ago)

Author:

gentux2

Message:

Merge latest trunk to alsa-resync1 branch

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

: 32 modified

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
5	5
6	6	32BIT=1
7		!include ..\..\~~..\~~makefile.inc
	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=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~~
28	11
29	12	#===================================================================

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
5	5
6	6	32BIT=1
7		!include ..\..\..\~~..\~~makefile.inc
	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=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~~
28	11
29	12	#===================================================================

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

r32	r349
5	5
6	6	32BIT=1
7		!include ..\..\~~..\~~makefile.inc
	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=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~~
28	11
29	12	#===================================================================

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
658	658	{
659	659	snd_pcm_sframes_t avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
	660
	661	#if defined TARGET_OS2 && ACPI
	662	if ( runtime->buffer_size > runtime->control->appl_ptr)
	663	avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
	664	else
	665	{
	666
	667	avail = runtime->control->appl_ptr - runtime->status->hw_ptr;
	668	if ( avail > runtime->buffer_size )
	669	avail = 0;
	670	else
	671	avail = runtime->buffer_size - avail;
	672	}
	673	#endif /* TARGET_OS2 && ACPI */
660	674	if (avail < 0)
661	675	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
5	5
6	6	32BIT=1
7		!include ..\..\~~..\~~makefile.inc
	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=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~~
28	11
29	12	#===================================================================

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
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/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
5	5
6	6	32BIT=1
7		!include ..\..\~~..\~~makefile.inc
	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=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~~
28	11
29	12	#===================================================================

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
5	5
6	6	32BIT=1
7		!include ..\..\~~..\~~makefile.inc
	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

Context Navigation

Changeset 349

Legend:

Download in other formats: