[alsa-cvslog] CVS: alsa-driver INSTALL,1.162,1.163 configure.in,1.235,1.236
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7487/alsa-driver Modified Files: INSTALL configure.in Log Message: move MPU-401 ACPI PnP driver to alsa-kernel Index: INSTALL === RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- INSTALL 11 Mar 2004 13:16:11 - 1.162 +++ INSTALL 15 Mar 2004 08:05:18 - 1.163 @@ -236,14 +236,6 @@ See docs/hdspm.txt for details. - Module snd-mpu401-acpi - -- - -Module for MPU-401 devices on ACPI-enabled motherboards. - -This module supports up to 8 devices and autoprobe. - - Trouble Shooting Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- configure.in5 Mar 2004 11:49:44 - 1.235 +++ configure.in15 Mar 2004 08:05:19 - 1.236 @@ -493,10 +493,6 @@ CHECK_KERNEL_CONFIG(CONFIG_PCI, [PCI support in kernel]) AC_SUBST(CONFIG_PCI) -dnl Check for ACPI bus driver... -CHECK_KERNEL_CONFIG(CONFIG_ACPI_BUS, [ACPI bus driver]) -AC_SUBST(CONFIG_ACPI_BUS) - dnl Check experimental drivers... CHECK_KERNEL_CONFIG(CONFIG_EXPERIMENTAL, [Experimental drivers in kernel]) AC_SUBST(CONFIG_EXPERIMENTAL) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.35,1.36
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7964/Documentation Modified Files: ALSA-Configuration.txt Log Message: integrate MPU-401 ACPI PnP from alsa-driver Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ALSA-Configuration.txt 11 Mar 2004 18:32:39 - 1.35 +++ ALSA-Configuration.txt 15 Mar 2004 08:07:51 - 1.36 @@ -755,8 +755,10 @@ port - port number or -1 (disable) irq- IRQ number or -1 (disable) +acpipnp- ACPI PnP detection - 0 = disable, 1 = enable (default) -Module supports multiple devices (max 8). +Module supports multiple devices (max 8) and ACPI PnP. If PnP is not +used (or ACPI not enabled), port and irq must be specified. Module snd-mtpav --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/mpu401 mpu401.c,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/drivers/mpu401
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7964/drivers/mpu401
Modified Files:
mpu401.c
Log Message:
integrate MPU-401 ACPI PnP from alsa-driver
Index: mpu401.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/mpu401/mpu401.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mpu401.c14 Oct 2003 13:08:13 - 1.12
+++ mpu401.c15 Mar 2004 08:07:51 - 1.13
@@ -2,6 +2,12 @@
* Driver for generic MPU-401 boards (UART mode only)
* Copyright (c) by Jaroslav Kysela [EMAIL PROTECTED]
*
+ * ACPI PnP Copyright (c) 2004 by Clemens Ladisch [EMAIL PROTECTED]
+ * based on 8250_acpi.c
+ * Copyright (c) 2002-2003 Matthew Wilcox for Hewlett-Packard
+ * Copyright (C) 2004 Hewlett-Packard Co
+ * Bjorn Helgaas [EMAIL PROTECTED]
+ *
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,14 +27,17 @@
#include sound/driver.h
#include linux/init.h
-#include linux/wait.h
-#include linux/sched.h
-#include linux/slab.h
+#ifdef CONFIG_ACPI_BUS
+#include acpi/acpi_bus.h
+#endif
#include sound/core.h
#include sound/mpu401.h
#define SNDRV_GET_ID
#include sound/initval.h
-#include linux/delay.h
+
+#ifdef CONFIG_ACPI_BUS
+#define USE_ACPI_PNP
+#endif
MODULE_AUTHOR(Jaroslav Kysela [EMAIL PROTECTED]);
MODULE_DESCRIPTION(MPU-401 UART);
@@ -38,6 +47,9 @@
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
+#ifdef USE_ACPI_PNP
+static int acpipnp[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 1 };
+#endif
static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* MPU-401 port number */
static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* MPU-401 IRQ */
#ifdef CONFIG_X86_PC9800
@@ -53,6 +65,11 @@
MODULE_PARM(enable, 1- __MODULE_STRING(SNDRV_CARDS) i);
MODULE_PARM_DESC(enable, Enable MPU-401 device.);
MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+#ifdef USE_ACPI_PNP
+MODULE_PARM(acpipnp, 1- __MODULE_STRING(SNDRV_CARDS) i);
+MODULE_PARM_DESC(acpipnp, ACPI PnP detection for MPU-401 device.);
+MODULE_PARM_SYNTAX(acpipnp, SNDRV_ENABLED , SNDRV_BOOLEAN_TRUE_DESC);
+#endif
MODULE_PARM(port, 1- __MODULE_STRING(SNDRV_CARDS) l);
MODULE_PARM_DESC(port, Port # for MPU-401 device.);
MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
@@ -65,25 +82,107 @@
MODULE_PARM_SYNTAX(pc98ii, SNDRV_BOOLEAN_FALSE_DESC);
#endif
-static snd_card_t *snd_mpu401_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+#ifndef CONFIG_ACPI_BUS
+struct acpi_device;
+#endif
+
+static snd_card_t *snd_mpu401_legacy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+#ifdef USE_ACPI_PNP
+
+struct mpu401_resources {
+ unsigned long port;
+ int irq;
+};
-static int __init snd_card_mpu401_probe(int dev)
+static acpi_status __devinit snd_mpu401_acpi_resource(struct acpi_resource *res,
+ void *data)
+{
+ struct mpu401_resources *resources = (struct mpu401_resources *)data;
+
+ if (res-id == ACPI_RSTYPE_IRQ) {
+ if (res-data.irq.number_of_interrupts 0) {
+#ifdef CONFIG_IA64
+ resources-irq = acpi_register_irq(res-data.irq.interrupts[0],
+
res-data.irq.active_high_low,
+ res-data.irq.edge_level);
+#else
+ resources-irq = res-data.irq.interrupts[0];
+#endif
+ }
+ } else if (res-id == ACPI_RSTYPE_IO) {
+ if (res-data.io.range_length = 2) {
+ resources-port = res-data.io.min_base_address;
+ }
+ }
+ return AE_OK;
+}
+
+static int __devinit snd_mpu401_acpi_pnp(int dev, struct acpi_device *device)
+{
+ struct mpu401_resources res;
+ acpi_status status;
+
+ res.port = SNDRV_AUTO_PORT;
+ res.irq = SNDRV_AUTO_IRQ;
+ status = acpi_walk_resources(device-handle, METHOD_NAME__CRS,
+snd_mpu401_acpi_resource, res);
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+ if (res.port == SNDRV_AUTO_PORT || res.irq == SNDRV_AUTO_IRQ) {
+ snd_printk(KERN_ERR no port or irq in %s _CRS\n,
+ acpi_device_bid(device));
+ return -ENODEV;
+ }
+ port[dev] = res.port;
+ irq[dev] = res.irq;
+ return 0;
+}
+
+#endif /* USE_ACPI_PNP */
+
+static int __devinit snd_card_mpu401_probe(int dev, struct acpi_device *device)
{
snd_card_t *card;
int err;
- if (port[dev] == SNDRV_AUTO_PORT) {
- snd_printk(specify port\n);
-
[alsa-cvslog] CVS: alsa-kernel/pci/au88x0 au88x0.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/pci/au88x0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8140/au88x0
Modified Files:
au88x0.c
Log Message:
fix compilation on gcc 2.95.x
Index: au88x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au88x0.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- au88x0.c10 Mar 2004 11:36:32 - 1.2
+++ au88x0.c15 Mar 2004 08:08:41 - 1.3
@@ -71,6 +71,8 @@
static void __devinit snd_vortex_workaround(struct pci_dev *vortex, int fix)
{
struct pci_dev *via = NULL;
+ int rc;
+
/* autodetect if workarounds are required */
while ((via = pci_find_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_8365_1, via))) {
@@ -86,8 +88,6 @@
if (fix == 255)
return;
- int rc;
-
/* fix vortex latency */
if (fix 0x01) {
if (!(rc = pci_write_config_byte(vortex, 0x40, 0xff))) {
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.125,1.126
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11597
Modified Files:
intel8x0.c
Log Message:
add Intel ICH6 and ESB
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- intel8x0.c 13 Mar 2004 16:40:14 - 1.125
+++ intel8x0.c 15 Mar 2004 08:27:04 - 1.126
@@ -55,6 +55,8 @@
{Intel,82801CA-ICH3},
{Intel,82801DB-ICH4},
{Intel,ICH5},
+ {Intel,ICH6},
+ {Intel,6300ESB},
{Intel,MX440},
{SiS,SI7012},
{NVidia,nForce Audio},
@@ -131,6 +133,12 @@
#ifndef PCI_DEVICE_ID_INTEL_ICH5
#define PCI_DEVICE_ID_INTEL_ICH5 0x24d5
#endif
+#ifndef PCI_DEVICE_ID_INTEL_ESB_5
+#define PCI_DEVICE_ID_INTEL_ESB_5 0x25a6
+#endif
+#ifndef PCI_DEVICE_ID_INTEL_ICH6_3
+#define PCI_DEVICE_ID_INTEL_ICH6_3 0x266e
+#endif
#ifndef PCI_DEVICE_ID_SI_7012
#define PCI_DEVICE_ID_SI_7012 0x7012
#endif
@@ -447,6 +455,8 @@
{ 0x8086, 0x2485, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH3 */
{ 0x8086, 0x24c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH4 */
{ 0x8086, 0x24d5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH5 */
+ { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */
+ { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */
{ 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
{ 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */
{ 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },/*
NFORCE */
@@ -2595,6 +2605,8 @@
{ PCI_DEVICE_ID_INTEL_ICH3, Intel 82801CA-ICH3 },
{ PCI_DEVICE_ID_INTEL_ICH4, Intel 82801DB-ICH4 },
{ PCI_DEVICE_ID_INTEL_ICH5, Intel ICH5 },
+ { PCI_DEVICE_ID_INTEL_ESB_5, Intel 6300ESB },
+ { PCI_DEVICE_ID_INTEL_ICH6_3, Intel ICH6 },
{ PCI_DEVICE_ID_SI_7012, SiS SI7012 },
{ PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, NVidia nForce },
{ PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, NVidia nForce2 },
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/au88x0 au88x0_core.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/pci/au88x0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23930
Modified Files:
au88x0_core.c
Log Message:
Make mchannels and rampchs static
Index: au88x0_core.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au88x0_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_core.c 9 Mar 2004 11:52:13 - 1.1
+++ au88x0_core.c 15 Mar 2004 09:32:11 - 1.2
@@ -82,8 +82,8 @@
/* MIXER (CAsp4Mix.s and CAsp4Mixer.s) */
// FIXME: get rid of this.
-int mchannels[NR_MIXIN];
-int rampchs[NR_MIXIN];
+static int mchannels[NR_MIXIN];
+static int rampchs[NR_MIXIN];
static void vortex_mixer_en_sr(vortex_t * vortex, int channel)
{
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/au88x0 au88x0_a3d.c,1.1,1.2 au88x0_game.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/pci/au88x0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4885
Modified Files:
au88x0_a3d.c au88x0_game.c
Log Message:
Fixed gameport dependency and solid kernel build
Index: au88x0_a3d.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au88x0_a3d.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_a3d.c9 Mar 2004 11:52:13 - 1.1
+++ au88x0_a3d.c15 Mar 2004 10:47:47 - 1.2
@@ -562,7 +562,7 @@
a3dsrc_SetA3DSampleRate(a3dsrc, 0x11);
}
-int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)
+static int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)
{
v-xt_mode = mode; /* this_14 */
Index: au88x0_game.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au88x0_game.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_game.c 9 Mar 2004 11:52:13 - 1.1
+++ au88x0_game.c 15 Mar 2004 10:47:47 - 1.2
@@ -37,6 +37,8 @@
#include au88x0.h
#include linux/gameport.h
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) defined(CONFIG_GAMEPORT_MODULE))
+
#define VORTEX_GAME_DWAIT 20 /* 20 ms */
static struct gameport gameport;
@@ -119,3 +121,10 @@
gameport_unregister_port(vortex-gameport);
return 0;
}
+
+#else
+
+static inline int vortex_gameport_register(vortex_t * vortex) { return 0; }
+static inline int vortex_gameport_unregister(vortex_t * vortex) { return 0; }
+
+#endif
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/scripts ksync,1.35,1.36
Update of /cvsroot/alsa/alsa-kernel/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5725
Modified Files:
ksync
Log Message:
added more file comments
Index: ksync
===
RCS file: /cvsroot/alsa/alsa-kernel/scripts/ksync,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ksync 29 Feb 2004 14:18:28 - 1.35
+++ ksync 15 Mar 2004 10:53:20 - 1.36
@@ -85,7 +85,10 @@
('/drivers/opl4','OPL4'),
('/drivers/vx' ,'Digigram VX core'),
('/drivers' ,'Generic drivers'),
+ ('/arm/Kconfig' ,'ARM'),
+ ('/arm/sa11xx-uda1341.c','SA11xx UDA1341 driver'),
('/arm' ,'ERROR'),
+ ('/isa/Kconfig' ,'ISA'),
('/isa/ad1816a' ,'AD1816A driver'),
('/isa/ad1848' ,'AD1848 driver'),
('/isa/cs423x/cs4231.*' ,'CS4231 driver'),
@@ -126,6 +129,7 @@
('/pci/ali5451' ,'ALI5451 driver'),
('/include/emu10k1.h' ,'EMU10K1/EMU10K2 driver'),
('/pci/emu10k1' ,'EMU10K1/EMU10K2 driver'),
+ ('/pci/au88x0' ,'au88x0 driver'),
('/pci/ice1712/envy24ht.h','ICE1724 driver'),
('/pci/ice1712/revo.(c|h)','ICE1724 driver'),
('/pci/ice1712/amp.(c|h)','ICE1724 driver'),
@@ -160,9 +164,12 @@
('/pci/sonicvibes.c','SonicVibes driver'),
('/pci/via82xx.c' ,'VIA82xx driver'),
('/pci/bt87x.c' ,'BT87x driver'),
+ ('/pci/atiixp.c','ATIIXP driver'),
+ ('/pci/intel8x0m.c' ,'Intel8x0-modem driver'),
('/pci/Kconfig' ,'PCI drivers'),
('/pci/Makefile','PCI drivers'),
('/pci' ,'ERROR'),
+ ('/ppc/Kconfig' ,'PPC'),
('/ppc/awacs.(ch)' ,'PPC AWACS driver'),
('/ppc/burgundy.(ch)' ,'PPC Burgundy driver'),
('/ppc/daca.c' ,'PPC DACA driver'),
@@ -181,7 +188,12 @@
('/i2c/i2c.c' ,'I2C lib core'),
('/i2c/cs8427.c','I2C cs8427'),
('/i2c' ,'ERROR'),
+ ('/parisc/harmony.c','PARISC Harmony driver'),
+ ('/parisc/Kconfig' ,'PARISC'),
('/parisc' ,'ERROR'),
+ ('/sparc/amd7930.c' ,'SPARC AMD7930 driver'),
+ ('/sparc/cs4231.c' ,'SPARC cs4231 driver'),
+ ('/sparc/Kconfig' ,'SPARC'),
('/sparc' ,'ERROR'),
('/include/emux_synth.h','Common EMU synth'),
('/synth/emux' ,'Common EMU synth'),
@@ -191,10 +203,12 @@
('/pcmcia/Kconfig' ,'PCMCIA Kconfig'),
('/pcmcia/Makefile' ,'PCMCIA'),
('/pcmcia' ,'ERROR'),
+ ('/usb/Kconfig' ,'USB'),
('/usb/usbaudio.(c|h)' ,'USB generic driver'),
('/usb/usbmidi.(c|h)' ,'USB generic driver'),
('/usb/usbmixer.(c|h)' ,'USB generic driver'),
('/usb/usbquirks.(c|h)' ,'USB generic driver'),
+ ('/usb/usbmixer_maps.c' ,'USB generic driver'),
('/usb' ,'ERROR'),
('/core/ioctl32','IOCTL32 emulation'),
('/include/pcm_oss.h' ,'ALSA-OSS emulation'),
@@ -204,6 +218,7 @@
('/include/seq_kernel.h','ALSA sequencer'),
('/include/asequencer.h','ALSA sequencer'),
('/core/seq','ALSA sequencer'),
+ ('/core/Kconfig','ALSA Core'),
('/core/memalloc.*' ,'Memalloc module'),
('/core/sgbuf.*','Memalloc module'),
('/core/rtctimer.*' ,'RTC timer driver'),
@@ -223,6 +238,7 @@
('/include/sndmagic.h' ,'ALSA Core'),
('/include/info.h' ,'ALSA Core'),
('/include/core.h' ,'ALSA Core'),
+ ('/include/memalloc.h' ,'ALSA Core'),
('/core/info.*' ,'ALSA Core'),
('/core/control.*' ,'ALSA Core'),
('/core/init.*' ,'ALSA Core'),
@@ -246,7 +262,8 @@
CVS_USER = {'perex':'Jaroslav Kysela [EMAIL PROTECTED]',
'uid53661':'Jaroslav Kysela [EMAIL PROTECTED]', # seems SF CVS
malfunction
'tiwai':'Takashi Iwai [EMAIL PROTECTED]',
- 'abramo':'Abramo Bagnara [EMAIL PROTECTED]'}
+ 'abramo':'Abramo Bagnara [EMAIL PROTECTED]',
+ 'cladisch':'Clemens Ladisch [EMAIL PROTECTED]'}
def usage(code, msg=''):
print __doc__ %
[alsa-cvslog] CVS: alsa-kernel/i2c cs8427.c,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/i2c In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15092 Modified Files: cs8427.c Log Message: Don't reset chip when PCM rate was not changed Index: cs8427.c === RCS file: /cvsroot/alsa/alsa-kernel/i2c/cs8427.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cs8427.c20 Jan 2004 16:15:02 - 1.16 +++ cs8427.c15 Mar 2004 11:49:18 - 1.17 @@ -553,6 +553,7 @@ SNDRV_CTL_EVENT_MASK_VALUE, chip-playback.pcm_ctl-id); reset = chip-rate != rate; + chip-rate = rate; snd_i2c_unlock(cs8427-bus); if (reset) snd_cs8427_reset(cs8427); --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emu10k1_callback.c,1.10,1.11 memory.c,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1/emu10k1 Modified Files: emu10k1_callback.c memory.c Log Message: fixed the mapping of silent pages on emu10k1 and trident SG buffers. Index: emu10k1_callback.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1_callback.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emu10k1_callback.c 2 Mar 2004 15:32:37 - 1.10 +++ emu10k1_callback.c 15 Mar 2004 17:29:41 - 1.11 @@ -426,7 +426,7 @@ snd_emu10k1_ptr_write(hw, CDF, ch, sample); /* invalidate maps */ - temp = ((unsigned int)hw-silent_page_dmaaddr 1) | MAP_PTI_MASK; + temp = ((unsigned int)hw-silent_page.addr 1) | MAP_PTI_MASK; snd_emu10k1_ptr_write(hw, MAPA, ch, temp); snd_emu10k1_ptr_write(hw, MAPB, ch, temp); Index: memory.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/memory.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- memory.c6 Mar 2004 16:51:30 - 1.16 +++ memory.c15 Mar 2004 17:29:41 - 1.17 @@ -62,7 +62,7 @@ page *= UNIT_PAGES; for (i = 0; i UNIT_PAGES; i++, page++) /* do not increment ptr */ - __set_ptb_entry(emu, page, emu-silent_page_dmaaddr); + __set_ptb_entry(emu, page, emu-silent_page.addr); } #endif /* PAGE_SIZE */ --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident_memory.c,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1/trident
Modified Files:
trident_memory.c
Log Message:
fixed the mapping of silent pages on emu10k1 and trident SG buffers.
Index: trident_memory.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_memory.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- trident_memory.c6 Mar 2004 16:51:31 - 1.13
+++ trident_memory.c15 Mar 2004 17:29:41 - 1.14
@@ -76,8 +76,8 @@
static inline void set_silent_tlb(trident_t *trident, int page)
{
page = 1;
- __set_tlb_bus(trident, page, (unsigned long)trident-tlb.silent_page,
trident-tlb.silent_page_dmaaddr);
- __set_tlb_bus(trident, page+1, (unsigned long)trident-tlb.silent_page,
trident-tlb.silent_page_dmaaddr);
+ __set_tlb_bus(trident, page, (unsigned long)trident-tlb.silent_page.area,
trident-tlb.silent_page.addr);
+ __set_tlb_bus(trident, page+1, (unsigned long)trident-tlb.silent_page.area,
trident-tlb.silent_page.addr);
}
#else
@@ -111,7 +111,7 @@
int i;
page *= UNIT_PAGES;
for (i = 0; i UNIT_PAGES; i++, page++)
- __set_tlb_bus(trident, page, (unsigned long)trident-tlb.silent_page,
trident-tlb.silent_page_dmaaddr);
+ __set_tlb_bus(trident, page, (unsigned
long)trident-tlb.silent_page.area, trident-tlb.silent_page.addr);
}
#endif /* PAGE_SIZE */
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core memalloc.c,1.27,1.28
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25658
Modified Files:
memalloc.c
Log Message:
fixed the compilation with sparc sbus support.
Index: memalloc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/memalloc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- memalloc.c 6 Mar 2004 16:51:28 - 1.27
+++ memalloc.c 15 Mar 2004 18:02:31 - 1.28
@@ -790,7 +790,7 @@
case SNDRV_DMA_TYPE_SBUS:
{
struct sbus_dev *sdev = (struct sbus_dev
*)(mem-dev.dev);
- len += sprintf(page + len, SBUS [%x], sbus-slot);
+ len += sprintf(page + len, SBUS [%x], sdev-slot);
}
break;
#endif
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/drivers/mpu401 mpu401.c,1.2,1.3
Update of /cvsroot/alsa/alsa-driver/drivers/mpu401 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6214 Modified Files: mpu401.c Log Message: fixed the build with 2.4 kernels and ACPI support. Index: mpu401.c === RCS file: /cvsroot/alsa/alsa-driver/drivers/mpu401/mpu401.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mpu401.c25 May 2002 10:25:37 - 1.2 +++ mpu401.c15 Mar 2004 19:00:41 - 1.3 @@ -1,2 +1,12 @@ +#include linux/config.h +#include linux/version.h + +/* FIXME: correct version? */ +#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,0) +#ifdef CONFIG_ACPI_BUS +static int acpi_disabled; /* dummy */ +#endif +#endif + #include ../../alsa-kernel/drivers/mpu401/mpu401.c EXPORT_NO_SYMBOLS; --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gusextreme.c,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14161
Modified Files:
gusextreme.c
Log Message:
[EMAIL PROTECTED]
Whilst chasing an oops, I shortened some error paths.
(Also sets card to NULL when something goes wrong).
Index: gusextreme.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gusextreme.c14 Oct 2003 13:08:17 - 1.12
+++ gusextreme.c15 Mar 2004 19:29:13 - 1.13
@@ -220,17 +220,17 @@
xgf1_irq = gf1_irq[dev];
if (xgf1_irq == SNDRV_AUTO_IRQ) {
if ((xgf1_irq = snd_legacy_find_free_irq(possible_gf1_irqs)) 0) {
- snd_card_free(card);
snd_printk(unable to find a free IRQ for GF1\n);
- return -EBUSY;
+ err = -EBUSY;
+ goto out;
}
}
xess_irq = irq[dev];
if (xess_irq == SNDRV_AUTO_IRQ) {
if ((xess_irq = snd_legacy_find_free_irq(possible_ess_irqs)) 0) {
- snd_card_free(card);
snd_printk(unable to find a free IRQ for ES1688\n);
- return -EBUSY;
+ err = -EBUSY;
+ goto out;
}
}
if (mpu_port[dev] == SNDRV_AUTO_PORT)
@@ -241,26 +241,24 @@
xgf1_dma = dma1[dev];
if (xgf1_dma == SNDRV_AUTO_DMA) {
if ((xgf1_dma = snd_legacy_find_free_dma(possible_gf1_dmas)) 0) {
- snd_card_free(card);
snd_printk(unable to find a free DMA for GF1\n);
- return -EBUSY;
+ err = -EBUSY;
+ goto out;
}
}
xess_dma = dma8[dev];
if (xess_dma == SNDRV_AUTO_DMA) {
if ((xess_dma = snd_legacy_find_free_dma(possible_ess_dmas)) 0) {
- snd_card_free(card);
snd_printk(unable to find a free DMA for ES1688\n);
- return -EBUSY;
+ err = -EBUSY;
+ goto out;
}
}
if ((err = snd_es1688_create(card, port[dev], mpu_port[dev],
xess_irq, xmpu_irq, xess_dma,
-ES1688_HW_1688, es1688)) 0) {
- snd_card_free(card);
- return err;
- }
+ES1688_HW_1688, es1688)) 0)
+ goto out;
if (gf1_port[dev] 0)
gf1_port[dev] = port[dev] + 0x20;
if ((err = snd_gus_create(card,
@@ -270,77 +268,65 @@
-1,
0, channels[dev],
pcm_channels[dev], 0,
- gus)) 0) {
- snd_card_free(card);
- return err;
- }
- if ((err = snd_gusextreme_detect(dev, card, gus, es1688)) 0) {
- snd_card_free(card);
- return err;
- }
+ gus)) 0)
+ goto out;
+
+ if ((err = snd_gusextreme_detect(dev, card, gus, es1688)) 0)
+ goto out;
+
snd_gusextreme_init(dev, gus);
- if ((err = snd_gus_initialize(gus)) 0) {
- snd_card_free(card);
- return err;
- }
+ if ((err = snd_gus_initialize(gus)) 0)
+ goto out;
+
if (!gus-ess_flag) {
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) {
- snd_card_free(card);
- return err;
- }
- if ((err = snd_es1688_mixer(es1688)) 0) {
- snd_card_free(card);
- return err;
+ err = -ENODEV;
+ goto out;
}
+ if ((err = snd_es1688_pcm(es1688, 0, NULL)) 0)
+ goto out;
+
+ if ((err = snd_es1688_mixer(es1688)) 0)
+ goto out;
+
snd_component_add(card, ES1688);
if (pcm_channels[dev] 0) {
- if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) 0) {
- snd_card_free(card);
- return err;
- }
- }
- if ((err = snd_gf1_new_mixer(gus)) 0) {
- snd_card_free(card);
- return err;
- }
- if ((err = snd_gusextreme_mixer(es1688)) 0) {
- snd_card_free(card);
- return err;
+ if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) 0)
+ goto out;
}
+
[alsa-cvslog] CVS: alsa-kernel/core init.c,1.43,1.44
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14574
Modified Files:
init.c
Log Message:
[EMAIL PROTECTED]
Try modprobing a driver that the hardware doesn't exist for.
In a few situations, you'll hit an oops due to proc_id not
being filled out that early.
Index: init.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- init.c 11 Mar 2004 18:58:04 - 1.43
+++ init.c 15 Mar 2004 19:31:01 - 1.44
@@ -281,7 +281,8 @@
}
if (card-private_free)
card-private_free(card);
- snd_info_unregister(card-proc_id);
+ if (card-proc_id)
+ snd_info_unregister(card-proc_id);
if (snd_info_card_free(card) 0) {
snd_printk(KERN_WARNING unable to free card info\n);
/* Not fatal error */
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa es18xx.c,1.43,1.44
Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244
Modified Files:
es18xx.c
Log Message:
[EMAIL PROTECTED]
This is a *really* silly one. The various probing routines in these
drivers can return -ENODEV, -ENOMEM etc.. so when we do something like
cards += probe_routine()
In some situations we can end up with -13 sound cards, and other
such nonsense. Result : lots of fun oopses.
Index: es18xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- es18xx.c6 Mar 2004 16:51:29 - 1.43
+++ es18xx.c15 Mar 2004 19:33:52 - 1.44
@@ -2232,7 +2232,7 @@
static int __init alsa_card_es18xx_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280, -1};
- int dev, cards = 0;
+ int dev, cards = 0, i;
/* legacy non-auto cards at first */
for (dev = 0; dev SNDRV_CARDS; dev++) {
@@ -2246,10 +2246,16 @@
cards++;
}
/* legacy auto configured cards */
- cards += snd_legacy_auto_probe(possible_ports,
snd_audiodrive_probe_legacy_port);
+ i = snd_legacy_auto_probe(possible_ports, snd_audiodrive_probe_legacy_port);
+ if (i 0)
+ cards += i;
+
#ifdef CONFIG_PNP
/* ISA PnP cards at last */
- cards += pnp_register_card_driver(es18xx_pnpc_driver);
+ i = pnp_register_card_driver(es18xx_pnpc_driver);
+ if (i 0)
+ cards += i;
+
#endif
if(!cards) {
#ifdef CONFIG_PNP
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gusclassic.c,1.12,1.13 gusextreme.c,1.13,1.14 gusmax.c,1.13,1.14 interwave.c,1.31,1.32
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244/gus
Modified Files:
gusclassic.c gusextreme.c gusmax.c interwave.c
Log Message:
[EMAIL PROTECTED]
This is a *really* silly one. The various probing routines in these
drivers can return -ENODEV, -ENOMEM etc.. so when we do something like
cards += probe_routine()
In some situations we can end up with -13 sound cards, and other
such nonsense. Result : lots of fun oopses.
Index: gusclassic.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusclassic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gusclassic.c14 Oct 2003 13:08:16 - 1.12
+++ gusclassic.c15 Mar 2004 19:33:52 - 1.13
@@ -238,7 +238,7 @@
static int __init alsa_card_gusclassic_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260,
-1};
- int dev, cards;
+ int dev, cards, i;
for (dev = cards = 0; dev SNDRV_CARDS enable[dev]; dev++) {
if (port[dev] == SNDRV_AUTO_PORT)
@@ -246,7 +246,10 @@
if (snd_gusclassic_probe(dev) = 0)
cards++;
}
- cards += snd_legacy_auto_probe(possible_ports,
snd_gusclassic_legacy_auto_probe);
+ i = snd_legacy_auto_probe(possible_ports, snd_gusclassic_legacy_auto_probe);
+ if (i 0)
+ cards += i;
+
if (!cards) {
#ifdef MODULE
printk(KERN_ERR GUS Classic soundcard not found or device busy\n);
Index: gusextreme.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gusextreme.c15 Mar 2004 19:29:13 - 1.13
+++ gusextreme.c15 Mar 2004 19:33:52 - 1.14
@@ -349,7 +349,7 @@
static int __init alsa_card_gusextreme_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};
- int dev, cards;
+ int dev, cards, i;
for (dev = cards = 0; dev SNDRV_CARDS enable[dev] 0; dev++) {
if (port[dev] == SNDRV_AUTO_PORT)
@@ -357,7 +357,10 @@
if (snd_gusextreme_probe(dev) = 0)
cards++;
}
- cards += snd_legacy_auto_probe(possible_ports,
snd_gusextreme_legacy_auto_probe);
+ i = snd_legacy_auto_probe(possible_ports, snd_gusextreme_legacy_auto_probe);
+ if (i 0)
+ cards += i;
+
if (!cards) {
#ifdef MODULE
printk(KERN_ERR GUS Extreme soundcard not found or device busy\n);
Index: gusmax.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusmax.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gusmax.c14 Oct 2003 13:08:18 - 1.13
+++ gusmax.c15 Mar 2004 19:33:52 - 1.14
@@ -378,7 +378,7 @@
static int __init alsa_card_gusmax_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260,
-1};
- int dev, cards;
+ int dev, cards, i;
for (dev = cards = 0; dev SNDRV_CARDS enable[dev] 0; dev++) {
if (port[dev] == SNDRV_AUTO_PORT)
@@ -386,7 +386,10 @@
if (snd_gusmax_probe(dev) = 0)
cards++;
}
- cards += snd_legacy_auto_probe(possible_ports, snd_gusmax_legacy_auto_probe);
+ i = snd_legacy_auto_probe(possible_ports, snd_gusmax_legacy_auto_probe);
+ if (i 0)
+ cards += i;
+
if (!cards) {
#ifdef MODULE
printk(KERN_ERR GUS MAX soundcard not found or device busy\n);
Index: interwave.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/interwave.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- interwave.c 31 Jan 2004 08:52:27 - 1.31
+++ interwave.c 15 Mar 2004 19:33:52 - 1.32
@@ -929,7 +929,7 @@
static int __init alsa_card_interwave_init(void)
{
- int cards = 0;
+ int cards = 0, i;
static long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260, -1};
int dev;
@@ -949,10 +949,14 @@
#endif
}
/* legacy auto configured cards */
- cards += snd_legacy_auto_probe(possible_ports,
snd_interwave_probe_legacy_port);
+ i = snd_legacy_auto_probe(possible_ports, snd_interwave_probe_legacy_port);
+ if (i 0)
+ cards += i;
#ifdef CONFIG_PNP
-/* ISA PnP cards */
-cards += pnp_register_card_driver(interwave_pnpc_driver);
+ /* ISA PnP cards */
+ i = pnp_register_card_driver(interwave_pnpc_driver);
+ if (i 0)
+ cards += i;
#endif
if (!cards) {
[alsa-cvslog] CVS: alsa-kernel/isa/sb sb16.c,1.44,1.45 sb8.c,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244/sb
Modified Files:
sb16.c sb8.c
Log Message:
[EMAIL PROTECTED]
This is a *really* silly one. The various probing routines in these
drivers can return -ENODEV, -ENOMEM etc.. so when we do something like
cards += probe_routine()
In some situations we can end up with -13 sound cards, and other
such nonsense. Result : lots of fun oopses.
Index: sb16.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sb16.c 26 Jan 2004 14:27:13 - 1.44
+++ sb16.c 15 Mar 2004 19:33:52 - 1.45
@@ -629,7 +629,7 @@
static int __init alsa_card_sb16_init(void)
{
- int dev, cards = 0;
+ int dev, cards = 0, i;
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280, -1};
/* legacy non-auto cards at first */
@@ -649,10 +649,15 @@
#endif
}
/* legacy auto configured cards */
- cards += snd_legacy_auto_probe(possible_ports, snd_sb16_probe_legacy_port);
+ i = snd_legacy_auto_probe(possible_ports, snd_sb16_probe_legacy_port);
+ if (i 0)
+ cards += i;
+
#ifdef CONFIG_PNP
/* PnP cards at last */
- cards += pnp_register_card_driver(sb16_pnpc_driver);
+ i = pnp_register_card_driver(sb16_pnpc_driver);
+ if (i 0)
+ cards += i;
#endif
if (!cards) {
Index: sb8.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb8.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sb8.c 14 Oct 2003 13:08:18 - 1.17
+++ sb8.c 15 Mar 2004 19:33:52 - 1.18
@@ -199,7 +199,7 @@
static int __init alsa_card_sb8_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};
- int dev, cards;
+ int dev, cards, i;
for (dev = cards = 0; dev SNDRV_CARDS enable[dev]; dev++) {
if (port[dev] == SNDRV_AUTO_PORT)
@@ -207,7 +207,10 @@
if (snd_sb8_probe(dev) = 0)
cards++;
}
- cards += snd_legacy_auto_probe(possible_ports, snd_card_sb8_legacy_auto_probe);
+ i = snd_legacy_auto_probe(possible_ports, snd_card_sb8_legacy_auto_probe);
+ if (i 0)
+ cards += i;
+
if (!cards) {
#ifdef MODULE
snd_printk(KERN_ERR Sound Blaster soundcard not found or device
busy\n);
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/es1688 es1688.c,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/isa/es1688
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244/es1688
Modified Files:
es1688.c
Log Message:
[EMAIL PROTECTED]
This is a *really* silly one. The various probing routines in these
drivers can return -ENODEV, -ENOMEM etc.. so when we do something like
cards += probe_routine()
In some situations we can end up with -13 sound cards, and other
such nonsense. Result : lots of fun oopses.
Index: es1688.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- es1688.c3 Feb 2004 18:48:01 - 1.13
+++ es1688.c15 Mar 2004 19:33:52 - 1.14
@@ -182,7 +182,7 @@
static int __init alsa_card_es1688_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};
- int dev, cards = 0;
+ int dev, cards = 0, i;
for (dev = cards = 0; dev SNDRV_CARDS enable[dev]; dev++) {
if (port[dev] == SNDRV_AUTO_PORT)
@@ -190,7 +190,10 @@
if (snd_audiodrive_probe(dev) = 0)
cards++;
}
- cards += snd_legacy_auto_probe(possible_ports,
snd_audiodrive_legacy_auto_probe);
+ i = snd_legacy_auto_probe(possible_ports, snd_audiodrive_legacy_auto_probe);
+ if (i 0)
+ cards += i;
+
if (!cards) {
#ifdef MODULE
printk(KERN_ERR ESS AudioDrive ES1688 soundcard not found or device
busy\n);
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb es968.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15752
Modified Files:
es968.c
Log Message:
[EMAIL PROTECTED]
This oopses on rmmod, as we do pnp_unregister_card_driver twice.
Index: es968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- es968.c 21 Jan 2004 18:32:47 - 1.21
+++ es968.c 15 Mar 2004 19:35:28 - 1.22
@@ -226,13 +226,10 @@
static int __init alsa_card_es968_init(void)
{
int res = pnp_register_card_driver(es968_pnpc_driver);
- if (res == 0)
- {
- pnp_unregister_card_driver(es968_pnpc_driver);
#ifdef MODULE
+ if (res == 0)
snd_printk(KERN_ERR no ES968 based soundcards found\n);
#endif
- }
return res 0 ? res : 0;
}
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa dt019x.c,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15879 Modified Files: dt019x.c Log Message: [EMAIL PROTECTED] Miscellaneous junk, indentation fixes and the like. Index: dt019x.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dt019x.c8 Mar 2004 16:19:42 - 1.16 +++ dt019x.c15 Mar 2004 19:36:11 - 1.17 @@ -296,8 +296,8 @@ return res; dev++; return 0; -} -return -ENODEV; + } + return -ENODEV; } static void __devexit snd_dt019x_pnp_remove(struct pnp_card_link * pcard) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb es968.c,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/isa/sb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15879/sb Modified Files: es968.c Log Message: [EMAIL PROTECTED] Miscellaneous junk, indentation fixes and the like. Index: es968.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- es968.c 15 Mar 2004 19:35:28 - 1.22 +++ es968.c 15 Mar 2004 19:36:11 - 1.23 @@ -203,8 +203,8 @@ return res; dev++; return 0; -} -return -ENODEV; + } + return -ENODEV; } static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa dt019x.c,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17686
Modified Files:
dt019x.c
Log Message:
Added missing pnp_unregister_card_driver call
Index: dt019x.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dt019x.c15 Mar 2004 19:36:11 - 1.17
+++ dt019x.c15 Mar 2004 19:44:56 - 1.18
@@ -322,8 +322,10 @@
cards += pnp_register_card_driver(dt019x_pnpc_driver);
#ifdef MODULE
- if (!cards)
+ if (!cards) {
+ pnp_unregister_card_driver(dt019x_pnpc_driver);
snd_printk(KERN_ERR no DT-019X / ALS-007 based soundcards found\n);
+ }
#endif
return cards ? 0 : -ENODEV;
}
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gusextreme.c,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/isa/gus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20585 Modified Files: gusextreme.c Log Message: Fixed typo Index: gusextreme.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gusextreme.c15 Mar 2004 19:33:52 - 1.14 +++ gusextreme.c15 Mar 2004 19:56:52 - 1.15 @@ -309,7 +309,7 @@ } if (es1688-mpu_port = 0x300 - ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, + (err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, es1688-mpu_port, 0, xmpu_irq, SA_INTERRUPT, --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb es968.c,1.23,1.24
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22369
Modified Files:
es968.c
Log Message:
Fix against Dave's fix: put back the behaviour common to all ISA PnP modules
Index: es968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- es968.c 15 Mar 2004 19:36:11 - 1.23
+++ es968.c 15 Mar 2004 20:06:10 - 1.24
@@ -225,12 +225,14 @@
static int __init alsa_card_es968_init(void)
{
- int res = pnp_register_card_driver(es968_pnpc_driver);
+ int cards = pnp_register_card_driver(es968_pnpc_driver);
#ifdef MODULE
- if (res == 0)
+ if (cards == 0) {
+ pnp_unregister_card_driver(es968_pnpc_driver);
snd_printk(KERN_ERR no ES968 based soundcards found\n);
+ }
#endif
- return res 0 ? res : 0;
+ return cards ? 0 : -ENODEV;
}
static void __exit alsa_card_es968_exit(void)
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
