diff options
| author |   Arcady Genkin <agenkin@gentoo.org> | 2003-07-15 17:02:39 +0000 |
|---|---|---|
| committer | Arcady Genkin <agenkin@gentoo.org> | 2003-07-15 17:02:39 +0000 |
| commit | f219ae61980c1a513d353c77bcdfcb85850bf953 (patch) | |
| tree | edfe7f5fbedec0fd6a853bc14d0a9f53189a3049 /media-sound/alsa-driver/files | |
| parent | Manifest update. (diff) | |
| download | gentoo-2-f219ae61980c1a513d353c77bcdfcb85850bf953.tar.gz gentoo-2-f219ae61980c1a513d353c77bcdfcb85850bf953.tar.bz2 gentoo-2-f219ae61980c1a513d353c77bcdfcb85850bf953.zip | |
Adding another spinlock_t patch from alsa-devel.
Adding virtual/linux-sources to dependencies.
Diffstat (limited to 'media-sound/alsa-driver/files')
3 files changed, 34 insertions, 33 deletions
diff --git a/media-sound/alsa-driver/files/alsa-driver-0.9.5-ak4117-fix.patch b/media-sound/alsa-driver/files/alsa-driver-0.9.5-ak4117-fix.patch deleted file mode 100644 index 06679ebdbc21..000000000000 --- a/media-sound/alsa-driver/files/alsa-driver-0.9.5-ak4117-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: alsa-driver/include/ak4117.h -=================================================================== -RCS file: /suse/tiwai/cvs/alsa/alsa-driver/include/ak4117.h,v -retrieving revision 1.2 -diff -u -r1.2 ak4117.h ---- alsa-driver/include/ak4117.h 16 May 2003 09:03:24 -0000 1.2 -+++ alsa-driver/include/ak4117.h 14 Jul 2003 13:54:12 -0000 -@@ -163,7 +163,7 @@ - ak4117_read_t * read; - void * private_data; - unsigned int init: 1; -- spinlock_t * lock; -+ spinlock_t lock; - unsigned char regmap[5]; - snd_kcontrol_t *kctls[AK4117_CONTROLS]; - snd_pcm_substream_t *substream; diff --git a/media-sound/alsa-driver/files/alsa-driver-0.9.5-pdaudiocf-fix.patch b/media-sound/alsa-driver/files/alsa-driver-0.9.5-pdaudiocf-fix.patch deleted file mode 100644 index 60828e6fbe4f..000000000000 --- a/media-sound/alsa-driver/files/alsa-driver-0.9.5-pdaudiocf-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: alsa-driver/pcmcia/pdaudiocf/pdaudiocf_core.c -=================================================================== -RCS file: /suse/tiwai/cvs/alsa/alsa-driver/pcmcia/pdaudiocf/pdaudiocf_core.c,v -retrieving revision 1.1 -diff -u -r1.1 pdaudiocf_core.c ---- alsa-driver/pcmcia/pdaudiocf/pdaudiocf_core.c 30 Jun 2003 10:08:42 -0000 1.1 -+++ alsa-driver/pcmcia/pdaudiocf/pdaudiocf_core.c 15 Jul 2003 13:06:08 -0000 -@@ -133,8 +133,7 @@ - if (chip == NULL) - return NULL; - chip->card = card; -- spin_lock_init(&chip->lock); -- spin_lock_init(&chip->irq_lock); -+ spin_lock_init(&chip->reg_lock); - spin_lock_init(&chip->ak4117_lock); - tasklet_init(&chip->tq, pdacf_tasklet, (unsigned long)chip); - card->private_data = chip; diff --git a/media-sound/alsa-driver/files/alsa-driver-0.9.5-spinlock_t.patch b/media-sound/alsa-driver/files/alsa-driver-0.9.5-spinlock_t.patch new file mode 100644 index 000000000000..39a409c3e1f3 --- /dev/null +++ b/media-sound/alsa-driver/files/alsa-driver-0.9.5-spinlock_t.patch @@ -0,0 +1,34 @@ +--- alsa-driver-0.9.5/include/ak4117.h.spinlock_t 2003-07-15 13:05:22.000000000 +0200 ++++ alsa-driver-0.9.5/include/ak4117.h 2003-07-15 13:05:37.000000000 +0200 +@@ -163,7 +163,7 @@ + ak4117_read_t * read; + void * private_data; + unsigned int init: 1; +- spinlock_t * lock; ++ spinlock_t lock; + unsigned char regmap[5]; + snd_kcontrol_t *kctls[AK4117_CONTROLS]; + snd_pcm_substream_t *substream; +--- alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_core.c.spinlock_t 2003-07-15 13:42:27.000000000 +0200 ++++ alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_core.c 2003-07-15 13:42:39.000000000 +0200 +@@ -133,8 +133,7 @@ + if (chip == NULL) + return NULL; + chip->card = card; +- spin_lock_init(&chip->lock); +- spin_lock_init(&chip->irq_lock); ++ spin_lock_init(&chip->reg_lock); + spin_lock_init(&chip->ak4117_lock); + tasklet_init(&chip->tq, pdacf_tasklet, (unsigned long)chip); + card->private_data = chip; +--- alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_pcm.c.spinlock_t 2003-07-15 13:43:56.000000000 +0200 ++++ alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_pcm.c 2003-07-15 13:44:13.000000000 +0200 +@@ -126,7 +126,7 @@ + tmp |= val; + pdacf_reg_write(chip, PDAUDIOCF_REG_SCR, tmp); + __end: +- spin_unlock(&chip_reg_lock); ++ spin_unlock(&chip->reg_lock); + if (cmd == SNDRV_PCM_TRIGGER_STOP) + pdacf_reinit(chip, 0); + snd_ak4117_check_rate_and_errors(chip->ak4117, AK4117_CHECK_NO_RATE); |