Linus, please do a
bk pull http://linux-sound.bkbits.net/linux-sound
The GNU patch is available at:
ftp://ftp.alsa-project.org/pub/kernel-patches/alsa-bk-2004-03-30.patch.gz
Additional notes:
- small bugfixes, USB cleanups and documentation update
Jaroslav
The pull command will update the following files:
Documentation/sound/alsa/ALSA-Configuration.txt | 6
Documentation/sound/alsa/Procfile.txt | 185 +++++++++++++++
include/sound/ac97_codec.h | 2
include/sound/cs8427.h | 3
include/sound/pcm.h | 2
include/sound/version.h | 12
sound/core/ioctl32/timer32.c | 10
sound/core/pcm.c | 2
sound/core/pcm_lib.c | 13 -
sound/core/pcm_timer.c | 12
sound/i2c/cs8427.c | 9
sound/pci/ac97/ac97_codec.c | 17 -
sound/pci/ac97/ac97_patch.c | 18 +
sound/pci/ac97/ac97_pcm.c | 4
sound/pci/ac97/ac97_proc.c | 10
sound/pci/au88x0/au88x0.h | 17 -
sound/pci/cs46xx/cs46xx.c | 11
sound/pci/ice1712/delta.c | 2
sound/pci/ice1712/ice1712.c | 34 +-
sound/pci/ice1712/ice1712.h | 1
sound/pci/intel8x0.c | 21 +
sound/pcmcia/pdaudiocf/pdaudiocf.c | 1
sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 1
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 1
sound/ppc/powermac.c | 10
sound/usb/usbaudio.c | 291 +++++++++++++++++-------
sound/usb/usbaudio.h | 5
sound/usb/usbmidi.c | 1
28 files changed, 535 insertions(+), 166 deletions(-)
through these ChangeSets:
<[email protected]> (04/03/30 1.1721)
ALSA - 1.0.4rc2
<[email protected]> (04/03/30 1.1720)
ALSA CVS update - Jaroslav Kysela <[email protected]>
au88x0 driver
Cleanups - removed duplicate PCI IDs
<[email protected]> (04/03/30 1.1719)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
add usb_device->speed wrapper for compiling with 2.2.x kernels
<[email protected]> (04/03/29 1.1692.3.57)
ALSA - fixed date in version.h
<[email protected]> (04/03/29 1.1692.3.56)
ALSA CVS update - Clemens Ladisch <[email protected]>
AC97 Codec Core
don't clobber other bits in SERIAL_CFG register with AD codecs when changing codec selection bits
<[email protected]> (04/03/29 1.1692.3.55)
ALSA CVS update - Clemens Ladisch <[email protected]>
AC97 Codec Core
fix hang because of uninitialized ad18xx.mutex with AD1985
<[email protected]> (04/03/29 1.1692.3.54)
ALSA CVS update - Clemens Ladisch <[email protected]>
AC97 Codec Core
fix superfluous rate register assignments
<[email protected]> (04/03/29 1.1692.3.53)
ALSA CVS update - Clemens Ladisch <[email protected]>
AC97 Codec Core
fix detection of 2.3 codecs
<[email protected]> (04/03/29 1.1692.3.52)
ALSA CVS update - Takashi Iwai <[email protected]>
IOCTL32 emulation
disabled the entries conflifting with TIOC* ioctls.
<[email protected]> (04/03/29 1.1692.3.51)
ALSA CVS update - Jaroslav Kysela <[email protected]>
ICE1712 driver
Fixed Delta410 cs8427 i/o
<[email protected]> (04/03/29 1.1692.3.50)
ALSA CVS update - Jaroslav Kysela <[email protected]>
CS46xx driver
mmap_valid is 1 by default
<[email protected]> (04/03/29 1.1692.3.49)
ALSA CVS update - Jaroslav Kysela <[email protected]>
CS46xx driver
Added parsing of mmap_valid,external_amp and thinkpad parameters at boot time
<[email protected]> (04/03/29 1.1692.3.48)
ALSA CVS update - Jaroslav Kysela <[email protected]>
PPC PowerMac driver
Remove global enable variable
<[email protected]> (04/03/29 1.1692.3.47)
ALSA CVS update - Jaroslav Kysela <[email protected]>
ALSA Version
release: 1.0.4rc1
<[email protected]> (04/03/29 1.1692.3.46)
ALSA CVS update - Jaroslav Kysela <[email protected]>
ICE1712 driver
From: Arjan van de Ven <[email protected]>
ice1712.c: move 2 same structs to the top of the function; gcc won't share
the stackslots anyway
<[email protected]> (04/03/29 1.1692.3.45)
ALSA CVS update - Takashi Iwai <[email protected]>
Intel8x0 driver
disable the legacy midi/joystick properly as default.
<[email protected]> (04/03/29 1.1692.3.44)
ALSA CVS update - Takashi Iwai <[email protected]>
Documentation,I2C cs8427,ICE1712 driver
fixed cs8427_timeout option to use the correct value in msec.
<[email protected]> (04/03/29 1.1692.3.43)
ALSA CVS update - Jaroslav Kysela <[email protected]>
Documentation
Corrected cs8427_timeout
<[email protected]> (04/03/29 1.1692.3.42)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
adjust usb_set_interface() calls for 2.6.5-rc2
<[email protected]> (04/03/29 1.1692.3.41)
ALSA CVS update - Jaroslav Kysela <[email protected]>
PCM Midlevel
Fix in snd_pcm_timer_resolution_change() - it no longer oops when
32-bit value overflows.
<[email protected]> (04/03/29 1.1692.3.40)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
fix deadlock on register_mutex and other bugs
in initialization error paths
<[email protected]> (04/03/29 1.1692.3.39)
ALSA CVS update - Jaroslav Kysela <[email protected]>
Sound Core PDAudioCF driver
Adrian Bunk <[email protected]>
Fix warnings (SNDRV_GET_ID is not required since these files don't use get_id).
<[email protected]> (04/03/29 1.1692.3.38)
ALSA CVS update - Jaroslav Kysela <[email protected]>
Documentation
Added cs8427_timeout to the snd-ice1712 module description
<[email protected]> (04/03/29 1.1692.3.37)
ALSA CVS update - Jaroslav Kysela <[email protected]>
I2C cs8427,ALSA Version,ICE1712 driver
Added cs8427_timeout parameter to the ICE1712 driver
<[email protected]> (04/03/29 1.1692.3.36)
ALSA CVS update - Takashi Iwai <[email protected]>
Intel8x0 driver
Removed the unprocessed IRQ detection, it seems bogus.
<[email protected]> (04/03/29 1.1692.3.35)
ALSA CVS update - Takashi Iwai <[email protected]>
Documentation
The description about ALSA proc files, including debug information.
<[email protected]> (04/03/29 1.1692.3.34)
ALSA CVS update - Takashi Iwai <[email protected]>
PCM Midlevel
- suppress the xrun debug output unless xrun_debug proc is set.
- show stack trace when xrun_debug > 1.
<[email protected]> (04/03/29 1.1692.3.33)
ALSA CVS update - Takashi Iwai <[email protected]>
Intel8x0 driver
added the quirk for Compaq Evo D510C.
<[email protected]> (04/03/29 1.1692.3.32)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
high speed support
<[email protected]> (04/03/29 1.1692.3.31)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
clean up get_iface again :)
<[email protected]> (04/03/29 1.1692.3.30)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
replace usage of interface index with calls to usb_ifnum_to_if (forgot this in 1.88)
<[email protected]> (04/03/29 1.1692.3.29)
ALSA CVS update - Clemens Ladisch <[email protected]>
USB generic driver
remove calls to usb_driver_release_interface
(not needed when disconnect is called)
-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs
On Wed, Mar 31, 2004 at 03:02:19PM +0200, Jaroslav Kysela wrote:
>...
> <[email protected]> (04/03/30 1.1720)
> ALSA CVS update - Jaroslav Kysela <[email protected]>
> au88x0 driver
> Cleanups - removed duplicate PCI IDs
>...
They weren't exactly duplicated, resulting in the following compile
error:
<-- snip -->
...
CC [M] sound/pci/au88x0/au8810.o
sound/pci/au88x0/au8810.c:4: `PCI_DEVICE_ID_AUREAL_ADVANTAGE' undeclared
here (not in a function)
sound/pci/au88x0/au8810.c:4: initializer element is not constant
sound/pci/au88x0/au8810.c:4: (near initialization for
`snd_vortex_ids[0].device')
In file included from sound/pci/au88x0/au8810.c:9:
sound/pci/au88x0/au88x0_core.c: In function `vortex_connect_default':
sound/pci/au88x0/au88x0_core.c:2059: `PCI_DEVICE_ID_AUREAL_VORTEX'
undeclared (first use in this function)
sound/pci/au88x0/au88x0_core.c:2059: (Each undeclared identifier is
reported only once
sound/pci/au88x0/au88x0_core.c:2059: for each function it appears in.)
sound/pci/au88x0/au88x0_core.c:2059: `PCI_DEVICE_ID_AUREAL_VORTEX2'
undeclared (first use in this function)
sound/pci/au88x0/au88x0_core.c:2059: `PCI_DEVICE_ID_AUREAL_ADVANTAGE'
undeclared (first use in this function)
make[3]: *** [sound/pci/au88x0/au8810.o] Error 1
<-- snip -->
The following patch fixes this problem:
--- linux-2.6.5-rc3-modular/include/linux/pci_ids.h.old 2004-03-31 22:00:54.000000000 +0200
+++ linux-2.6.5-rc3-modular/include/linux/pci_ids.h 2004-03-31 22:01:26.000000000 +0200
@@ -1634,8 +1634,9 @@
#define PCI_SUBDEVICE_ID_CHASE_PCIRAS8 0xF010
#define PCI_VENDOR_ID_AUREAL 0x12eb
-#define PCI_DEVICE_ID_AUREAL_VORTEX_1 0x0001
-#define PCI_DEVICE_ID_AUREAL_VORTEX_2 0x0002
+#define PCI_DEVICE_ID_AUREAL_VORTEX 0x0001
+#define PCI_DEVICE_ID_AUREAL_VORTEX2 0x0002
+#define PCI_DEVICE_ID_AUREAL_ADVANTAGE 0x0003
#define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8
#define PCI_DEVICE_ID_LML_33R10 0x8a02
Please apply
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed