[alsa-cvslog] CVS: alsa-lib/include alsa-symbols.h,1.3,1.4
Update of /cvsroot/alsa/alsa-lib/include In directory sc8-pr-cvs1:/tmp/cvs-serv24297 Modified Files: alsa-symbols.h Log Message: added workaround for ppc64. Index: alsa-symbols.h === RCS file: /cvsroot/alsa/alsa-lib/include/alsa-symbols.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- alsa-symbols.h 11 Mar 2003 18:51:32 - 1.3 +++ alsa-symbols.h 13 Aug 2003 13:18:36 - 1.4 @@ -29,10 +29,19 @@ #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) -#define symbol_version(real, name, version) \ +#ifdef __powerpc64__ +# define symbol_version(real, name, version) \ + __asm__ (.symver #real , #name @ #version); \ + __asm__ (.symver . #real ,. #name @ #version) +# define default_symbol_version(real, name, version) \ + __asm__ (.symver #real , #name @@ #version); \ + __asm__ (.symver . #real ,. #name @@ #version) +#else +# define symbol_version(real, name, version) \ __asm__ (.symver #real , #name @ #version) -#define default_symbol_version(real, name, version) \ +# define default_symbol_version(real, name, version) \ __asm__ (.symver #real , #name @@ #version) +#endif #ifdef USE_VERSIONED_SYMBOLS #define use_symbol_version(real, name, version) \ @@ -41,9 +50,17 @@ default_symbol_version(real, name, version) #else #define use_symbol_version(real, name, version) /* nothing */ +#ifdef __powerpc64__ +#define use_default_symbol_version(real, name, version) \ + __asm__ (.weak #name); \ + __asm__ (.weak . #name); \ + __asm__ (.set #name , #real); \ + __asm__ (.set . #name ,. #real) +#else #define use_default_symbol_version(real, name, version) \ __asm__ (.weak #name); \ __asm__ (.set #name , #real) +#endif #endif #endif /* __ALSA_SYMBOLS_H */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.100,1.101
Update of /cvsroot/alsa/alsa-kernel/pci/ac97 In directory sc8-pr-cvs1:/tmp/cvs-serv12334 Modified Files: ac97_codec.c Log Message: fix by James Courtier-Dutton [EMAIL PROTECTED]: Fixes ac3 passthru non-audio bit setting for AC97 codecs. I have :- Card: Intel ICH5 Chip: Avance Logic ALC650 rev 0 The problem I was having was that the spdif non-audio bit was not being set. This patch fixes that problem. Index: ac97_codec.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- ac97_codec.c30 Jul 2003 10:54:03 - 1.100 +++ ac97_codec.c14 Aug 2003 16:05:13 - 1.101 @@ -823,7 +823,13 @@ AC97_CXR_SPDIF_MASK | AC97_CXR_COPYRGT, v); } else { + unsigned short extst = ac97-regs[AC97_EXTENDED_STATUS]; + snd_ac97_update_bits(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, 0); /* turn off */ + change |= snd_ac97_update_bits(ac97, AC97_SPDIF, 0x3fff, val); + if (extst AC97_EA_SPDIF) { + snd_ac97_update_bits(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, AC97_EA_SPDIF); /* turn on again */ +} } return change; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa opl3sa2.c,1.28,1.29
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1:/tmp/cvs-serv22171 Modified Files: opl3sa2.c Log Message: fixed the uninitialized spin_lock. Index: opl3sa2.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- opl3sa2.c 12 Aug 2003 14:10:11 - 1.28 +++ opl3sa2.c 13 Aug 2003 13:01:22 - 1.29 @@ -752,6 +752,7 @@ err = -ENOMEM; goto __error; } + spin_lock_init(chip-reg_lock); chip-irq = -1; if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, ops)) 0) goto __error; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident_main.c,1.45,1.46
Update of /cvsroot/alsa/alsa-kernel/pci/trident In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci/trident Modified Files: trident_main.c Log Message: fixed the wrong order of object destruction: a released object is referred after the *_free() call. Index: trident_main.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- trident_main.c 21 Jun 2003 07:52:38 - 1.45 +++ trident_main.c 14 Aug 2003 11:05:38 - 1.46 @@ -3538,13 +3538,13 @@ trident-port = pci_resource_start(pci, 0); if ((trident-res_port = request_region(trident-port, 0x100, Trident Audio)) == NULL) { - snd_trident_free(trident); snd_printk(unable to grab I/O region 0x%lx-0x%lx\n, trident-port, trident-port + 0x100 - 1); + snd_trident_free(trident); return -EBUSY; } if (request_irq(pci-irq, snd_trident_interrupt, SA_INTERRUPT|SA_SHIRQ, Trident Audio, (void *) trident)) { - snd_trident_free(trident); snd_printk(unable to grab IRQ %d\n, pci-irq); + snd_trident_free(trident); return -EBUSY; } trident-irq = pci-irq; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/sparc amd7930.c,1.6,1.7 cs4231.c,1.8,1.9
Update of /cvsroot/alsa/alsa-kernel/sparc In directory sc8-pr-cvs1:/tmp/cvs-serv16068/sparc Modified Files: amd7930.c cs4231.c Log Message: fixed the wrong order of object destruction: a released object is referred after the *_free() call. Index: amd7930.c === RCS file: /cvsroot/alsa/alsa-kernel/sparc/amd7930.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- amd7930.c 8 May 2003 08:32:35 - 1.6 +++ amd7930.c 14 Aug 2003 11:05:39 - 1.7 @@ -992,10 +992,10 @@ if (request_irq(irq_prop-pri, snd_amd7930_interrupt, SA_INTERRUPT | SA_SHIRQ, amd7930, amd)) { - snd_amd7930_free(amd); snd_printk(amd7930-%d: Unable to grab IRQ %s\n, dev, __irq_itoa(irq_prop-pri)); + snd_amd7930_free(amd); return -EBUSY; } amd-irq = irq_prop-pri; Index: cs4231.c === RCS file: /cvsroot/alsa/alsa-kernel/sparc/cs4231.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cs4231.c6 Jun 2003 11:54:28 - 1.8 +++ cs4231.c14 Aug 2003 11:05:39 - 1.9 @@ -1994,10 +1994,10 @@ if (request_irq(sdev-irqs[0], snd_cs4231_sbus_interrupt, SA_SHIRQ, cs4231, chip)) { - snd_cs4231_sbus_free(chip); snd_printk(cs4231-%d: Unable to grab SBUS IRQ %s\n, dev, __irq_itoa(sdev-irqs[0])); + snd_cs4231_sbus_free(chip); return -EBUSY; } chip-irq[0] = sdev-irqs[0]; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/aplay aplay.1,1.6,1.7 aplay.c,1.169,1.170
Update of /cvsroot/alsa/alsa-utils/aplay In directory sc8-pr-cvs1:/tmp/cvs-serv25869 Modified Files: aplay.1 aplay.c Log Message: - added --buffer-size and --period-size options. - accept -h as the help :) - fixed VU meter for 8 bit and negative values. - updated man page. Index: aplay.1 === RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.1,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aplay.1 7 Aug 2001 10:34:51 - 1.6 +++ aplay.1 7 Aug 2003 14:48:17 - 1.7 @@ -25,7 +25,7 @@ .SS Options .TP -\fI--help\fP +\fI-h, --help\fP Help: show syntax. .TP \fI--version\fP @@ -86,6 +86,12 @@ \fI-B, --buffer-time=#\fP Buffer duration is # microseconds .TP +\fI--period-size=#\fP +Distance between interrupts is # frames +.TP +\fI--buffer-size=#\fP +Buffer duration is # frames +.TP \fI-A, --avail-min=#\fP Min available space for wakeup is # microseconds .TP @@ -97,14 +103,15 @@ Delay for automatic PCM stop is # microseconds from xrun .TP \fI-v, --verbose\fP -Show PCM structure and setup +Show PCM structure and setup. +This option is accumulative. The VU meter is displayed when this +is given twice. .TP \fI-I, --separate-channels\fP One file for each channel -.TP .SS -Example: +Example: .RS \fBaplay -c 1 -t raw -r 22050 -f mu_law foobar\fR Index: aplay.c === RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- aplay.c 31 Jul 2003 07:39:13 - 1.169 +++ aplay.c 7 Aug 2003 14:48:17 - 1.170 @@ -83,6 +83,8 @@ static snd_pcm_uframes_t chunk_size = 0; static unsigned period_time = 0; static unsigned buffer_time = 0; +static snd_pcm_uframes_t period_frames = 0; +static snd_pcm_uframes_t buffer_frames = 0; static int avail_min = -1; static int start_delay = 0; static int stop_delay = 0; @@ -142,8 +144,8 @@ fprintf(stderr, Usage: %s [OPTION]... [FILE]...\n \n ---help help\n ---version print current version\n +-h, --help help\n +--version print current version\n -l, --list-devices list all soundcards and digital audio devices\n -L, --list-pcms list all PCMs defined\n -D, --device=NAME select PCM by name\n @@ -158,6 +160,8 @@ -N, --nonblock nonblocking mode\n -F, --period-time=# distance between interrupts is # microseconds\n -B, --buffer-time=# buffer duration is # microseconds\n +--period-size=# distance between interrupts is # frames\n +--buffer-size=# buffer duration is # frames\n -A, --avail-min=# min available space for wakeup is # microseconds\n -R, --start-delay=# delay for automatic PCM start is # microseconds \n (relative to buffer size if = 0)\n @@ -287,15 +291,18 @@ exit(EXIT_FAILURE); } -#define OPT_HELP 1 -#define OPT_VERSION 2 +enum { + OPT_VERSION = 1, + OPT_PERIOD_SIZE, + OPT_BUFFER_SIZE +}; int main(int argc, char *argv[]) { int option_index; - char *short_options = lLD:qt:c:f:r:d:s:MNF:A:X:R:T:B:vIPC; + char *short_options = hlLD:qt:c:f:r:d:s:MNF:A:X:R:T:B:vIPC; static struct option long_options[] = { - {help, 0, 0, OPT_HELP}, + {help, 0, 0, 'h'}, {version, 0, 0, OPT_VERSION}, {list-devices, 0, 0, 'l'}, {list-pcms, 0, 0, 'L'}, @@ -310,10 +317,12 @@ {mmap, 0, 0, 'M'}, {nonblock, 0, 0, 'N'}, {period-time, 1, 0, 'F'}, + {period-size, 1, 0, OPT_PERIOD_SIZE}, {avail-min, 1, 0, 'A'}, {start-delay, 1, 0, 'R'}, {stop-delay, 1, 0, 'T'}, {buffer-time, 1, 0, 'B'}, + {buffer-size, 1, 0, OPT_BUFFER_SIZE}, {verbose, 0, 0, 'v'}, {separate-channels, 0, 0, 'I'}, {playback, 0, 0, 'P'}, @@ -350,7 +359,7 @@ while ((c = getopt_long(argc, argv, short_options, long_options, option_index)) != -1) { switch (c) { - case OPT_HELP: + case 'h': usage(command); return 0; case OPT_VERSION: @@ -435,6 +444,12 @@ case 'B': buffer_time = atoi(optarg); break; + case OPT_PERIOD_SIZE: + period_frames = atoi(optarg); + break; + case OPT_BUFFER_SIZE: + buffer_frames = atoi(optarg); + break; case 'A': avail_min = atoi(optarg); break; @@ -829,15 +844,28 @@
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.47,1.48
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv13006 Modified Files: es1968.c Log Message: removed buggy copy callback. the standard copy routine works properly. Index: es1968.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- es1968.c5 Aug 2003 12:45:12 - 1.47 +++ es1968.c6 Aug 2003 17:44:50 - 1.48 @@ -1642,28 +1642,6 @@ return 0; } -static int snd_es1968_capture_copy(snd_pcm_substream_t *substream, - int channel, snd_pcm_uframes_t pos, - void *buf, snd_pcm_uframes_t count) -{ - //es1968_t *chip = snd_pcm_substream_chip(substream); - snd_pcm_runtime_t *runtime = substream-runtime; - esschan_t *es = snd_magic_cast(esschan_t, runtime-private_data, return -ENXIO); - char *src = runtime-dma_area; - - if (runtime-channels == 1) - return copy_to_user(buf, src + pos, count) ? -EFAULT : 0; - else { - count /= 2; - pos /= 2; - if (copy_to_user(buf, src + pos, count)) - return -EFAULT; - if (copy_to_user(buf + count, src + pos + es-dma_size/2, count)) - return -EFAULT; - return 0; - } -} - static int snd_es1968_capture_open(snd_pcm_substream_t *substream) { snd_pcm_runtime_t *runtime = substream-runtime; @@ -1778,7 +1756,6 @@ .prepare = snd_es1968_pcm_prepare, .trigger = snd_es1968_pcm_trigger, .pointer = snd_es1968_pcm_pointer, - .copy = snd_es1968_capture_copy, }; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation/DocBook writing-an-alsa-driver.tmpl,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook In directory sc8-pr-cvs1:/tmp/cvs-serv16846 Modified Files: writing-an-alsa-driver.tmpl Log Message: fix typos Index: writing-an-alsa-driver.tmpl === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- writing-an-alsa-driver.tmpl 3 Jul 2003 11:37:29 - 1.12 +++ writing-an-alsa-driver.tmpl 11 Aug 2003 12:37:56 - 1.13 @@ -438,7 +438,7 @@ // chip-specific constructor // (see Management of Cards and Components) static int __devinit snd_mychip_create(snd_card_t *card, - struct pci_device *pci, + struct pci_dev *pci, mychip_t **rchip) { mychip_t *chip; @@ -1915,7 +1915,7 @@ }; /* open callback */ - static int snd_mychip_pcm_open(snd_pcm_substream_t *subs) + static int snd_mychip_pcm_open(snd_pcm_substream_t *substream) { mychip_t *chip = snd_pcm_substream_chip(substream); snd_pcm_runtime_t *runtime = substream-runtime; @@ -2716,7 +2716,7 @@ informalexample programlisting ![CDATA[ - static int snd_xxx_open(snd_pcm_substream_t *subs); + static int snd_xxx_open(snd_pcm_substream_t *substream); ]] /programlisting /informalexample @@ -2767,7 +2767,7 @@ informalexample programlisting ![CDATA[ - static int snd_xxx_close(snd_pcm_substream_t *subs); + static int snd_xxx_close(snd_pcm_substream_t *substream); ]] /programlisting /informalexample --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_plugin.c,1.15,1.16 pcm_plugin.h,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/core/oss In directory sc8-pr-cvs1:/tmp/cvs-serv13195 Modified Files: pcm_plugin.c pcm_plugin.h Log Message: removed unused functions. Index: pcm_plugin.c === RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pcm_plugin.c24 Jul 2003 13:33:52 - 1.15 +++ pcm_plugin.c6 Aug 2003 17:45:09 - 1.16 @@ -923,47 +923,6 @@ return 0; } -int snd_pcm_areas_silence(const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t dst_offset, - unsigned int channels, snd_pcm_uframes_t frames, int format) -{ - int width = snd_pcm_format_physical_width(format); - while (channels 0) { - void *addr = dst_areas-addr; - unsigned int step = dst_areas-step; - const snd_pcm_channel_area_t *begin = dst_areas; - int vc = channels; - unsigned int v = 0; - int err; - while (1) { - vc--; - v++; - dst_areas++; - if (vc == 0 || - dst_areas-addr != addr || - dst_areas-step != step || - dst_areas-first != dst_areas[-1].first + width) - break; - } - if (v 1 v * width == step) { - /* Collapse the areas */ - snd_pcm_channel_area_t d; - d.addr = begin-addr; - d.first = begin-first; - d.step = width; - err = snd_pcm_area_silence(d, dst_offset * v, frames * v, format); - channels -= v; - } else { - err = snd_pcm_area_silence(begin, dst_offset, frames, format); - dst_areas = begin + 1; - channels--; - } - if (err 0) - return err; - } - return 0; -} - - int snd_pcm_area_copy(const snd_pcm_channel_area_t *src_area, size_t src_offset, const snd_pcm_channel_area_t *dst_area, size_t dst_offset, size_t samples, int format) @@ -1055,53 +1014,6 @@ } default: snd_BUG(); - } - return 0; -} - -int snd_pcm_areas_copy(const snd_pcm_channel_area_t *src_areas, snd_pcm_uframes_t src_offset, - const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t dst_offset, - unsigned int channels, snd_pcm_uframes_t frames, int format) -{ - int width = snd_pcm_format_physical_width(format); - while (channels 0) { - unsigned int step = src_areas-step; - void *src_addr = src_areas-addr; - const snd_pcm_channel_area_t *src_start = src_areas; - void *dst_addr = dst_areas-addr; - const snd_pcm_channel_area_t *dst_start = dst_areas; - int vc = channels; - unsigned int v = 0; - while (dst_areas-step == step) { - vc--; - v++; - src_areas++; - dst_areas++; - if (vc == 0 || - src_areas-step != step || - src_areas-addr != src_addr || - dst_areas-addr != dst_addr || - src_areas-first != src_areas[-1].first + width || - dst_areas-first != dst_areas[-1].first + width) - break; - } - if (v 1 v * width == step) { - /* Collapse the areas */ - snd_pcm_channel_area_t s, d; - s.addr = src_start-addr; - s.first = src_start-first; - s.step = width; - d.addr = dst_start-addr; - d.first = dst_start-first; - d.step = width; - snd_pcm_area_copy(s, src_offset * v, d, dst_offset * v, frames * v, format); - channels -= v; - } else { - snd_pcm_area_copy(src_start, src_offset, dst_start, dst_offset, frames, format); - src_areas = src_start + 1; - dst_areas = dst_start + 1; - channels--; - } } return 0; } Index: pcm_plugin.h === RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 ---
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.87,1.88
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv16809 Modified Files: intel8x0.c Log Message: fix mixed up vendor/device ID's for Asus P4P800 Index: intel8x0.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- intel8x0.c 30 Jul 2003 14:39:38 - 1.87 +++ intel8x0.c 11 Aug 2003 12:37:36 - 1.88 @@ -1568,6 +1568,12 @@ .name = ASUS P4PE Mobo, .type = AC97_TUNE_SWAP_SURROUND }, + { + .vendor = 0x1043, + .device = 0x80f3, + .name = ASUS ICH5/AD1985, + .type = AC97_TUNE_AD_SHARING + }, { .vendor = 0x10f1, .device = 0x2665, @@ -1641,12 +1647,6 @@ .mask = 0xfff0, .name = Intel ICH5/AD1985 (discrete), .type = AC97_TUNE_HP_ONLY - }, - { - .vendor = 0x80f3, - .device = 0x1043, - .name = ASUS ICH5/AD1985, - .type = AC97_TUNE_AD_SHARING }, { } /* terminator */ }; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/opl3 opl3_lib.c,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/drivers/opl3 In directory sc8-pr-cvs1:/tmp/cvs-serv16068/drivers/opl3 Modified Files: opl3_lib.c Log Message: fixed the wrong order of object destruction: a released object is referred after the *_free() call. Index: opl3_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl3/opl3_lib.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- opl3_lib.c 21 Jun 2003 07:52:37 - 1.17 +++ opl3_lib.c 14 Aug 2003 11:05:38 - 1.18 @@ -440,9 +440,9 @@ default: opl3-command = snd_opl2_command; if ((err = snd_opl3_detect(opl3)) 0) { - snd_opl3_free(opl3); snd_printd(OPL2/3 chip not detected at 0x%lx/0x%lx\n, opl3-l_port, opl3-r_port); + snd_opl3_free(opl3); return err; } /* detect routine returns correct hardware type */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emu10k1.c,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1 In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/emu10k1 Modified Files: emu10k1.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: emu10k1.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- emu10k1.c 25 Jul 2003 10:39:38 - 1.19 +++ emu10k1.c 12 Aug 2003 14:10:15 - 1.20 @@ -78,7 +78,7 @@ MODULE_PARM_DESC(enable_ir, Enable IR.); MODULE_PARM_SYNTAX(enable_ir, SNDRV_ENABLE_DESC); -static struct pci_device_id snd_emu10k1_ids[] __devinitdata = { +static struct pci_device_id snd_emu10k1_ids[] = { { 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },/* EMU10K1 */ { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },/* Dell OEM version (EMU10K1) */ { 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },/* Audigy */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/cs46xx Modified Files: cs46xx.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: cs46xx.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cs46xx.c18 Jun 2003 11:07:21 - 1.21 +++ cs46xx.c12 Aug 2003 14:10:14 - 1.22 @@ -72,7 +72,7 @@ MODULE_PARM_DESC(mmap_valid, Support OSS mmap.); MODULE_PARM_SYNTAX(mmap_valid, SNDRV_ENABLED , SNDRV_BOOLEAN_FALSE_DESC); -static struct pci_device_id snd_cs46xx_ids[] __devinitdata = { +static struct pci_device_id snd_cs46xx_ids[] = { { 0x1013, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4280 */ { 0x1013, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4612 */ { 0x1013, 0x6004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4615 */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/arm sa11xx-uda1341.c,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/arm In directory sc8-pr-cvs1:/tmp/cvs-serv23748 Modified Files: sa11xx-uda1341.c Log Message: fixed missing spin_lock_init(). Index: sa11xx-uda1341.c === RCS file: /cvsroot/alsa/alsa-kernel/arm/sa11xx-uda1341.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sa11xx-uda1341.c30 Apr 2003 14:53:11 - 1.11 +++ sa11xx-uda1341.c13 Aug 2003 13:14:31 - 1.12 @@ -965,6 +965,8 @@ sa11xx_uda1341 = snd_magic_kcalloc(sa11xx_uda1341_t, 0, GFP_KERNEL); if (sa11xx_uda1341 == NULL) return -ENOMEM; + spin_lock_init(chip-s[0].dma_lock); + spin_lock_init(chip-s[1].dma_lock); card-private_data = (void *)sa11xx_uda1341; card-private_free = snd_sa11xx_uda1341_free; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci azt3328.c,1.2,1.3 cs4281.c,1.43,1.44 ens1370.c,1.47,1.48 es1938.c,1.26,1.27 es1968.c,1.51,1.52 sonicvibes.c,1.25,1.26 via82xx.c,1.45,1.46
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci Modified Files: azt3328.c cs4281.c ens1370.c es1938.c es1968.c sonicvibes.c via82xx.c Log Message: fixed the wrong order of object destruction: a released object is referred after the *_free() call. Index: azt3328.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azt3328.c 12 Aug 2003 14:10:12 - 1.2 +++ azt3328.c 14 Aug 2003 11:05:38 - 1.3 @@ -1347,38 +1347,38 @@ chip-codec_port = pci_resource_start(pci, 0); if ((chip-res_codec_port = request_region(chip-codec_port, 0x80, Aztech AZF3328 I/O)) == NULL) { - snd_azf3328_free(chip); snd_printk(unable to grab I/O port at 0x%lx-0x%lx\n, chip-codec_port, chip-codec_port + 0x80 - 1); + snd_azf3328_free(chip); return -EBUSY; } chip-io2_port = pci_resource_start(pci, 1); if ((chip-res_io2_port = request_region(chip-io2_port, 0x08, Aztech AZF3328 I/O 2)) == NULL) { - snd_azf3328_free(chip); snd_printk(unable to grab I/O 2 port at 0x%lx-0x%lx\n, chip-io2_port, chip-io2_port + 0x08 - 1); + snd_azf3328_free(chip); return -EBUSY; } chip-mpu_port = pci_resource_start(pci, 2); if ((chip-res_mpu_port = request_region(chip-mpu_port, 0x04, Aztech AZF3328 MPU401)) == NULL) { - snd_azf3328_free(chip); snd_printk(unable to grab MPU401 port at 0x%lx-0x%lx\n, chip-mpu_port, chip-mpu_port + 0x04 - 1); + snd_azf3328_free(chip); return -EBUSY; } chip-synth_port = pci_resource_start(pci, 3); if ((chip-res_synth_port = request_region(chip-synth_port, 0x08, Aztech AZF3328 OPL3)) == NULL) { - snd_azf3328_free(chip); snd_printk(unable to grab OPL3 port at 0x%lx-0x%lx\n, chip-synth_port, chip-synth_port + 0x08 - 1); + snd_azf3328_free(chip); return -EBUSY; } chip-mixer_port = pci_resource_start(pci, 4); if ((chip-res_mixer_port = request_region(chip-mixer_port, 0x40, Aztech AZF3328 Mixer)) == NULL) { - snd_azf3328_free(chip); snd_printk(unable to grab mixer port at 0x%lx-0x%lx\n, chip-mixer_port, chip-mixer_port + 0x40 - 1); + snd_azf3328_free(chip); return -EBUSY; } if (request_irq(pci-irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ, card-shortname, (void *)chip)) { - snd_azf3328_free(chip); snd_printk(unable to grab IRQ %d\n, pci-irq); + snd_azf3328_free(chip); return -EBUSY; } chip-irq = pci-irq; @@ -1499,8 +1499,8 @@ if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_MPU401, chip-mpu_port, 1, pci-irq, 0, chip-rmidi)) 0) { - snd_card_free(card); snd_printk(azf3328: no MPU-401 device at 0x%lx?\n, chip-mpu_port); + snd_card_free(card); return err; } Index: cs4281.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- cs4281.c12 Aug 2003 14:10:12 - 1.43 +++ cs4281.c14 Aug 2003 11:05:38 - 1.44 @@ -1439,18 +1439,18 @@ chip-dual_codec = dual_codec; if ((chip-ba0_res = request_mem_region(chip-ba0_addr, CS4281_BA0_SIZE, CS4281 BA0)) == NULL) { - snd_cs4281_free(chip); snd_printk(KERN_ERR unable to grab memory region 0x%lx-0x%lx\n, chip-ba0_addr, chip-ba0_addr + CS4281_BA0_SIZE - 1); + snd_cs4281_free(chip); return -ENOMEM; } if ((chip-ba1_res = request_mem_region(chip-ba1_addr, CS4281_BA1_SIZE, CS4281 BA1)) == NULL) { - snd_cs4281_free(chip); snd_printk(KERN_ERR unable to grab memory region 0x%lx-0x%lx\n, chip-ba1_addr, chip-ba1_addr + CS4281_BA1_SIZE - 1); + snd_cs4281_free(chip); return -ENOMEM; } if (request_irq(pci-irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ, CS4281, (void *)chip)) { - snd_cs4281_free(chip); snd_printk(KERN_ERR unable to grab IRQ %d\n, pci-irq); + snd_cs4281_free(chip); return -ENOMEM; } chip-irq = pci-irq; Index: ens1370.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.42,1.43 rme9652.c,1.35,1.36
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652 In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/rme9652 Modified Files: hdsp.c rme9652.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: hdsp.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- hdsp.c 28 Jul 2003 13:50:51 - 1.42 +++ hdsp.c 12 Aug 2003 14:10:16 - 1.43 @@ -473,7 +473,7 @@ } #endif -static struct pci_device_id snd_hdsp_ids[] __devinitdata = { +static struct pci_device_id snd_hdsp_ids[] = { { .vendor = PCI_VENDOR_ID_XILINX, .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, Index: rme9652.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- rme9652.c 3 Jul 2003 11:31:21 - 1.35 +++ rme9652.c 12 Aug 2003 14:10:16 - 1.36 @@ -345,7 +345,7 @@ #endif -static struct pci_device_id snd_rme9652_ids[] __devinitdata = { +static struct pci_device_id snd_rme9652_ids[] = { { .vendor= 0x10ee, .device= 0x3fc4, --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci.c,1.25,1.26
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/ymfpci Modified Files: ymfpci.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: ymfpci.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ymfpci.c21 Jun 2003 07:52:39 - 1.25 +++ ymfpci.c12 Aug 2003 14:10:16 - 1.26 @@ -67,7 +67,7 @@ MODULE_PARM_DESC(rear_switch, Enable shared rear/line-in switch); MODULE_PARM_SYNTAX(rear_switch, SNDRV_ENABLED , SNDRV_BOOLEAN_FALSE_DESC); -static struct pci_device_id snd_ymfpci_ids[] __devinitdata = { +static struct pci_device_id snd_ymfpci_ids[] = { { 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */ { 0x1073, 0x000d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724F */ { 0x1073, 0x000a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740 */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/conf/pcm surround41.conf,NONE,1.1 surround50.conf,NONE,1.1 Makefile.am,1.2,1.3
Update of /cvsroot/alsa/alsa-lib/src/conf/pcm In directory sc8-pr-cvs1:/tmp/cvs-serv1333/pcm Modified Files: Makefile.am Added Files: surround41.conf surround50.conf Log Message: Added surround41 and surround50 definitions --- NEW FILE: surround41.conf --- # # Hardware output from 4.1 speakers. # Samples must be positioned: #chn0 - front left #chn1 - front right #chn2 - rear left #chn3 - rear right #chn4 - LFE # pcm.!surround41 { @args [ CARD DEV ] @args.CARD { type string default { @func getenv vars [ ALSA_SURROUND41_CARD ALSA_PCM_CARD ALSA_CARD ] default { @func refer name defaults.pcm.surround41.card } } } @args.DEV { type integer default { @func igetenv vars [ ALSA_SURROUND41_DEVICE ] default { @func refer name defaults.pcm.surround41.device } } } type route slave.pcm { @func refer name { @func concat strings [ cards. { @func card_driver card $CARD } .pcm.surround51. $DEV :CARD= $CARD ] } } slave.channels 6 ttable.0.0 1 ttable.1.1 1 ttable.2.2 1 ttable.3.3 1 ttable.4.5 1 } --- NEW FILE: surround50.conf --- # # Hardware output from 5.0 speakers. # Samples must be positioned: #chn0 - front left #chn1 - front right #chn2 - rear left #chn3 - rear right #chn4 - center # pcm.!surround50 { @args [ CARD DEV ] @args.CARD { type string default { @func getenv vars [ ALSA_SURROUND50_CARD ALSA_PCM_CARD ALSA_CARD ] default { @func refer name defaults.pcm.surround50.card } } } @args.DEV { type integer default { @func igetenv vars [ ALSA_SURROUND50_DEVICE ] default { @func refer name defaults.pcm.surround50.device } } } type route slave.pcm { @func refer name { @func concat strings [ cards. { @func card_driver card $CARD } .pcm.surround51. $DEV :CARD= $CARD ] } } slave.channels 6 ttable.0.0 1 ttable.1.1 1 ttable.2.2 1 ttable.3.3 1 ttable.4.4 1 } Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-lib/src/conf/pcm/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 25 Jun 2001 08:45:53 - 1.2 +++ Makefile.am 12 Aug 2003 09:34:38 - 1.3 @@ -1,5 +1,7 @@ -cfg_files = front.conf rear.conf center_lfe.conf surround40.conf \ - surround51.conf iec958.conf +cfg_files = front.conf rear.conf center_lfe.conf \ + surround40.conf surround41.conf \ + surround50.conf surround51.conf \ + iec958.conf EXTRA_DIST = $(cfg_files) --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED]
[alsa-cvslog] CVS: alsa-kernel/Documentation/DocBook writing-an-alsa-driver.tmpl,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook In directory sc8-pr-cvs1:/tmp/cvs-serv28090/DocBook Modified Files: writing-an-alsa-driver.tmpl Log Message: removed __devinitdata prefix from pci id table. Index: writing-an-alsa-driver.tmpl === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- writing-an-alsa-driver.tmpl 11 Aug 2003 12:37:56 - 1.13 +++ writing-an-alsa-driver.tmpl 12 Aug 2003 15:38:01 - 1.14 @@ -1340,7 +1340,7 @@ } // PCI IDs - static struct pci_device_id snd_mychip_ids[] __devinitdata = { + static struct pci_device_id snd_mychip_ids[] = { { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, @@ -1718,7 +1718,7 @@ informalexample programlisting ![CDATA[ - static struct pci_device_id snd_mychip_ids[] __devinitdata = { + static struct pci_device_id snd_mychip_ids[] = { { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident.c,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/pci/trident In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/trident Modified Files: trident.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: trident.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- trident.c 21 Jun 2003 07:52:38 - 1.19 +++ trident.c 12 Aug 2003 14:10:16 - 1.20 @@ -69,7 +69,7 @@ MODULE_PARM_DESC(wavetable_size, Maximum memory size in kB for wavetable synth.); MODULE_PARM_SYNTAX(wavetable_size, SNDRV_ENABLED ,default:8192,skill:advanced); -static struct pci_device_id snd_trident_ids[] __devinitdata = { +static struct pci_device_id snd_trident_ids[] = { { 0x1023, 0x2000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Trident 4DWave DX PCI Audio */ { 0x1023, 0x2001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Trident 4DWave NX PCI Audio */ { 0x1039, 0x7018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* SiS SI7018 PCI Audio */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb es968.c,1.18,1.19 sb16.c,1.36,1.37
Update of /cvsroot/alsa/alsa-kernel/isa/sb In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa/sb Modified Files: es968.c sb16.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: es968.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- es968.c 9 May 2003 14:07:24 - 1.18 +++ es968.c 12 Aug 2003 14:10:12 - 1.19 @@ -69,7 +69,7 @@ struct pnp_dev *dev; }; -static struct pnp_card_device_id snd_es968_pnpids[] __devinitdata = { +static struct pnp_card_device_id snd_es968_pnpids[] = { { .id = ESS0968, .devs = { { @@@0968 }, } }, { .id = , } /* end */ }; Index: sb16.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sb16.c 28 Jul 2003 10:20:21 - 1.36 +++ sb16.c 12 Aug 2003 14:10:12 - 1.37 @@ -157,7 +157,7 @@ static snd_card_t *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; -static struct pnp_card_device_id snd_sb16_pnpids[] __devinitdata = { +static struct pnp_card_device_id snd_sb16_pnpids[] = { #ifndef SNDRV_SBAWE /* Sound Blaster 16 PnP */ { .id = CTL0024, .devs = { { CTL0031 } } }, --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/conf alsa.conf,1.13,1.14
Update of /cvsroot/alsa/alsa-lib/src/conf In directory sc8-pr-cvs1:/tmp/cvs-serv1333 Modified Files: alsa.conf Log Message: Added surround41 and surround50 definitions Index: alsa.conf === RCS file: /cvsroot/alsa/alsa-lib/src/conf/alsa.conf,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- alsa.conf 6 Aug 2003 14:46:33 - 1.13 +++ alsa.conf 12 Aug 2003 09:34:38 - 1.14 @@ -61,6 +61,10 @@ defaults.pcm.center_lfe.device defaults.pcm.device defaults.pcm.surround40.card defaults.pcm.card defaults.pcm.surround40.device defaults.pcm.device +defaults.pcm.surround41.card defaults.pcm.card +defaults.pcm.surround41.device defaults.pcm.device +defaults.pcm.surround50.card defaults.pcm.card +defaults.pcm.surround50.device defaults.pcm.device defaults.pcm.surround51.card defaults.pcm.card defaults.pcm.surround51.device defaults.pcm.device defaults.pcm.iec958.card defaults.pcm.card @@ -313,6 +317,8 @@ pcm.rear cards.pcm.rear pcm.center_lfe cards.pcm.center_lfe pcm.surround40 cards.pcm.surround40 +pcm.surround41 cards.pcm.surround41 +pcm.surround50 cards.pcm.surround50 pcm.surround51 cards.pcm.surround51 pcm.iec958 cards.pcm.iec958 pcm.spdif cards.pcm.iec958 --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx_lib.c,1.62,1.63
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci/cs46xx Modified Files: cs46xx_lib.c Log Message: fixed the wrong order of object destruction: a released object is referred after the *_free() call. Index: cs46xx_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cs46xx_lib.c21 Jun 2003 07:52:38 - 1.62 +++ cs46xx_lib.c14 Aug 2003 11:05:38 - 1.63 @@ -3887,8 +3887,8 @@ chip-ba1_addr = pci_resource_start(pci, 1); if (chip-ba0_addr == 0 || chip-ba0_addr == (unsigned long)~0 || chip-ba1_addr == 0 || chip-ba1_addr == (unsigned long)~0) { - snd_cs46xx_free(chip); snd_printk(wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n, chip-ba0_addr, chip-ba1_addr); + snd_cs46xx_free(chip); return -ENOMEM; } --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront.c,1.23,1.24
Update of /cvsroot/alsa/alsa-kernel/isa/wavefront In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa/wavefront Modified Files: wavefront.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: wavefront.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- wavefront.c 9 May 2003 14:07:24 - 1.23 +++ wavefront.c 12 Aug 2003 14:10:12 - 1.24 @@ -102,7 +102,7 @@ #ifdef CONFIG_PNP -static struct pnp_card_device_id snd_wavefront_pnpids[] __devinitdata = { +static struct pnp_card_device_id snd_wavefront_pnpids[] = { /* Tropez */ { .id = CSC7532, .devs = { { CSC }, { CSC0010 }, { PnPb006 }, { CSC0004 } } }, /* Tropez+ */ --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci als4000.c,1.20,1.21 azt3328.c,1.1,1.2 cmipci.c,1.47,1.48 cs4281.c,1.42,1.43 ens1370.c,1.46,1.47 es1938.c,1.25,1.26 es1968.c,1.50,1.51 fm801.c,1.34,1.35 intel8x0.c,1.88,1.89 maestro3.c,1.40,1.41 rme32.c,1.24,1.25 rme96.c,1.27,1.28 sonicvibes.c,1.24,1.25 via82xx.c,1.44,1.45
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci Modified Files: als4000.c azt3328.c cmipci.c cs4281.c ens1370.c es1938.c es1968.c fm801.c intel8x0.c maestro3.c rme32.c rme96.c sonicvibes.c via82xx.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: als4000.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- als4000.c 23 Apr 2003 10:01:43 - 1.20 +++ als4000.c 12 Aug 2003 14:10:12 - 1.21 @@ -107,7 +107,7 @@ unsigned long gcr; } snd_card_als4000_t; -static struct pci_device_id snd_als4000_ids[] __devinitdata = { +static struct pci_device_id snd_als4000_ids[] = { { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */ { 0, } }; Index: azt3328.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azt3328.c 2 Jun 2003 12:59:41 - 1.1 +++ azt3328.c 12 Aug 2003 14:10:12 - 1.2 @@ -205,7 +205,7 @@ spinlock_t reg_lock; }; -static struct pci_device_id snd_azf3328_ids[] __devinitdata = { +static struct pci_device_id snd_azf3328_ids[] = { { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */ { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */ { 0, } Index: cmipci.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- cmipci.c2 Jul 2003 10:31:16 - 1.47 +++ cmipci.c12 Aug 2003 14:10:12 - 1.48 @@ -2819,7 +2819,7 @@ } -static struct pci_device_id snd_cmipci_ids[] __devinitdata = { +static struct pci_device_id snd_cmipci_ids[] = { {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, Index: cs4281.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- cs4281.c21 Jun 2003 07:52:38 - 1.42 +++ cs4281.c12 Aug 2003 14:10:12 - 1.43 @@ -513,7 +513,7 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_cs4281_ids[] __devinitdata = { +static struct pci_device_id snd_cs4281_ids[] = { { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ { 0, } }; Index: ens1370.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ens1370.c 21 Jun 2003 07:52:38 - 1.46 +++ ens1370.c 12 Aug 2003 14:10:12 - 1.47 @@ -417,7 +417,7 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_audiopci_ids[] __devinitdata = { +static struct pci_device_id snd_audiopci_ids[] = { #ifdef CHIP1370 { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */ #endif Index: es1938.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- es1938.c21 Jun 2003 07:52:38 - 1.25 +++ es1938.c12 Aug 2003 14:10:12 - 1.26 @@ -251,7 +251,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_es1938_ids[] __devinitdata = { +static struct pci_device_id snd_es1938_ids[] = { { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */ { 0, } }; Index: es1968.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- es1968.c11 Aug 2003 09:20:00 - 1.50 +++ es1968.c12 Aug 2003 14:10:12 - 1.51 @@ -602,7 +602,7 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_es1968_ids[] __devinitdata = { +static struct pci_device_id snd_es1968_ids[] = { /* Maestro 1 */ { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO 8, 0x00, TYPE_MAESTRO }, /* Maestro 2 */ Index: fm801.c
[alsa-cvslog] CVS: alsa-kernel/pci/vx222 vx222.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/pci/vx222 In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/vx222 Modified Files: vx222.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: vx222.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/vx222/vx222.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vx222.c 23 May 2003 16:00:45 - 1.1 +++ vx222.c 12 Aug 2003 14:10:16 - 1.2 @@ -68,7 +68,7 @@ VX_PCI_VX222_NEW }; -static struct pci_device_id snd_vx222_ids[] __devinitdata = { +static struct pci_device_id snd_vx222_ids[] = { { 0x10b5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, }, /* PLX */ { 0x10b5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, }, /* PLX */ { 0, } --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gusclassic.c,1.10,1.11 gusextreme.c,1.10,1.11 gusmax.c,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/isa/gus In directory sc8-pr-cvs1:/tmp/cvs-serv16068/isa/gus Modified Files: gusclassic.c gusextreme.c gusmax.c Log Message: fixed the wrong order of object destruction: a released object is referred after the *_free() call. Index: gusclassic.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusclassic.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gusclassic.c21 Oct 2002 18:28:22 - 1.10 +++ gusclassic.c14 Aug 2003 11:05:38 - 1.11 @@ -189,8 +189,8 @@ return err; } if (gus-max_flag || gus-ess_flag) { - snd_card_free(card); snd_printdd(GUS Classic or ACE soundcard was not detected at 0x%lx\n, gus-gf1.port); + snd_card_free(card); return -ENODEV; } if ((err = snd_gf1_new_mixer(gus)) 0) { Index: gusextreme.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gusextreme.c21 Oct 2002 18:28:22 - 1.10 +++ gusextreme.c14 Aug 2003 11:05:38 - 1.11 @@ -284,8 +284,8 @@ return err; } if (!gus-ess_flag) { - snd_card_free(card); snd_printdd(GUS Extreme soundcard was not detected at 0x%lx\n, gus-gf1.port); + snd_card_free(card); return -ENODEV; } if ((err = snd_es1688_pcm(es1688, 0, NULL)) 0) { Index: gusmax.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusmax.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gusmax.c23 Apr 2003 10:01:38 - 1.11 +++ gusmax.c14 Aug 2003 11:05:38 - 1.12 @@ -293,8 +293,8 @@ return err; } if (!gus-max_flag) { - snd_card_free(card); printk(KERN_ERR GUS MAX soundcard was not detected at 0x%lx\n, gus-gf1.port); + snd_card_free(card); return -ENODEV; } --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/nm256 nm256.c,1.29,1.30
Update of /cvsroot/alsa/alsa-kernel/pci/nm256 In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci/nm256 Modified Files: nm256.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: nm256.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- nm256.c 18 Jun 2003 11:07:21 - 1.29 +++ nm256.c 12 Aug 2003 14:10:16 - 1.30 @@ -276,7 +276,7 @@ #endif -static struct pci_device_id snd_nm256_ids[] __devinitdata = { +static struct pci_device_id snd_nm256_ids[] = { {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,}, --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/mixart mixart.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/pci/mixart In directory sc8-pr-cvs1:/tmp/cvs-serv27014/mixart Modified Files: mixart.c Log Message: removed __devinitdata from pci id table. Index: mixart.c === RCS file: /cvsroot/alsa/alsa-driver/pci/mixart/mixart.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mixart.c22 Jul 2003 13:39:10 - 1.1 +++ mixart.c12 Aug 2003 15:32:29 - 1.2 @@ -62,7 +62,7 @@ /* */ -static struct pci_device_id snd_mixart_ids[] __devinitdata = { +static struct pci_device_id snd_mixart_ids[] = { { 0x1057, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* MC8240 */ { 0, } }; --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/pdplus pdplus.c,1.12,1.13
Update of /cvsroot/alsa/alsa-driver/pci/pdplus In directory sc8-pr-cvs1:/tmp/cvs-serv27014/pdplus Modified Files: pdplus.c Log Message: removed __devinitdata from pci id table. Index: pdplus.c === RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/pdplus.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pdplus.c23 Apr 2003 10:01:21 - 1.12 +++ pdplus.c12 Aug 2003 15:32:30 - 1.13 @@ -6183,7 +6183,7 @@ LEAVE_VOID; } -static struct pci_device_id pdplus_ids[] __devinitdata = { +static struct pci_device_id pdplus_ids[] = { { PCI_VENDOR_ID_MARIAN, PCI_DEVICE_ID_MARIAN_PRODIF_PLUS, --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/acore info.inc,1.1,1.2 info.patch,1.1,1.2 pci_compat_22.c,1.3,1.4
Update of /cvsroot/alsa/alsa-driver/acore In directory sc8-pr-cvs1:/tmp/cvs-serv18847 Modified Files: info.inc info.patch pci_compat_22.c Log Message: Fixed compilation for 2.2 kernels. Added a workaround for PCI flags for 2.2 kernels (bad MMIO detection) Fixed bad kfree call.. Index: info.inc === RCS file: /cvsroot/alsa/alsa-driver/acore/info.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- info.inc30 May 2003 12:53:12 - 1.1 +++ info.inc11 Aug 2003 12:51:27 - 1.2 @@ -81,17 +81,12 @@ struct proc_dir_entry *de) { if (parent de) { - if (S_ISDIR(de-mode) de-data) { + if (S_ISLNK(de-mode) de-data) { kfree(de-data); de-data = 0; } proc_unregister(parent, de-low_ino); } } - -static struct inode_operations snd_info_entry_inode_operations = -{ - snd_info_entry_operations, /* default sound info directory file-ops */ -}; #endif /* LINUX_VERSION_CODE 2.4.0 */ Index: info.patch === RCS file: /cvsroot/alsa/alsa-driver/acore/info.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- info.patch 30 May 2003 12:53:12 - 1.1 +++ info.patch 11 Aug 2003 12:51:27 - 1.2 @@ -1,5 +1,5 @@ info.c 2003-05-30 14:29:41.0 +0200 -+++ info.c 2003-05-30 14:28:42.0 +0200 +--- ../../alsa-kernel/core/info.c Fri Jul 18 18:07:35 2003 info.c Mon Aug 11 11:16:29 2003 @@ -1,3 +1,4 @@ +#include info.inc /* @@ -41,7 +41,7 @@ return ret; } -@@ -489,7 +496,9 @@ +@@ -487,7 +494,9 @@ static struct file_operations snd_info_entry_operations = { @@ -51,7 +51,21 @@ .llseek = snd_info_entry_llseek, .read = snd_info_entry_read, .write =snd_info_entry_write, -@@ -908,9 +917,16 @@ +@@ -498,6 +507,13 @@ + .release = snd_info_entry_release, + }; + ++#ifdef LINUX_2_2 ++static struct inode_operations snd_info_entry_inode_operations = ++{ ++ snd_info_entry_operations, /* default sound info directory file-ops */ ++}; ++#endif ++ + /** + * snd_create_proc_entry - create a procfs entry + * @name: the name of the proc file +@@ -906,9 +922,16 @@ up(info_mutex); return -ENOMEM; } Index: pci_compat_22.c === RCS file: /cvsroot/alsa/alsa-driver/acore/pci_compat_22.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pci_compat_22.c 5 Mar 2003 11:36:39 - 1.3 +++ pci_compat_22.c 11 Aug 2003 12:51:27 - 1.4 @@ -175,16 +175,35 @@ return sz; } +/* hack, hack, hack - why 2.2 kernels are so broken? */ +static struct broken_addr { + u16 vendor; + u16 device; + u32 flags; +} broken_addr[] = { + { 0x8086, 0x2415, IORESOURCE_IO }, /* 82801AA */ + { 0x8086, 0x2425, IORESOURCE_IO }, /* 82901AB */ + { 0x8086, 0x2445, IORESOURCE_IO }, /* 82801BA */ + { 0x8086, 0x2485, IORESOURCE_IO }, /* ICH3 */ + { 0x8086, 0x7195, IORESOURCE_IO }, /* 440MX */ + { 0, 0, 0 } +}; + int snd_pci_compat_get_flags (struct pci_dev *dev, int n_base) { - unsigned long foo = dev-base_address[n_base] PCI_BASE_ADDRESS_SPACE; + unsigned long foo; int flags = 0; + + for (foo = 0; broken_addr[foo].vendor; foo++) + if (dev-vendor == broken_addr[foo].vendor + dev-device == broken_addr[foo].device) + return broken_addr[foo].flags; if (foo == 0) flags |= IORESOURCE_MEM; if (foo == 1) flags |= IORESOURCE_IO; - + return flags; } --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus interwave.c,1.24,1.25
Update of /cvsroot/alsa/alsa-kernel/isa/gus In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa/gus Modified Files: interwave.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: interwave.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/interwave.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- interwave.c 10 Jun 2003 14:07:20 - 1.24 +++ interwave.c 12 Aug 2003 14:10:11 - 1.25 @@ -138,7 +138,7 @@ #ifdef CONFIG_PNP -static struct pnp_card_device_id snd_interwave_pnpids[] __devinitdata = { +static struct pnp_card_device_id snd_interwave_pnpids[] = { #ifndef SNDRV_STB /* Gravis UltraSound Plug Play */ { .id = GRV0001, .devs = { { .id = GRV } } }, --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv28038 Modified Files: ALSA-Configuration.txt Log Message: sync'ed with 2.6 tree - added the description for MAKEDEV.snd. Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ALSA-Configuration.txt 6 Aug 2003 11:13:57 - 1.14 +++ ALSA-Configuration.txt 12 Aug 2003 15:37:42 - 1.15 @@ -27,6 +27,13 @@ isapnptools. +Creating ALSA devices += + +Use the MAKEDEV.snd script located in the directory named scripts +in the linux kernel tree. + + Module parameters = --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog