February 2009 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] hda: Add logic to force HP mixer creation
by Matthew Ranostay 18 Feb '09

18 Feb '09

In some instances like a laptop PCI_QUIRK you may want to force a headphone mixer otherwise a "Front" mixer would be in its place, this is to aid user friendlyness. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- sound/pci/hda/patch_sigmatel.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index aeb5d21..e02a187 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -168,6 +168,7 @@ struct sigmatel_spec { unsigned int surr_switch: 1; unsigned int alt_switch: 1; unsigned int hp_detect: 1; + unsigned int hp_mixer: 1; unsigned int spdif_mute: 1; unsigned int check_volume_offset:1; @@ -857,9 +858,9 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = { }; static struct hda_verb stac92hd83xxx_core_init[] = { - { 0xa, AC_VERB_SET_CONNECT_SEL, 0x1}, - { 0xb, AC_VERB_SET_CONNECT_SEL, 0x1}, - { 0xd, AC_VERB_SET_CONNECT_SEL, 0x0}, + { 0xa, AC_VERB_SET_CONNECT_SEL, 0x0}, + { 0xb, AC_VERB_SET_CONNECT_SEL, 0x0}, + { 0xd, AC_VERB_SET_CONNECT_SEL, 0x1}, /* power state controls amps */ { 0x01, AC_VERB_SET_EAPD, 1 << 2}, @@ -3115,12 +3116,12 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, "Front", "Surround", NULL /*CLFE*/, "Side" }; hda_nid_t nid = 0; - int i, err; + int i, idx = 0, err; unsigned int wid_caps; for (i = 0; i < cfg->line_outs && spec->multiout.dac_nids[i]; i++) { nid = spec->multiout.dac_nids[i]; - if (i == 2) { + if (idx == 2) { /* Center/LFE */ err = create_controls(codec, "Center", nid, 1); if (err < 0) @@ -3139,9 +3140,9 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, if (err < 0) return err; } - + idx++; } else { - const char *name = chname[i]; + const char *name = chname[idx]; /* if it's a single DAC, assign a better name */ if (!i && is_unique_dac(spec, nid)) { switch (cfg->line_out_type) { @@ -3153,6 +3154,10 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, break; } } + if (!i && spec->hp_mixer) + name = "Headphone"; + else + idx++; err = create_controls(codec, name, nid, 3); if (err < 0) return err; @@ -4894,6 +4899,12 @@ again: break; } + switch (spec->board_config) { + case STAC_DELL_S14: + spec->hp_mixer = 1; + break; + } + err = stac92xx_parse_auto_config(codec, 0x1d, 0); if (!err) { if (spec->board_config < 0) { -- 1.5.6.3

3 10

Re: [alsa-devel] [Fwd: HP DV4 1155 SE - No Sound through, speakers...]
by Guy Stalnaker 18 Feb '09

18 Feb '09

Herton and Takashi, I can confirm that compiling and installing the latest snapshot of alsa-drivers, adding "model=hp-dv5" to /etc/modprobe.d/alsa-base, and running hda-verb with the parameters Takashi indicates DOES result in sound from the onboard, internal speakers on my Hewlitt Packard dv4 1225 Pavilion Entertainment PC. The mute on headphone use does not work, but that's okay by me for now. I think you're on the right track in diagnosing the problem and it's solution. Thank you very, very much for helping us. I know it'll likely be a while before the solution actually makes it into distributions, but at the least I can use my sound apps without having to plug my laptop into something to hear what's playing. Kinda defeats the notion of having a laptop if one has to keep it plugged in. Do either of you mind if I collate notes from the posts exchanged on alsa-devel and post them on the Ubuntu forums? There are a lot of other HP users who have posted about the same problem. It's likely they have no idea the resource available to them in the alsa-devel archives. BEST regards, Guy S. > ------------------------------ > > Message: 4 > Date: Fri, 13 Feb 2009 14:16:21 -0500 > From: Tim Barnette <tim.barnette(a)gmail.com> > Subject: Re: [alsa-devel] [Fwd: HP DV4 1155 SE - No Sound through > speakers...] > To: Takashi Iwai <tiwai(a)suse.de> > Cc: alsa-devel(a)alsa-project.org, Jean-Pierre Andr? > <jean-pierre.andre(a)wanadoo.fr> > Message-ID: > <b71cdde20902131116l4c7da119s6c51a67e37371ebe(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Takashi, I was able to build hda-verb and when I executed the command below, > it responded with: > nid=0xd, verb=0x707, param=0x40 > value=0x0 > > On Mon, Feb 2, 2009 at 10:25 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > >> At Mon, 2 Feb 2009 10:17:03 -0500, >> Tim Barnette wrote: >>> Thanks, Takashi. I made this change and rebooted. >>> >>> I noticed right away the mute light is no longer on... but still no sound >>> through speakers, only headphones.. >>> >>> /sys/module/snd_hda_intel/parameters/model >>> contains >>> hp-dv5,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL>,<NULL> >>> >>> attached is the alsa-info.txt you requested.. >> Did you try the latest alsa-driver snapshot? >> >> If it still doesn't work, I guess this is a BIOS problem. >> The other HP dv laptops show the widget 0x0d as the speaker while >> yours is unused. >> >> Try to run: >> hda-verb /dev/snd/hwC0D0 0x0d SET_PIN_WID 0x40 >> >> >> Takashi >> > > > ------------------------------ > > Message: 5 > Date: Fri, 13 Feb 2009 14:22:00 -0500 > From: Tim Barnette <tim.barnette(a)gmail.com> > Subject: Re: [alsa-devel] [Fwd: HP DV4 1155 SE - No Sound through > speakers...] > To: Takashi Iwai <tiwai(a)suse.de> > Cc: alsa-devel(a)alsa-project.org, Jean-Pierre Andr? > <jean-pierre.andre(a)wanadoo.fr> > Message-ID: > <b71cdde20902131122q16eb7e44u92daf2a4c9500bd0(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > ..And it worked! I now have sound! Can you tell me what I actually did > here? -- Guy Stalnaker, I2@DOIT, jstalnak(a)wisc.edu 1210 West Dayton Street, Room 3209 CSS, Madison WI 53706 work 608.263.8035, cell 608.235.4718, fax 608.265.6681

2 2

[alsa-devel] ALSA SoC Architecture Document
by Anuj Aggarwal 17 Feb '09

17 Feb '09

Hi, I was looking for ASoC architecture document and came across a presentation done by Liam Girdwood for ASoC in Jan 2006 (http://www.embedded-kernel-track.org/2006/ASoC.pdf). But I could not find the presentation because the link has expired. Can someone share the presentation or any other ASoC specific architecture document, which can help someone understand the design and data/control paths? Thanks in advance Anuj Aggarwal

2 3

Re: [alsa-devel] Regression: snd_hda_intel driver causes quake3 to hang
by Takashi Iwai 17 Feb '09

17 Feb '09

At Tue, 17 Feb 2009 11:49:17 +0000, Charlie Baylis wrote: > > > Hi > > Some time ago, quake3 stopped running correctly on my PC. This occured when > changing kernel from 2.6.25 to 2.6.27. The symptom is that within a fraction > of a second of gameplay, the game freezes. Switching to a console allows the > game to be killed. I am using standard kernel.org kernels with no additional > patches. Could you check whether it happens with 2.6.29-rc5? On 2.6.29, the delayed handling is done via its own workqueue, so this might be no longer a problem. Also you could try position_fix=1 instead of bdl_pos_adj. The problem is likely your hardware does unreliable DMA position reporting. Detecting such a broken hardware would be possible, but it'll be a bit tricky... Takashi > I have bisected the problem, and found that commit > 675f25d4d3ff6501cbce608bcc2333a56ec4c105 (ALSA: hda - Add bdl_pos_adj option) > introduced the problem. The bdl_pos_adj option described in the commit log can > be adjusted to workaround the problem. > > If I run the following command, the game runs correctly. > # echo 0 > /sys/module/snd_hda_intel/parameters/bdl_pos_adj > > The PC has a Asus N4L VM DH motherboard. lspci describes the hardware as: > $ lspci > 00:00.0 Host bridge: Intel Corporation Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (rev 03) > 00:02.0 VGA compatible controller: Intel Corporation Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller (rev 03) > 00:1b.0 Audio device: Intel Corporation 82801G (ICH7 Family) High Definition Audio Controller (rev 02) > 00:1c.0 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 1 (rev 02) > 00:1c.2 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 3 (rev 02) > 00:1c.3 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 4 (rev 02) > 00:1d.0 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #1 (rev 02) > 00:1d.1 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #2 (rev 02) > 00:1d.2 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #3 (rev 02) > 00:1d.3 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #4 (rev 02) > 00:1d.7 USB Controller: Intel Corporation 82801G (ICH7 Family) USB2 EHCI Controller (rev 02) > 00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev e2) > 00:1f.0 ISA bridge: Intel Corporation 82801GHM (ICH7-M DH) LPC Interface Bridge (rev 02) > 00:1f.2 IDE interface: Intel Corporation 82801GBM/GHM (ICH7 Family) SATA IDE Controller (rev 02) > 00:1f.3 SMBus: Intel Corporation 82801G (ICH7 Family) SMBus Controller (rev 02) > 01:00.0 Ethernet controller: Intel Corporation 82573L Gigabit Ethernet Controller > 02:00.0 SATA controller: JMicron Technologies, Inc. JMicron 20360/20363 AHCI Controller (rev 02) > 02:00.1 IDE interface: JMicron Technologies, Inc. JMicron 20360/20363 AHCI Controller (rev 02) > 04:03.0 FireWire (IEEE 1394): Texas Instruments TSB43AB22/A IEEE-1394a-2000 Controller (PHY/Link) > > Userspace is debian lenny on i386. > > Let me know if you need more info. > > Regards > Charlie >

1 0

Re: [alsa-devel] [PATCH] cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection (2nd rev)
by Takashi Iwai 17 Feb '09

17 Feb '09

At Mon, 16 Feb 2009 19:16:33 -0500, Stanley Pinchak wrote: > > Krzysztof and Takashi, > I would like to stress test the new driver modifications. I have > run into some troubles with a program called cmus when outputting to > alsa via libao. The problems occurred during seeking, leaving the > driver in a broken state. The bug seemed to disappear when I used > native alsa output. I don't want to be chasing down application bugs > on your time, so I was hoping you could suggest a way to test the > driver while introducing the least vectors for non alsa code base > bugs. Thanks in advance. Thanks. Let me know if you find out a problem. OTOH, the fact that the native ALSA output works implies that it's rather an application-side problem... BTW, I removed snd-cs4236-lib module now since it's a module solely used by snd-cs4236. Now it's merged into snd-cs4236 by the patch below. Takashi === From cda9043d56cee9fea39e4ee33fd605ae477a1950 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 17 Feb 2009 08:10:54 +0100 Subject: [PATCH] ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236 Since cs4232 and cs4236 drivers are merged, there is no reason to keep snd-cs4236-lib module separately. Let's merge it into the main driver as well. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/cs423x/Makefile | 6 +++--- sound/isa/cs423x/cs4236_lib.c | 24 ------------------------ 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile index 732f66c..6d397e8 100644 --- a/sound/isa/cs423x/Makefile +++ b/sound/isa/cs423x/Makefile @@ -3,11 +3,11 @@ # Copyright (c) 2001 by Jaroslav Kysela <perex(a)perex.cz> # -snd-cs4236-lib-objs := cs4236_lib.o snd-cs4231-objs := cs4231.o -snd-cs4236-objs := cs4236.o +snd-cs4236-objs := cs4236.o cs4236_lib.o # Toplevel Module Dependency obj-$(CONFIG_SND_CS4231) += snd-cs4231.o -obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o +obj-$(CONFIG_SND_CS4236) += snd-cs4236.o + diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 2406efd..38835f3 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -88,10 +88,6 @@ #include <sound/wss.h> #include <sound/asoundef.h> -MODULE_AUTHOR("Jaroslav Kysela <perex(a)perex.cz>"); -MODULE_DESCRIPTION("Routines for control of CS4235/4236B/4237B/4238B/4239 chips"); -MODULE_LICENSE("GPL"); - /* * */ @@ -1022,23 +1018,3 @@ int snd_cs4236_mixer(struct snd_wss *chip) } return 0; } - -EXPORT_SYMBOL(snd_cs4236_create); -EXPORT_SYMBOL(snd_cs4236_pcm); -EXPORT_SYMBOL(snd_cs4236_mixer); - -/* - * INIT part - */ - -static int __init alsa_cs4236_init(void) -{ - return 0; -} - -static void __exit alsa_cs4236_exit(void) -{ -} - -module_init(alsa_cs4236_init) -module_exit(alsa_cs4236_exit) -- 1.6.1.3

1 0

Re: [alsa-devel] No sound for HP Pavilion DV4z
by Takashi Iwai 17 Feb '09

17 Feb '09

At Mon, 16 Feb 2009 23:28:03 +0000 (UTC), aeleneski(a)comcast.net wrote: > > --startcollapse-- > state.SB { > control.1 { > comment.access 'read write' > comment.type BOOLEAN > comment.count 1 > iface MIXER > name 'Analog Loopback' > value true Turn off "Analog Loopback", and... > control.16 { > comment.access 'read write' > comment.type BOOLEAN > comment.count 2 > iface MIXER > name 'Speaker Playback Switch' > value.0 false > value.1 false Unmute "Speaker" output. Takashi

1 0

Re: [alsa-devel] Intel G45 no sound without monitor
by Wu Fengguang 17 Feb '09

17 Feb '09

On Tue, Feb 17, 2009 at 04:20:57AM +0200, Shane W wrote: > On Tue, Feb 17, 2009 at 09:20:38AM +0800, Wu Fengguang wrote: > > On Mon, Feb 16, 2009 at 11:07:02PM +0200, Shane W wrote: > > > Hello, > > > wasn't known. On my G45, I don't get any sound if my > > > television isn't turned on or is disconnected. That is, > > > HDMI from the G45 to the Yamaha amp is a no go without a > > > connected monitor. Turning on the monitor after system > > > > It's related to our intel gfx driver. > > Ok so in this case, X needs to run for sound to work? In > my test environment, X hadn't been started so the intel-gfx > drivers including i915 kernel module weren't loaded, just > ALSA. Yes Xorg is required for G45+Yamaha. However our G35 board can drive Yamaha directly in console. The i915 kernel module is irrelevant. Thanks, Fengguang

1 0

Re: [alsa-devel] Intel G45 no sound without monitor
by Wu Fengguang 17 Feb '09

17 Feb '09

On Mon, Feb 16, 2009 at 11:07:02PM +0200, Shane W wrote: > Hello, > > Not sure if this is a board hardware issue or something > driver specific but thought I'd put it out there in case it > wasn't known. On my G45, I don't get any sound if my > television isn't turned on or is disconnected. That is, > HDMI from the G45 to the Yamaha amp is a no go without a > connected monitor. Turning on the monitor after system > boot has no effect so monitor must be turned on and system > rebooted for sound to work. Hi Shane, It's related to our intel gfx driver. We bought the same Yamaha RX-V1800 and experienced the same problem. I was doing extensive (black box) debugging on it these days, and found that the following process can produce sound on Yamaha: startx xrandr --output HDMI-1 --mode 1920x1200 In fact the default 1920x540 mode is the only mode in which Yamaha cannot produce sound. Our intel gfx maintainer confirmed that it's actually the 1080i mode that is not supported yet. Thanks, Fengguang

2 1

[alsa-devel] dma buffer format
by York Sun 16 Feb '09

16 Feb '09

Takashi, I am now working on a surround sound driver for the first time. I am confused by the packed format of dma buffer. If the channel number is 6, is the buffer filled with data as front left, front right, rear left, rear right, center, LFE or front left, rear left, center, front right, rear left, LFE? Thanks, York

2 3

[alsa-devel] [PATCH] cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection
by Krzysztof Helt 16 Feb '09

16 Feb '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Also, the patch adds recognition if the chip is cs4236b+ or earlier part. This unifies drivers for both cs4232 and cs4236+ chips. It allows to use the PnP BIOS detection for the cs4236+ chips. Previously, only the snd-cs4232 could be detected by the PnP BIOS. The cs4232+ cards reports two separate PnP BIOS ids. The patch adds search for the second id to find out resources assigned to a control port. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The cs4232 and cs4236 are the same now and one can be removed. Stanley tested this patch and it worked for him (cs4232 chip in Tecra 500). I have tested it on Dell Latitude CP (cs4237b chip) which is now correctly recognized. Previously, it was recognized as a basic cs4236 chip. Also, I have tested it with Maxi Sound 32 PnP card (ISA PnP cs4236b) with success. A side effect of this approach is that on ISA PnP cards the driver reports an error of PnP BIOS detection everytime it is loaded. This is due to driver rejecting the PnP BIOS initialization for ISA PnP cards. Probably, the earlier cs4232 driver worked the same way. diff --git a/include/sound/wss.h b/include/sound/wss.h index fd01f22..6d65f32 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h @@ -154,6 +154,7 @@ int snd_wss_create(struct snd_card *card, unsigned short hardware, unsigned short hwshare, struct snd_wss **rchip); +int snd_wss_free(struct snd_wss *chip); int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); int snd_wss_mixer(struct snd_wss *chip); diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile index 5870ca2..dfdd96d 100644 --- a/sound/isa/cs423x/Makefile +++ b/sound/isa/cs423x/Makefile @@ -10,6 +10,6 @@ snd-cs4236-objs := cs4236.o # Toplevel Module Dependency obj-$(CONFIG_SND_CS4231) += snd-cs4231.o -obj-$(CONFIG_SND_CS4232) += snd-cs4232.o +obj-$(CONFIG_SND_CS4232) += snd-cs4232.o snd-cs4236-lib.o obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index f784598..089b7e8 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -33,17 +33,14 @@ MODULE_AUTHOR("Jaroslav Kysela <perex(a)perex.cz>"); MODULE_LICENSE("GPL"); -#ifdef CS4232 -MODULE_DESCRIPTION("Cirrus Logic CS4232"); +MODULE_DESCRIPTION("Cirrus Logic CS4232-9"); MODULE_SUPPORTED_DEVICE("{{Turtle Beach,TBS-2000}," "{Turtle Beach,Tropez Plus}," "{SIC CrystalWave 32}," "{Hewlett Packard,Omnibook 5500}," "{TerraTec,Maestro 32/96}," - "{Philips,PCA70PS}}"); -#else -MODULE_DESCRIPTION("Cirrus Logic CS4235-9"); -MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235}," + "{Philips,PCA70PS}}," + "{{Crystal Semiconductors,CS4235}," "{Crystal Semiconductors,CS4236}," "{Crystal Semiconductors,CS4237}," "{Crystal Semiconductors,CS4238}," @@ -70,15 +67,9 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235}," "{Typhoon Soundsystem,CS4236B}," "{Turtle Beach,Malibu}," "{Unknown,Digital PC 5000 Onboard}}"); -#endif -#ifdef CS4232 -#define IDENT "CS4232" -#define DEV_NAME "cs4232" -#else -#define IDENT "CS4236+" -#define DEV_NAME "cs4236" -#endif +#define IDENT "CS4232+" +#define DEV_NAME "cs4232+" static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ @@ -128,9 +119,7 @@ MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver."); #ifdef CONFIG_PNP static int isa_registered; static int pnpc_registered; -#ifdef CS4232 static int pnp_registered; -#endif #endif /* CONFIG_PNP */ struct snd_card_cs4236 { @@ -145,11 +134,10 @@ struct snd_card_cs4236 { #ifdef CONFIG_PNP -#ifdef CS4232 /* * PNP BIOS */ -static const struct pnp_device_id snd_cs4232_pnpbiosids[] = { +static const struct pnp_device_id snd_cs423x_pnpbiosids[] = { { .id = "CSC0100" }, { .id = "CSC0000" }, /* Guillemot Turtlebeach something appears to be cs4232 compatible @@ -157,10 +145,8 @@ static const struct pnp_device_id snd_cs4232_pnpbiosids[] = { { .id = "GIM0100" }, { .id = "" } }; -MODULE_DEVICE_TABLE(pnp, snd_cs4232_pnpbiosids); -#endif /* CS4232 */ +MODULE_DEVICE_TABLE(pnp, snd_cs423x_pnpbiosids); -#ifdef CS4232 #define CS423X_ISAPNP_DRIVER "cs4232_isapnp" static struct pnp_card_device_id snd_cs423x_pnpids[] = { /* Philips PCA70PS */ @@ -179,12 +165,6 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = { { .id = "CSCf032", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, /* Netfinity 3000 on-board soundcard */ { .id = "CSCe825", .devs = { { "CSC0100" }, { "CSC0110" }, { "CSC010f" } } }, - /* --- */ - { .id = "" } /* end */ -}; -#else /* CS4236 */ -#define CS423X_ISAPNP_DRIVER "cs4236_isapnp" -static struct pnp_card_device_id snd_cs423x_pnpids[] = { /* Intel Marlin Spike Motherboard - CS4235 */ { .id = "CSC0225", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, /* Intel Marlin Spike Motherboard (#2) - CS4235 */ @@ -266,7 +246,6 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = { /* --- */ { .id = "" } /* end */ }; -#endif MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids); @@ -323,17 +302,19 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) return 0; } -#ifdef CS4232 -static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard, - struct pnp_dev *pdev) +static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard, + struct pnp_dev *pdev, + struct pnp_dev *cdev) { acard->wss = pdev; if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0) return -EBUSY; - cport[dev] = -1; + if (cdev) + cport[dev] = pnp_port_start(cdev, 0); + else + cport[dev] = -1; return 0; } -#endif static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard, struct pnp_card_link *card, @@ -411,40 +392,39 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) return -EBUSY; } -#ifdef CS4232 err = snd_wss_create(card, port[dev], cport[dev], irq[dev], dma1[dev], dma2[dev], - WSS_HW_DETECT, 0, &chip); - if (err < 0) - return err; - acard->chip = chip; - - err = snd_wss_pcm(chip, 0, &pcm); - if (err < 0) - return err; - - err = snd_wss_mixer(chip); + WSS_HW_DETECT3, 0, &chip); if (err < 0) return err; - -#else /* CS4236 */ - err = snd_cs4236_create(card, - port[dev], cport[dev], - irq[dev], dma1[dev], dma2[dev], - WSS_HW_DETECT, 0, &chip); - if (err < 0) - return err; - acard->chip = chip; - - err = snd_cs4236_pcm(chip, 0, &pcm); - if (err < 0) - return err; - - err = snd_cs4236_mixer(chip); - if (err < 0) - return err; -#endif + if (chip->hardware & WSS_HW_CS4236B_MASK) { + snd_wss_free(chip); + err = snd_cs4236_create(card, + port[dev], cport[dev], + irq[dev], dma1[dev], dma2[dev], + WSS_HW_DETECT, 0, &chip); + if (err < 0) + return err; + acard->chip = chip; + + err = snd_cs4236_pcm(chip, 0, &pcm); + if (err < 0) + return err; + + err = snd_cs4236_mixer(chip); + if (err < 0) + return err; + } else { + acard->chip = chip; + err = snd_wss_pcm(chip, 0, &pcm); + if (err < 0) + return err; + + err = snd_wss_mixer(chip); + if (err < 0) + return err; + } strcpy(card->driver, pcm->name); strcpy(card->shortname, pcm->name); sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", @@ -579,13 +559,15 @@ static struct isa_driver cs423x_isa_driver = { #ifdef CONFIG_PNP -#ifdef CS4232 -static int __devinit snd_cs4232_pnpbios_detect(struct pnp_dev *pdev, +static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev, const struct pnp_device_id *id) { static int dev; int err; struct snd_card *card; + struct pnp_dev *cdev; + struct list_head *pos; + char cid[PNP_ID_LEN]; if (pnp_device_is_isapnp(pdev)) return -ENOENT; /* we have another procedure - card */ @@ -596,10 +578,20 @@ static int __devinit snd_cs4232_pnpbios_detect(struct pnp_dev *pdev, if (dev >= SNDRV_CARDS) return -ENODEV; + /* prepare second id */ + strcpy(cid, pdev->id[0].id); + cid[5] = '1'; + cdev = NULL; + list_for_each(pos, &(pdev->protocol->devices)) { + cdev = list_entry(pos, struct pnp_dev, protocol_list); + if (!strcmp(cdev->id[0].id, cid)) + break; + } err = snd_cs423x_card_new(dev, &card); if (err < 0) return err; - if ((err = snd_card_cs4232_pnp(dev, card->private_data, pdev)) < 0) { + err = snd_card_cs423x_pnp(dev, card->private_data, pdev, cdev); + if (err < 0) { printk(KERN_ERR "PnP BIOS detection failed for " IDENT "\n"); snd_card_free(card); return err; @@ -614,35 +606,34 @@ static int __devinit snd_cs4232_pnpbios_detect(struct pnp_dev *pdev, return 0; } -static void __devexit snd_cs4232_pnp_remove(struct pnp_dev * pdev) +static void __devexit snd_cs423x_pnp_remove(struct pnp_dev *pdev) { snd_card_free(pnp_get_drvdata(pdev)); pnp_set_drvdata(pdev, NULL); } #ifdef CONFIG_PM -static int snd_cs4232_pnp_suspend(struct pnp_dev *pdev, pm_message_t state) +static int snd_cs423x_pnp_suspend(struct pnp_dev *pdev, pm_message_t state) { return snd_cs423x_suspend(pnp_get_drvdata(pdev)); } -static int snd_cs4232_pnp_resume(struct pnp_dev *pdev) +static int snd_cs423x_pnp_resume(struct pnp_dev *pdev) { return snd_cs423x_resume(pnp_get_drvdata(pdev)); } #endif -static struct pnp_driver cs4232_pnp_driver = { - .name = "cs4232-pnpbios", - .id_table = snd_cs4232_pnpbiosids, - .probe = snd_cs4232_pnpbios_detect, - .remove = __devexit_p(snd_cs4232_pnp_remove), +static struct pnp_driver cs423x_pnp_driver = { + .name = "cs423x-pnpbios", + .id_table = snd_cs423x_pnpbiosids, + .probe = snd_cs423x_pnpbios_detect, + .remove = __devexit_p(snd_cs423x_pnp_remove), #ifdef CONFIG_PM - .suspend = snd_cs4232_pnp_suspend, - .resume = snd_cs4232_pnp_resume, + .suspend = snd_cs423x_pnp_suspend, + .resume = snd_cs423x_pnp_resume, #endif }; -#endif /* CS4232 */ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard, const struct pnp_card_device_id *pid) @@ -716,18 +707,14 @@ static int __init alsa_card_cs423x_init(void) #ifdef CONFIG_PNP if (!err) isa_registered = 1; -#ifdef CS4232 - err = pnp_register_driver(&cs4232_pnp_driver); + err = pnp_register_driver(&cs423x_pnp_driver); if (!err) pnp_registered = 1; -#endif err = pnp_register_card_driver(&cs423x_pnpc_driver); if (!err) pnpc_registered = 1; -#ifdef CS4232 if (pnp_registered) err = 0; -#endif if (isa_registered) err = 0; #endif @@ -739,10 +726,8 @@ static void __exit alsa_card_cs423x_exit(void) #ifdef CONFIG_PNP if (pnpc_registered) pnp_unregister_card_driver(&cs423x_pnpc_driver); -#ifdef CS4232 if (pnp_registered) - pnp_unregister_driver(&cs4232_pnp_driver); -#endif + pnp_unregister_driver(&cs423x_pnp_driver); if (isa_registered) #endif isa_unregister_driver(&cs423x_isa_driver); diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index aab44e7..5d2ba1b 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1682,7 +1682,7 @@ static void snd_wss_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ -static int snd_wss_free(struct snd_wss *chip) +int snd_wss_free(struct snd_wss *chip) { release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_cport); @@ -1705,6 +1705,7 @@ static int snd_wss_free(struct snd_wss *chip) kfree(chip); return 0; } +EXPORT_SYMBOL(snd_wss_free); static int snd_wss_dev_free(struct snd_device *device) { ---------------------------------------------------------------------- Zostan mistrzem parkowania w Bombaju! Zagraj >> http://link.interia.pl/f204e

2 5