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

[alsa-devel] [PATCH] hda: Add support for 92HD73xxx codecs
by Matthew Ranostay 13 Jun '08

13 Jun '08

Added support for new family of IDT codecs. --- Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index a4f44a0..115cee6 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -349,7 +349,7 @@ static hda_nid_t stac92hd73xx_pin_nids[13] = { static hda_nid_t stac92hd71bxx_pin_nids[10] = { 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, - 0x0f, 0x14, 0x18, 0x19, 0x1e, + 0x14, 0x18, 0x19, 0x1e, 0x0f }; static hda_nid_t stac927x_pin_nids[14] = { @@ -641,15 +641,21 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = { { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, /* connect headphone jack to dac1 */ { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, - /* connect ports 0d and 0f to audio mixer */ - { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x2}, - { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2}, - { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */ + /* connect port 0d to audio mixer */ + { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x02}, /* unmute dac0 input in audio mixer */ { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x701f}, - /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */ + /* unmute right and left channels for nodes 0x0a, 0x0d */ { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + {} +}; + +static struct hda_verb stac92hd71bxx_enable_portf[] = { + /* connect port 0f to audio mixer */ + { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x02}, + { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */ + /* unmute right and left channels for nodes 0x0f */ { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {} }; @@ -1313,20 +1319,20 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { static unsigned int ref92hd71bxx_pin_configs[10] = { 0x02214030, 0x02a19040, 0x01a19020, 0x01014010, - 0x0181302e, 0x01114010, 0x01019020, 0x90a000f0, - 0x90a000f0, 0x01452050, + 0x0181302e, 0x01019020, 0x90a000f0, 0x90a000f0, + 0x01452050, 0x01114010, }; -static unsigned int dell_m4_1_pin_configs[13] = { +static unsigned int dell_m4_1_pin_configs[10] = { 0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110, - 0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0, - 0x40f000f0, 0x4f0000f0, + 0x23a1902e, 0x40f000f0, 0x90a000f0, 0x40f000f0, + 0x4f0000f0, 0x23014250, }; -static unsigned int dell_m4_2_pin_configs[13] = { +static unsigned int dell_m4_2_pin_configs[10] = { 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110, - 0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0, - 0x40f000f0, 0x044413b0, + 0x23a1902e, 0x40f000f0, 0x40f000f0, 0x40f000f0, + 0x044413b0, 0x23014250, }; static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { @@ -2633,7 +2639,7 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec, 0, AC_VERB_GET_CONFIG_DEFAULT, 0); - if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE) + if (def_conf && (def_conf == AC_JACK_PORT_NONE)) continue; nid = spec->dmic_nids[i]; @@ -3103,13 +3109,14 @@ static int stac92xx_init(struct hda_codec *codec) 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); int def_conf = snd_hda_codec_read(codec, spec->pwr_nids[i], 0, AC_VERB_GET_CONFIG_DEFAULT, 0); + def_conf = get_defcfg_connect(def_conf); /* outputs are only ports capable of power management * any attempts on powering down a input port cause the * referenced VREF to act quirky. */ if (pinctl & AC_PINCTL_IN_EN) continue; - if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) + if (def_conf && def_conf != AC_JACK_PORT_FIXED) continue; enable_pin_detect(codec, spec->pwr_nids[i], event | i); codec->patch_ops.unsol_event(codec, (event | i) << 26); @@ -3614,12 +3621,39 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) codec->spec = spec; spec->num_pins = ARRAY_SIZE(stac92hd71bxx_pin_nids); + spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids); spec->pin_nids = stac92hd71bxx_pin_nids; spec->board_config = snd_hda_check_board_config(codec, STAC_92HD71BXX_MODELS, stac92hd71bxx_models, stac92hd71bxx_cfg_tbl); again: + switch (codec->vendor_id) { + case 0x111d76b6: /* 4 Port without Analog Mixer */ + case 0x111d76b7: + case 0x111d76b4: /* 6 Port without Analog Mixer */ + case 0x111d76b5: + spec->mixer = stac92hd71bxx_mixer; + spec->init = stac92hd71bxx_core_init; + break; + case 0x111d7603: /* 6 Port with Analog Mixer */ + case 0x111d7608: + /* no output amps */ + spec->num_pwrs = 0; + /* fallthru */ + default: + spec->mixer = stac92hd71bxx_analog_mixer; + spec->init = stac92hd71bxx_analog_core_init; + } + + if (codec->vendor_id != 0x111d7608) + snd_hda_sequence_write(codec, stac92hd71bxx_enable_portf); + else { + /* skip the VSW on port f */ + spec->num_pins--; + stac92xx_set_config_reg(codec, 0xf, 0x40f000f0); + } + if (spec->board_config < 0) { snd_printdd(KERN_INFO "hda_codec: Unknown model for" " STAC92HD71BXX, using BIOS defaults\n"); @@ -3634,19 +3668,6 @@ again: stac92xx_set_config_regs(codec); } - switch (codec->vendor_id) { - case 0x111d76b6: /* 4 Port without Analog Mixer */ - case 0x111d76b7: - case 0x111d76b4: /* 6 Port without Analog Mixer */ - case 0x111d76b5: - spec->mixer = stac92hd71bxx_mixer; - spec->init = stac92hd71bxx_core_init; - break; - default: - spec->mixer = stac92hd71bxx_analog_mixer; - spec->init = stac92hd71bxx_analog_core_init; - } - spec->aloopback_mask = 0x20; spec->aloopback_shift = 0; @@ -3666,7 +3687,6 @@ again: spec->num_dmics = STAC92HD71BXX_NUM_DMICS; spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids); - spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids); spec->pwr_nids = stac92hd71bxx_pwr_nids; spec->multiout.num_dacs = 1; @@ -4306,10 +4326,11 @@ struct hda_codec_preset snd_hda_preset_sigmatel[] = { { .id = 0x838476a5, .name = "STAC9255D", .patch = patch_stac9205 }, { .id = 0x838476a6, .name = "STAC9254", .patch = patch_stac9205 }, { .id = 0x838476a7, .name = "STAC9254D", .patch = patch_stac9205 }, + { .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx}, + { .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx}, { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx }, { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx }, { .id = 0x111d7676, .name = "92HD73E1X5", .patch = patch_stac92hd73xx }, - { .id = 0x111d7608, .name = "92HD71BXX", .patch = patch_stac92hd71bxx }, { .id = 0x111d76b0, .name = "92HD71B8X", .patch = patch_stac92hd71bxx }, { .id = 0x111d76b1, .name = "92HD71B8X", .patch = patch_stac92hd71bxx }, { .id = 0x111d76b2, .name = "92HD71B7X", .patch = patch_stac92hd71bxx },

2 3

[alsa-devel] [PATCH 1/2] ASoC: Check for exact register match in wm97xx_reset()
by Mark Brown 13 Jun '08

13 Jun '08

To provide added robustness in case an AC97 controller reads back all zeros in error cases check for an exact match when testing to see if resets have brought the codec back. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm9712.c | 4 ++-- sound/soc/codecs/wm9713.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 28ac66f..4739011 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -589,12 +589,12 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) { if (try_warm && soc_ac97_ops.warm_reset) { soc_ac97_ops.warm_reset(codec->ac97); - if (!(ac97_read(codec, 0) & 0x8000)) + if (ac97_read(codec, 0) == wm9712_reg[0]) return 1; } soc_ac97_ops.reset(codec->ac97); - if (ac97_read(codec, 0) & 0x8000) + if (ac97_read(codec, 0) != wm9712_reg[0]) goto err; return 0; diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index aba3301..0db9637 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1076,12 +1076,12 @@ int wm9713_reset(struct snd_soc_codec *codec, int try_warm) { if (try_warm && soc_ac97_ops.warm_reset) { soc_ac97_ops.warm_reset(codec->ac97); - if (!(ac97_read(codec, 0) & 0x8000)) + if (ac97_read(codec, 0) == wm9713_reg[0]) return 1; } soc_ac97_ops.reset(codec->ac97); - if (ac97_read(codec, 0) & 0x8000) + if (ac97_read(codec, 0) != wm9713_reg[0]) return -EIO; return 0; } -- 1.5.5.4

2 2

[alsa-devel] [PATCH 1/2] ASoC: Check for exact register match in wm97xx_reset()
by Mark Brown 13 Jun '08

13 Jun '08

To provide added robustness in case an AC97 controller reads back all zeros in error cases check for an exact match when testing to see if resets have brought the codec back. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm9712.c | 4 ++-- sound/soc/codecs/wm9713.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 28ac66f..09e2985 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -589,12 +589,12 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) { if (try_warm && soc_ac97_ops.warm_reset) { soc_ac97_ops.warm_reset(codec->ac97); - if (!(ac97_read(codec, 0) & 0x8000)) + if (ac97_read(codec, 0) == 0x6174) return 1; } soc_ac97_ops.reset(codec->ac97); - if (ac97_read(codec, 0) & 0x8000) + if (ac97_read(codec, 0) != 0x6174) goto err; return 0; diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index aba3301..131bb5b 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1076,12 +1076,12 @@ int wm9713_reset(struct snd_soc_codec *codec, int try_warm) { if (try_warm && soc_ac97_ops.warm_reset) { soc_ac97_ops.warm_reset(codec->ac97); - if (!(ac97_read(codec, 0) & 0x8000)) + if (ac97_read(codec, 0) == 0x6174) return 1; } soc_ac97_ops.reset(codec->ac97); - if (ac97_read(codec, 0) & 0x8000) + if (ac97_read(codec, 0) != 0x6174) return -EIO; return 0; } -- 1.5.5.4

2 3

[alsa-devel] ALSA 1.0.17rc1 release
by Jaroslav Kysela 13 Jun '08

13 Jun '08

Hi all, ALSA 1.0.17rc1 packages (except alsa-plugins & alsa-oss - no changes) are available for download on http://www.alsa-project.org . Only difference between testing release is a change in alsa-driver for better support of RedHat kernels. http://www.alsa-project.org/main/index.php/Changes_v1.0.16_v1.0.17rc1 Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project, Red Hat, Inc.

3 5

[alsa-devel] Names for ALSA controls
by Juergen Beisert 13 Jun '08

13 Jun '08

Hi, when I register these mixer controls: Line Playback Switch Line Playback Route Mono Playback Switch Mono Playback Route Phone Playback Switch Phone Playback Route Headphone Playback Switch Headphone Playback Route PCM Playback Switch PCM Playback Volume Line Bypass Capture Switch Line Bypass Capture Volume ADC Capture Route Running "alsamixer" fails with: ALSA lib simple_none.c:1218:(simple_add1) helem (MIXER,'Headphone Playback Switch',0,0,0) appears twice or more It seems there are restrictions what kind of control name I can use for each control, but what restrictions? Are there better names for my output amplifiers? Each of it I can enable/disable (-> Switch) and select a source (-> Route) independently. Regards, Juergen -- Dipl.-Ing. Juergen Beisert | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Vertretung Sued/Muenchen, Germany Phone: +49-8766-939 228 | Fax: +49-5121-206917-9

2 2

[alsa-devel] [PATCH][ASoC v2] Add checks for codec DAI number during match-up
by Timur Tabi 13 Jun '08

13 Jun '08

Update the Codec DAI matching scheme to take the DAI number into account, and not just the name. This is necessary for systems with multiple codecs that use the Codec ID number to differentiate them. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/soc-core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a88e3a0..cc543e6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -801,6 +801,7 @@ codec_dai: /* yes, then check the codec_dai list */ list_for_each_entry(codec_dai, &codec_dai_list, list) { if (!strcmp(config->codec_dai, codec_dai->name) && + (codec_dai->id == config->codec_num) && try_module_get(codec_dai->dev->driver->owner)) { dbg("ASoC %s %s: Match for %s %s\n", soc_card->name, config->name, @@ -1767,6 +1768,7 @@ struct snd_soc_dai *snd_soc_register_codec_dai( dai->playback = template->playback; dai->capture = template->capture; dai->name = template->name; + dai->id = template->id; dai->ac97_control = template->ac97_control; mutex_lock(&client_mutex); list_add(&dai->list, &codec_dai_list); -- 1.5.5

2 1

[alsa-devel] [PATCH] maestro3: Fix hw volume on HP OmniBook
by Ville Syrjälä 13 Jun '08

13 Jun '08

Make the hw volume buttons work correctly on some HP OmniBook laptops. The original quirk was apparently applied a bit too early and it was also lacking some critial register writes. This improved sequence was discovered by trial and error (like the original sequence). Tested and found working on OB500 and OB6000 laptops. Signed-off-by: Ville Syrjala <syrjala(a)sci.fi> --- sound/pci/maestro3.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) Index: linux-2.6.25.4/sound/pci/maestro3.c =================================================================== --- linux-2.6.25.4.orig/sound/pci/maestro3.c +++ linux-2.6.25.4/sound/pci/maestro3.c @@ -2427,6 +2427,29 @@ snd_m3_amp_enable(struct snd_m3 *chip, i outw(0xffff, io + GPIO_MASK); } +static void +snd_m3_hv_init(struct snd_m3 *chip) +{ + unsigned long io = chip->iobase; + u16 val = GPI_VOL_DOWN | GPI_VOL_UP; + + if (!chip->is_omnibook) + return; + + /* + * Volume buttons on some HP OmniBook laptops + * require some GPIO magic to work correctly. + */ + outw(0xffff, io + GPIO_MASK); + outw(0x0000, io + GPIO_DATA); + + outw(~val, io + GPIO_MASK); + outw(inw(io + GPIO_DIRECTION) & ~val, io + GPIO_DIRECTION); + outw(val, io + GPIO_MASK); + + outw(0xffff, io + GPIO_MASK); +} + static int snd_m3_chip_init(struct snd_m3 *chip) { @@ -2442,21 +2465,6 @@ snd_m3_chip_init(struct snd_m3 *chip) DISABLE_LEGACY); pci_write_config_word(pcidev, PCI_LEGACY_AUDIO_CTRL, w); - if (chip->is_omnibook) { - /* - * Volume buttons on some HP OmniBook laptops don't work - * correctly. This makes them work for the most part. - * - * Volume up and down buttons on the laptop side work. - * Fn+cursor_up (volme up) works. - * Fn+cursor_down (volume down) doesn't work. - * Fn+F7 (mute) works acts as volume up. - */ - outw(~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_MASK); - outw(inw(io + GPIO_DIRECTION) & ~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DIRECTION); - outw((GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DATA); - outw(0xffff, io + GPIO_MASK); - } pci_read_config_dword(pcidev, PCI_ALLEGRO_CONFIG, &n); n &= ~(HV_CTRL_ENABLE | REDUCED_DEBOUNCE | HV_BUTTON_FROM_GD); n |= chip->hv_config; @@ -2644,6 +2652,8 @@ static int m3_resume(struct pci_dev *pci snd_m3_enable_ints(chip); snd_m3_amp_enable(chip, 1); + snd_m3_hv_init(chip); + snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } @@ -2783,6 +2793,8 @@ snd_m3_create(struct snd_card *card, str snd_m3_amp_enable(chip, 1); + snd_m3_hv_init(chip); + tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip); if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED, -- Ville Syrjälä syrjala(a)sci.fi http://www.sci.fi/~syrjala/

1 0

[alsa-devel] alsa midi tutorial
by andy baxter 12 Jun '08

12 Jun '08

hello, Can anyone recommend a good, reasonably simple, tutorial on programming for the alsa midi system? What I want to do is feed drum trigger signals from an arduino board (a usb development board that lets you interface electronics to the computer) to a midi sequencer. I had a look at the following page from the alsa api reference: http://www.alsa-project.org/alsa-doc/alsa-lib/seq.html but I'm finding it a bit hard to follow - I'm looking for something a bit simpler with code examples to work through that will give me a way in to alsa midi programming. Does anyone know of anything like this? thanks, andy baxter.

2 2

[alsa-devel] audiowerk8 alsa driver
by matthias.nyffenegger＠bluewin.ch 12 Jun '08

12 Jun '08

Hi, I have written an alsa driver for the audiowerk8 soundcard, source code is available here: http://sourceforge. net/projects/aw8-alsa/. It also supports audiowerk2 but i see that in the meantime there's already a driver available. Anyway, i'd like to ask for integration into the alsa source tree but i don't know exactly how this is done. Can somebody give me some help with that? Regards, Matthias

2 1

[alsa-devel] [PATCH - ASIHPI 1/8] Common init files for HPI
by linux＠audioscience.com 12 Jun '08

12 Jun '08

From: Eliot Blennerhassett <linux(a)audioscience.com> Signed-off-by: Eliot Blennerhassett <eblennerhassett(a)audioscience.com> diff --git a/pci/asihpi/hpioctl.c b/pci/asihpi/hpioctl.c new file mode 100644 index 0000000..5192db3 --- /dev/null +++ b/pci/asihpi/hpioctl.c @@ -0,0 +1,440 @@ +/******************************************************************************* + + AudioScience HPI driver + Copyright (C) 1997-2003 AudioScience Inc. <support(a)audioscience.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation; + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Common Linux HPI ioctl and module probe/remove functions +*******************************************************************************/ +#define SOURCEFILE_NAME "hpioctl.c" + +#include "hpi.h" +#include "hpidebug.h" +#include "hpimsgx.h" +#include "hpioctl.h" + +#include <linux/fs.h> +#include <linux/slab.h> +#include <linux/moduleparam.h> +#include <asm/uaccess.h> +#include <linux/stringify.h> + +#ifndef HPIMOD_DEFAULT_BUF_SIZE +# define HPIMOD_DEFAULT_BUF_SIZE 192000 +#endif + +#ifdef MODULE_FIRMWARE +MODULE_FIRMWARE("asihpi/dsp5000.bin"); +MODULE_FIRMWARE("asihpi/dsp6200.bin"); +MODULE_FIRMWARE("asihpi/dsp6205.bin"); +MODULE_FIRMWARE("asihpi/dsp6400.bin"); +MODULE_FIRMWARE("asihpi/dsp6600.bin"); +MODULE_FIRMWARE("asihpi/dsp8700.bin"); +MODULE_FIRMWARE("asihpi/dsp8900.bin"); +#endif + +static int bufsize = HPIMOD_DEFAULT_BUF_SIZE; +module_param(bufsize, int, + S_IRUGO +); +/* Allow the debug level to be changed after module load. + E.g. echo 2 > /sys/module/asihpi/parameters/hpiDebugLevel +*/ +module_param(hpiDebugLevel, int, + S_IRUGO | S_IWUSR +); + +/* List of adapters found */ +static struct hpi_adapter adapters[HPI_MAX_ADAPTERS]; + +/* Wrapper function to HPI_Message to enable dumping of the + message and response types. +*/ +static void HPI_MessageF( + struct hpi_message *phm, + struct hpi_response *phr, + struct file *file +) +{ + int nAdapter = phm->wAdapterIndex; + + if ((nAdapter >= HPI_MAX_ADAPTERS || nAdapter < 0) && + (phm->wObject != HPI_OBJ_SUBSYSTEM)) + phr->wError = HPI_ERROR_INVALID_OBJ_INDEX; + else + HPI_MessageEx(phm, phr, file); +} + +/* This is called from hpifunc.c functions, called by ALSA + * (or other kernel process) In this case there is no file descriptor + * available for the message cache code + */ +void HPI_Message( + struct hpi_message *phm, + struct hpi_response *phr +) +{ + HPI_MessageF(phm, phr, HOWNER_KERNEL); +} + +EXPORT_SYMBOL(HPI_Message); +/* export HPI_Message for radio-asihpi */ + +int asihpi_hpi_release( + struct file *file +) +{ + struct hpi_message hm; + struct hpi_response hr; + +/* HPI_DEBUG_LOG(INFO,"hpi_release file %p, pid %d\n", file, current->pid); */ + /* close the subsystem just in case the application forgot to. */ + HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_CLOSE); + HPI_MessageEx(&hm, &hr, file); + return 0; +} + +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 11) +long asihpi_hpi_ioctl( + struct file *file, + unsigned int cmd, + unsigned long arg +) +#else +int asihpi_hpi_ioctl( + struct inode *inode, + struct file *file, + unsigned int cmd, + unsigned long arg +) +#endif +{ + struct hpi_ioctl_linux __user *phpi_ioctl_data; + void __user *phm; + void __user *phr; + struct hpi_message hm; + struct hpi_response hr; + u32 uncopied_bytes; + struct hpi_adapter *pa; + + if (cmd != HPI_IOCTL_LINUX) + return -EINVAL; + + phpi_ioctl_data = (struct hpi_ioctl_linux __user *)arg; + + /* Read the message and response pointers from user space. */ + get_user(phm, &phpi_ioctl_data->phm); + get_user(phr, &phpi_ioctl_data->phr); + + /* Now read the message size and data from user space. */ + /* get_user(hm.wSize, (u16 __user *)phm); */ + uncopied_bytes = copy_from_user(&hm, phm, sizeof(hm)); + if (uncopied_bytes) + return -EFAULT; + + pa = &adapters[hm.wAdapterIndex]; + + if ((hm.wAdapterIndex > HPI_MAX_ADAPTERS) || (!pa->type)) { + HPI_InitResponse(&hr, HPI_OBJ_ADAPTER, HPI_ADAPTER_OPEN, + HPI_ERROR_BAD_ADAPTER_NUMBER); + + uncopied_bytes = copy_to_user(phr, &hr, sizeof(hr)); + if (uncopied_bytes) + return -EFAULT; + return 0; + } + + hr.wSize = 0; + /* Response filled either copy from cache, or by HPI_Message() */ + { + /* Dig out any pointers embedded in the message. */ + u16 __user *ptr = NULL; + u32 size = 0; + + /* -1=no data 0=read from user mem, 1=write to user mem */ + int wrflag = -1; + u32 nAdapter = hm.wAdapterIndex; + switch (hm.wFunction) { + case HPI_SUBSYS_CREATE_ADAPTER: + case HPI_SUBSYS_DELETE_ADAPTER: + /* Application must not use these functions! */ + hr.wSize = sizeof(struct hpi_response_header); + hr.wError = HPI_ERROR_INVALID_OPERATION; + hr.wFunction = hm.wFunction; + uncopied_bytes = copy_to_user(phr, &hr, hr.wSize); + if (uncopied_bytes) + return -EFAULT; + return 0; + case HPI_OSTREAM_WRITE: + case HPI_ISTREAM_READ: + /* Yes, sparse, this is correct. */ + ptr = (u16 __user *)hm.u.d.u.Data.pbData; + size = hm.u.d.u.Data.dwDataSize; + + hm.u.d.u.Data.pbData = pa->pBuffer; + /* + if (size > bufsize) { + size = bufsize; + hm.u.d.u.Data.dwDataSize = size; + } + */ + + if (hm.wFunction == HPI_ISTREAM_READ) + /* from card, WRITE to user mem */ + wrflag = 1; + else + wrflag = 0; + break; + + default: + break; + } + + if (mutex_lock_interruptible(&adapters[nAdapter].mutex)) + return -EINTR; + + if (wrflag == 0) { + if (size > bufsize) { + mutex_unlock(&adapters[nAdapter].mutex); + HPI_DEBUG_LOG(ERROR, + "Requested transfer of %d " + "bytes, max buffer size " + "is %d bytes.\n", size, bufsize); + return -EINVAL; + } + + uncopied_bytes = + copy_from_user(pa->pBuffer, ptr, size); + if (uncopied_bytes) + HPI_DEBUG_LOG(WARNING, + "Missed %d of %d " + "bytes from user\n", + uncopied_bytes, size); + } + + HPI_MessageF(&hm, &hr, file); + + if (wrflag == 1) { + if (size > bufsize) { + mutex_unlock(&adapters[nAdapter].mutex); + HPI_DEBUG_LOG(ERROR, + "Requested transfer of %d " + "bytes, max buffer size is " + "%d bytes.\n", size, bufsize); + return -EINVAL; + } + + uncopied_bytes = copy_to_user(ptr, pa->pBuffer, size); + if (uncopied_bytes) + HPI_DEBUG_LOG(WARNING, + "Missed %d of %d " + "bytes to user\n", + uncopied_bytes, size); + } + + mutex_unlock(&adapters[nAdapter].mutex); + } + + /* on return response size must be set */ + if (!hr.wSize) + return -EFAULT; + + /* Copy the response back to user space. */ + uncopied_bytes = copy_to_user(phr, &hr, sizeof(hr)); + if (uncopied_bytes) + return -EFAULT; + return 0; +} + +int __devinit asihpi_adapter_probe( + struct pci_dev *pci_dev, + const struct pci_device_id *pci_id +) +{ + int err, idx; + unsigned int memlen; + struct hpi_message hm; + struct hpi_response hr; + struct hpi_adapter adapter; + struct hpi_pci Pci; + + memset(&adapter, 0, sizeof(adapter)); + + printk(KERN_DEBUG "Probe PCI device (%04x:%04x,%04x:%04x,%04x)\n", + pci_dev->vendor, pci_dev->device, pci_dev->subsystem_vendor, + pci_dev->subsystem_device, pci_dev->devfn); + + HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_CREATE_ADAPTER); + HPI_InitResponse(&hr, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_CREATE_ADAPTER, + HPI_ERROR_PROCESSING_MESSAGE); + + hm.wAdapterIndex = -1; /* an invalid index */ + + /* fill in HPI_PCI information from kernel provided information */ + adapter.pci = pci_dev; + + for (idx = 0; idx < HPI_MAX_ADAPTER_MEM_SPACES; idx++) { + HPI_DEBUG_LOG(DEBUG, "Resource %d %s %llx-%llx\n", + idx, pci_dev->resource[idx].name, + (unsigned long long)pci_resource_start(pci_dev, idx), + (unsigned long long)pci_resource_end(pci_dev, idx)); + + memlen = pci_resource_len(pci_dev, idx); + if (memlen) { + adapter.apRemappedMemBase[idx] = + ioremap(pci_resource_start(pci_dev, idx), + memlen); + if (!adapter.apRemappedMemBase[idx]) { + HPI_DEBUG_LOG(ERROR, + "ioremap failed, aborting\n"); + /* unmap previously mapped pci mem space */ + goto err; + } + } else + adapter.apRemappedMemBase[idx] = NULL; + + Pci.apMemBase[idx] = adapter.apRemappedMemBase[idx]; + } + + Pci.wBusNumber = pci_dev->bus->number; + Pci.wVendorId = (u16)pci_dev->vendor; + Pci.wDeviceId = (u16)pci_dev->device; + Pci.wSubSysVendorId = (u16)(pci_dev->subsystem_vendor & 0xffff); + Pci.wSubSysDeviceId = (u16)(pci_dev->subsystem_device & 0xffff); + Pci.wDeviceNumber = pci_dev->devfn; + Pci.wInterrupt = pci_dev->irq; + Pci.pOsData = pci_dev; + + hm.u.s.Resource.wBusType = HPI_BUS_PCI; + hm.u.s.Resource.r.Pci = &Pci; + + /* call CreateAdapterObject on the relevant hpi module */ + HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); + if (hr.wError) + goto err; + + adapter.pBuffer = vmalloc(bufsize); + if (adapter.pBuffer == NULL) { + HPI_DEBUG_LOG(ERROR, + "HPI could not allocate kernel buffer size %d\n", + bufsize); + goto err; + } + + adapter.index = hr.u.s.wAdapterIndex; + adapter.type = hr.u.s.awAdapterList[adapter.index]; + hm.wAdapterIndex = adapter.index; + + err = HPI_AdapterOpen(NULL, adapter.index); + if (err) + goto err; + + adapter.snd_card_asihpi = NULL; + /* WARNING can't init mutex in 'adapter' + * and then copy it to adapters[] ?!?! + */ + adapters[hr.u.s.wAdapterIndex] = adapter; + mutex_init(&adapters[adapter.index].mutex); + pci_set_drvdata(pci_dev, &adapters[adapter.index]); + + /* printk(KERN_INFO + "Probe found adapter ASI%04X HPI index #%d.\n", + adapter.type, + adapter.index); + */ + return 0; + +err: + for (idx = 0; idx < HPI_MAX_ADAPTER_MEM_SPACES; idx++) { + if (adapter.apRemappedMemBase[idx]) { + iounmap(adapter.apRemappedMemBase[idx]); + adapter.apRemappedMemBase[idx] = NULL; + } + } + + if (adapter.pBuffer) + vfree(adapter.pBuffer); + + HPI_DEBUG_LOG(ERROR, "adapter_probe failed\n"); + return -ENODEV; +} + +void __devexit asihpi_adapter_remove( + struct pci_dev *pci_dev +) +{ + int idx; + struct hpi_message hm; + struct hpi_response hr; + struct hpi_adapter *pa; + pa = (struct hpi_adapter *)pci_get_drvdata(pci_dev); + + HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_DELETE_ADAPTER); + hm.wAdapterIndex = pa->index; + HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); + + /* unmap PCI memory space, mapped during device init. */ + for (idx = 0; idx < HPI_MAX_ADAPTER_MEM_SPACES; idx++) { + if (pa->apRemappedMemBase[idx]) { + iounmap(pa->apRemappedMemBase[idx]); + pa->apRemappedMemBase[idx] = NULL; + } + } + + if (pa->pBuffer) + vfree(pa->pBuffer); + + pci_set_drvdata(pci_dev, NULL); + /* + printk(KERN_INFO "PCI device (%04x:%04x,%04x:%04x,%04x)," + " HPI index # %d, removed.\n", + pci_dev->vendor, pci_dev->device, + pci_dev->subsystem_vendor, + pci_dev->subsystem_device, pci_dev->devfn, + pa->index); + */ +} + +void __init asihpi_init( + void +) +{ + struct hpi_message hm; + struct hpi_response hr; + + memset(adapters, 0, sizeof(adapters)); + + /* HPI_DebugLevelSet(debug); now set directly as module param */ + printk(KERN_INFO "ASIHPI driver %d.%02d.%02d\n", + HPI_VER_MAJOR(HPI_VER), + HPI_VER_MINOR(HPI_VER), HPI_VER_RELEASE(HPI_VER)); + + HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_DRIVER_LOAD); + HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); +} + +void asihpi_exit( + void +) +{ + struct hpi_message hm; + struct hpi_response hr; + + HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_DRIVER_UNLOAD); + HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); +} + +/*********************************************************** +*/ diff --git a/pci/asihpi/hpioctl.h b/pci/asihpi/hpioctl.h new file mode 100644 index 0000000..5363472 --- /dev/null +++ b/pci/asihpi/hpioctl.h @@ -0,0 +1,58 @@ +/******************************************************************************* + + AudioScience HPI driver + Copyright (C) 1997-2003 AudioScience Inc. <support(a)audioscience.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation; + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Linux HPI ioctl, and shared module init functions +*******************************************************************************/ + +int __devinit asihpi_adapter_probe( + struct pci_dev *pci_dev, + const struct pci_device_id *pci_id +); +void __devexit asihpi_adapter_remove( + struct pci_dev *pci_dev +); +void __init asihpi_init( + void +); +void __exit asihpi_exit( + void +); + +int asihpi_hpi_release( + struct file *file +); + +long asihpi_hpi_ioctl( + struct file *file, + unsigned int cmd, + unsigned long arg +); + +/* This is called from hpifunc.c functions, called by ALSA + * (or other kernel process) In this case there is no file descriptor + * available for the message cache code + */ +void HPI_Message( + struct hpi_message *phm, + struct hpi_response *phr +); + +#define HOWNER_KERNEL ((void *)-1) + + /*********************************************************** +*/ -- 1.5.4.3

3 10