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

[alsa-devel] [PATCH 1/5] ASoC: wm8903: Move pin configuration into I2C probe() function
by Mark Brown 13 Jun '12

13 Jun '12

Ensure that the device pins are configured as soon as possible by moving the pin configration (including MICBIAS) into the I2C probe() function. This had been done in the CODEC probe() function when we were relying on the ASoC register I/O code. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- This series is untested but should deal with the WM8903 side of what I was saying earlier. sound/soc/codecs/wm8903.c | 92 +++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index e76a66d..7200088 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1,7 +1,7 @@ /* * wm8903.c -- WM8903 ALSA SoC Audio driver * - * Copyright 2008-11 Wolfson Microelectronics + * Copyright 2008-12 Wolfson Microelectronics * Copyright 2011-2012 NVIDIA, Inc. * * Author: Mark Brown <broonie(a)opensource.wolfsonmicro.com> @@ -2081,10 +2081,9 @@ static int wm8903_probe(struct snd_soc_codec *codec) { struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); struct wm8903_platform_data *pdata = wm8903->pdata; - int ret, i; + int ret; int trigger, irq_pol; u16 val; - bool mic_gpio = false; wm8903->codec = codec; codec->control_data = wm8903->regmap; @@ -2095,47 +2094,6 @@ static int wm8903_probe(struct snd_soc_codec *codec) return ret; } - /* Set up GPIOs, detect if any are MIC detect outputs */ - for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) { - if ((!pdata->gpio_cfg[i]) || - (pdata->gpio_cfg[i] > WM8903_GPIO_CONFIG_ZERO)) - continue; - - snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i, - pdata->gpio_cfg[i] & 0x7fff); - - val = (pdata->gpio_cfg[i] & WM8903_GP1_FN_MASK) - >> WM8903_GP1_FN_SHIFT; - - switch (val) { - case WM8903_GPn_FN_MICBIAS_CURRENT_DETECT: - case WM8903_GPn_FN_MICBIAS_SHORT_DETECT: - mic_gpio = true; - break; - default: - break; - } - } - - /* Set up microphone detection */ - snd_soc_write(codec, WM8903_MIC_BIAS_CONTROL_0, - pdata->micdet_cfg); - - /* Microphone detection needs the WSEQ clock */ - if (pdata->micdet_cfg) - snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0, - WM8903_WSEQ_ENA, WM8903_WSEQ_ENA); - - /* If microphone detection is enabled by pdata but - * detected via IRQ then interrupts can be lost before - * the machine driver has set up microphone detection - * IRQs as the IRQs are clear on read. The detection - * will be enabled when the machine driver configures. - */ - WARN_ON(!mic_gpio && (pdata->micdet_cfg & WM8903_MICDET_ENA)); - - wm8903->mic_delay = pdata->micdet_delay; - if (wm8903->irq) { if (pdata->irq_active_low) { trigger = IRQF_TRIGGER_LOW; @@ -2316,8 +2274,9 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, { struct wm8903_platform_data *pdata = dev_get_platdata(&i2c->dev); struct wm8903_priv *wm8903; + bool mic_gpio = false; unsigned int val; - int ret; + int ret, i; wm8903 = devm_kzalloc(&i2c->dev, sizeof(struct wm8903_priv), GFP_KERNEL); @@ -2361,6 +2320,8 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, } } + pdata = wm8903->pdata; + ret = regmap_read(wm8903->regmap, WM8903_SW_RESET_AND_ID, &val); if (ret != 0) { dev_err(&i2c->dev, "Failed to read chip ID: %d\n", ret); @@ -2385,6 +2346,47 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, wm8903_init_gpio(wm8903); + /* Set up GPIO pin state, detect if any are MIC detect outputs */ + for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) { + if ((!pdata->gpio_cfg[i]) || + (pdata->gpio_cfg[i] > WM8903_GPIO_CONFIG_ZERO)) + continue; + + regmap_write(wm8903->regmap, WM8903_GPIO_CONTROL_1 + i, + pdata->gpio_cfg[i] & 0x7fff); + + val = (pdata->gpio_cfg[i] & WM8903_GP1_FN_MASK) + >> WM8903_GP1_FN_SHIFT; + + switch (val) { + case WM8903_GPn_FN_MICBIAS_CURRENT_DETECT: + case WM8903_GPn_FN_MICBIAS_SHORT_DETECT: + mic_gpio = true; + break; + default: + break; + } + } + + /* Set up microphone detection */ + regmap_write(wm8903->regmap, WM8903_MIC_BIAS_CONTROL_0, + pdata->micdet_cfg); + + /* Microphone detection needs the WSEQ clock */ + if (pdata->micdet_cfg) + regmap_update_bits(wm8903->regmap, WM8903_WRITE_SEQUENCER_0, + WM8903_WSEQ_ENA, WM8903_WSEQ_ENA); + + /* If microphone detection is enabled by pdata but + * detected via IRQ then interrupts can be lost before + * the machine driver has set up microphone detection + * IRQs as the IRQs are clear on read. The detection + * will be enabled when the machine driver configures. + */ + WARN_ON(!mic_gpio && (pdata->micdet_cfg & WM8903_MICDET_ENA)); + + wm8903->mic_delay = pdata->micdet_delay; + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8903, &wm8903_dai, 1); if (ret != 0) -- 1.7.10

2 6

Re: [alsa-devel] [PATCH v2 0/5] mmp audio support
by Mark Brown 13 Jun '12

13 Jun '12

On Mon, Jun 11, 2012 at 06:04:36PM +0800, Zhangfei Gao wrote: > These patches provide mmp audio support under alsa via dmaengine > Support platfrom pxa688 and pxa910 > mmp_tdma.c and mmp-pcm.c is shared for pxa688 and pxa910 > pxa688 (mmp2) use mmp2-sspa.c > pxa910 directly use pxa-ssp.c > mmp_tdma.c is under dmaengine framework Applied 2-4. I'm not seeing a direct code dependency between this and the dmaengine driver in patch 1 (or review of it from Vinod yet) so I'm expecting that to go via the dmaengine tree.

2 2

[alsa-devel] Possible message repeat
by Brent Weatherall 13 Jun '12

13 Jun '12

Hello. I sent this message previously before I solidified my membership to the list and it seems my message never posted. Here it is again. My apologies if did go through and I missed it. I am new to audio development in Linux. I have worked with user space development with respect to UVC code and I have worked with specifying an XU in UVC. I wrote a user space driver/application to talk to a device supporting the UVC XU in Linux. I am trying to specify an extension to the UAC specification and then write a user space driver/application to use the extension when a device that supports it is available in Linux. Pretty much the same situation as I have already done with UVC XU. Windows and Mac code will follow, but right now I am only concerned with Linux. Can anyone assist me with the best path forward for writing user space code to use the XU I am going to define? Meaning generically speaking how to use UAC XU controls in ALSA. I was looking for code samples that use the audio.h header file interface, but after a day and a half I am coming to conclusion that only kernel space uses audio.h and that I will need to go through ALSA to accomplish my task. Again, this will be user space code I want distribute easily, with minimal dependencies. Our code will be apache licensed afterwards if possible, just like our UVC code was. So any work I do should be freely available to the community afterwards. **EDIT FROM PREVIOUS MESSAGE** After more searching, it appears that any XU controls would be processed through usbmixer.c, but I don't see how to use the code in usbmixer from user space. And so far I can't tell what source usbmixer resides in. I downloaded the alsa-lib source in Fedora, but I don't see that file. Is this a Linux kernel file? So far I am having lots of trouble finding anything useful regarding audio XUs in Linux. My apologies if this should be simple. Thank you in advance for any assistance. Best Regards, Brent

2 1

[alsa-devel] [PATCH 1/4] ASoC: when initializing CPU DAI, don't duplicate any CODEC init
by Stephen Warren 13 Jun '12

13 Jun '12

From: Stephen Warren <swarren(a)nvidia.com> If the CPU-side of a DAI link is a CODEC rather than a standalone DAI, the codec initialization will call try_module_get() and create the DAI widgets. Ensure that this isn't duplicated when the CPU DAI itself is probed, if the CPU DAI is part of a CODEC. Note that this is not a complete fix on its own, since there's no guarantee that the CODEC itself will be initialized - currently that only happens if the CODEC is also used as the CODEC-side of a DAI link, and that initialization may happen before or after the DAIs within the CODEC are initialized. However, such a scenario doesn't necessarily currently work, and I don't think this change alone makes it any worse. This is fixed in a couple patches time. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/soc-core.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3d803f3..448d4a7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -983,7 +983,9 @@ static void soc_remove_dai_link(struct snd_soc_card *card, int num, int order) } cpu_dai->probed = 0; list_del(&cpu_dai->card_list); - module_put(cpu_dai->dev->driver->owner); + + if (!cpu_dai->codec) + module_put(cpu_dai->dev->driver->owner); } } @@ -1257,11 +1259,13 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num, int order) /* probe the cpu_dai */ if (!cpu_dai->probed && cpu_dai->driver->probe_order == order) { - cpu_dai->dapm.card = card; - if (!try_module_get(cpu_dai->dev->driver->owner)) - return -ENODEV; + if (!cpu_dai->codec) { + cpu_dai->dapm.card = card; + if (!try_module_get(cpu_dai->dev->driver->owner)) + return -ENODEV; - snd_soc_dapm_new_dai_widgets(&cpu_dai->dapm, cpu_dai); + snd_soc_dapm_new_dai_widgets(&cpu_dai->dapm, cpu_dai); + } if (cpu_dai->driver->probe) { ret = cpu_dai->driver->probe(cpu_dai); -- 1.7.0.4

2 4

Re: [alsa-devel] [PATCH v3] sound/soc/lapis: add platform driver for ML7213
by Mark Brown 13 Jun '12

13 Jun '12

On Tue, Mar 06, 2012 at 02:48:05PM +0900, Tomoya MORINAGA wrote: > 2012年3月3日1:39 Mark Brown <broonie(a)opensource.wolfsonmicro.com>: > > I just merged Lars-Peter's dmaengine library code which has been on the > > list for a week or so - this should be updated to use that next time > > it's posted. That should save a lot of code from the driver and make > > sure it's following best practices for dmaengine use. > Sorry, we can't use this library. This sort of response really isn't on. Do you have some reason for saying this? Flat out refusing to do things with no reason is not useful. > >> +static struct ioh_i2s_data *i2s_data; > >> +static struct ioh_i2s_dma dmadata[MAX_I2S_CH]; > > Why are these needed, aren't they dynamically allocated by the driver? > You mean ASoC driver can't use global variable ? In general no Linux driver should be using a global variable except for things like this. > >> + case SNDRV_PCM_FORMAT_S32_LE: > >> + byte = 24; > >> + break; > > That looks wrong... are you sure you don't support S24_LE or something? > This is correct. > Because maximum transmit size of ML7213's I2S hw is 24bit. Note we often lay out 24 bit audio in 32 bit blocks. > >> +static struct platform_driver ioh_i2s_driver_plat = { > > > >> +static struct platform_driver ioh_dai_driver_plat = { > > > >> +static int ioh_i2s_pci_probe(struct pci_dev *pdev, > >> + const struct pci_device_id *id) > > Why are you creating these platform devices? I don't understand the > > function they serve. The code handling them looks to have quite a few > > problems but I'm not clear they should be there in the first place. > if these platform devices aren't used, device detection doesn't work correctly. > So, I added these. You've not actually mentioned the problem you were seeing... > >> + rv = request_irq(pdev->irq, ioh_i2s_irq, IRQF_SHARED, "ml7213_ioh", > >> + pdev); > >> + if (rv != 0) { > >> + printk(KERN_ERR "Failed to allocate irq\n"); > >> + goto out_irq; > >> + } > > Are you *sure* you're ready to handle interrupts at this point? > This is just registering interrupt handler. > As long as interrupt register is not enabled, the interrupt handler is > not called. > This is common request_irq description. > What's is your concern ? Apart from anything else you've got the interrupt requested as IRQF_SHARED so the interrupt could get called at any time. It's also not clear that you've got the hardware in a known good state.

3 28

[alsa-devel] [PATCH] ASoC: ml26124: Convert to devm_regmap_init_i2c
by Axel Lin 13 Jun '12

13 Jun '12

This fixes a leak if snd_soc_register_codec fails. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/ml26124.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index 22cb5bf..96aa5fa 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c @@ -638,7 +638,7 @@ static __devinit int ml26124_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, priv); - priv->regmap = regmap_init_i2c(i2c, &ml26124_i2c_regmap); + priv->regmap = devm_regmap_init_i2c(i2c, &ml26124_i2c_regmap); if (IS_ERR(priv->regmap)) { ret = PTR_ERR(priv->regmap); dev_err(&i2c->dev, "regmap_init_i2c() failed: %d\n", ret); @@ -651,10 +651,7 @@ static __devinit int ml26124_i2c_probe(struct i2c_client *i2c, static __devexit int ml26124_i2c_remove(struct i2c_client *client) { - struct ml26124_priv *priv = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - regmap_exit(priv->regmap); return 0; } -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: Ux500: Correct license strings
by Ola Lilja 13 Jun '12

13 Jun '12

GPLv2 -> GPL v2 Signed-off-by: Ola Lilja <ola.o.lilja(a)stericsson.com> --- sound/soc/codecs/ab8500-codec.c | 2 +- sound/soc/ux500/ux500_msp_dai.c | 2 +- sound/soc/ux500/ux500_msp_i2s.c | 2 +- sound/soc/ux500/ux500_pcm.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index dba246a..dd419c8 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2510,4 +2510,4 @@ static struct platform_driver ab8500_codec_platform_driver = { }; module_platform_driver(ab8500_codec_platform_driver); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 93c6c40..62ac028 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -840,4 +840,4 @@ static struct platform_driver msp_i2s_driver = { }; module_platform_driver(msp_i2s_driver); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 496dec1..ee14d2d 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -739,4 +739,4 @@ void ux500_msp_i2s_cleanup_msp(struct platform_device *pdev, devm_kfree(&pdev->dev, msp); } -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 66b080e..97d8e4d 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -315,4 +315,4 @@ static struct platform_driver ux500_pcm_driver = { }; module_platform_driver(ux500_pcm_driver); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); -- 1.7.8.3

3 2

Re: [alsa-devel] [PATCH 1/1] hda_intel: switch Intel chipsets to COMBO position_fix
by Takashi Iwai 13 Jun '12

13 Jun '12

At Tue, 12 Jun 2012 16:30:00 -0700, Seth Heasley wrote: > > This patch implements the COMBO position_fix for recent Intel client chipsets. > > Signed-off-by: Seth Heasley <seth.heasley(a)intel.com> Thanks for the patch. But could you give a bit more context why this change is needed? Takashi > --- > sound/pci/hda/hda_intel.c | 11 ++++++++--- > 1 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 2b6392b..466a88c 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -535,6 +535,7 @@ enum { > #define AZX_DCAPS_BUFSIZE (1 << 21) /* no buffer size alignment */ > #define AZX_DCAPS_ALIGN_BUFSIZE (1 << 22) /* buffer size alignment */ > #define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23) /* BDLE in 4k boundary */ > +#define AZX_DCAPS_POSFIX_COMBO (1 << 24) /* Use COMBO as default */ > > /* quirks for ATI SB / AMD Hudson */ > #define AZX_DCAPS_PRESET_ATI_SB \ > @@ -2728,6 +2729,10 @@ static int __devinit check_position_fix(struct azx *chip, int fix) > snd_printd(SFX "Using LPIB position fix\n"); > return POS_FIX_LPIB; > } > + if (chip->driver_caps & AZX_DCAPS_POSFIX_COMBO) { > + snd_printd(SFX "Using COMBO position fix\n"); > + return POS_FIX_COMBO; > + } > return POS_FIX_AUTO; > } > > @@ -3240,7 +3245,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { > /* CPT */ > { PCI_DEVICE(0x8086, 0x1c20), > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP | > - AZX_DCAPS_BUFSIZE }, > + AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_COMBO }, > /* PBG */ > { PCI_DEVICE(0x8086, 0x1d20), > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP | > @@ -3248,11 +3253,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { > /* Panther Point */ > { PCI_DEVICE(0x8086, 0x1e20), > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP | > - AZX_DCAPS_BUFSIZE}, > + AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_COMBO }, > /* Lynx Point */ > { PCI_DEVICE(0x8086, 0x8c20), > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP | > - AZX_DCAPS_BUFSIZE}, > + AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_COMBO }, > /* SCH */ > { PCI_DEVICE(0x8086, 0x811b), > .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP | > -- > 1.7.4.4 >

1 0

[alsa-devel] [PATCH] ALSA: HDA: Pin fixup for Zotac Z68 motherboard
by David Henningsson 12 Jun '12

12 Jun '12

Pin 0x1b was connected to the front panel connector, which according to the HDA standard should contain a mic and a headphone. In this case, the headphone was listed as "line out" by BIOS. Cc: stable(a)kernel.org BugLink: https://bugs.launchpad.net/bugs/993162 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 224410e..b896681 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6439,6 +6439,7 @@ enum { ALC662_FIXUP_ASUS_MODE7, ALC662_FIXUP_ASUS_MODE8, ALC662_FIXUP_NO_JACK_DETECT, + ALC662_FIXUP_ZOTAC_Z68, }; static const struct alc_fixup alc662_fixups[] = { @@ -6588,6 +6589,13 @@ static const struct alc_fixup alc662_fixups[] = { .type = ALC_FIXUP_FUNC, .v.func = alc_fixup_no_jack_detect, }, + [ALC662_FIXUP_ZOTAC_Z68] = { + .type = ALC_FIXUP_PINS, + .v.pins = (const struct alc_pincfg[]) { + { 0x1b, 0x02214020 }, /* Front HP */ + { } + } + }, }; static const struct snd_pci_quirk alc662_fixup_tbl[] = { @@ -6601,6 +6609,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x19da, 0xa130, "Zotac Z68", ALC662_FIXUP_ZOTAC_Z68), SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T), #if 0 -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] alsa: compress_core: don't wake up on pause
by Vinod Koul 12 Jun '12

12 Jun '12

during pause the core should maintain the status-quo on the device and pointers and not wake up. If app needs it should call DROP explcitly. Signed-off-by: Namarta Kohli <namartax.kohli(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)linux.intel.com> --- sound/core/compress_offload.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a68aed7..375f7a0 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -502,10 +502,8 @@ static int snd_compr_pause(struct snd_compr_stream *stream) if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) return -EPERM; retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_PAUSE_PUSH); - if (!retval) { + if (!retval) stream->runtime->state = SNDRV_PCM_STATE_PAUSED; - wake_up(&stream->runtime->sleep); - } return retval; } -- 1.7.0.4

2 2