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

Re: [alsa-devel] [PATCH - oss plugin update 1/2] oss: Add support of 32-bit and other formats
by Takashi Iwai 25 Jun '13

25 Jun '13

At Tue, 25 Jun 2013 03:38:11 +0100, Alex Wiggins wrote: > > Thank you for the prompt review Takashi. > > By #if/#endif in this case, do you mean #ifdef to see if the formats are > defined or something else? Not necessarily to be so fine grained. The point is that commenting out multiple lines of codes is a bad style. For disabling multiple lines of codes, use #if 0 or #ifndef XXX or whatever. Takashi > Good spot on the formats array - I guess I didn't have any soundcards with > more than 5 formats but you're right it needs to be increased now. > > I'll have a look at fixing these in the weekend and resubmitting. > > Best Regards, > > Alex > > > On 24 June 2013 08:54, Takashi Iwai <tiwai(a)suse.de> wrote: > > > At Sun, 23 Jun 2013 01:25:18 +0100, > > alex.d.wiggins(a)gmail.com wrote: > > > > > > From: Alex Wiggins <alex.d.wiggins(a)gmail.com> > > > > > > Added support of 32-bit and other audio formats via 3 changes: > > > > > > - Additional audio format definitions > > > at the top of the file (if required); > > > > > > - Additional audio formats in oss_hw_params > > > (to allow as input to pass to OSS); > > > > > > - Additional audio formats in oss_hw_constraint > > > (to allow to report to ALSA). > > > > > > Signed-off-by: Alex Wiggins <alex.d.wiggins(a)gmail.com> > > > > > > diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c > > > index d43b44c..6d8dea4 100644 > > > --- a/oss/pcm_oss.c > > > +++ b/oss/pcm_oss.c > > > @@ -24,6 +24,32 @@ > > > #include <alsa/pcm_external.h> > > > #include <linux/soundcard.h> > > > > > > +/* definitions for additional OSS formats if required */ > > > +#ifndef AFMT_S32_LE > > > +#define AFMT_S32_LE 0x00001000 > > > +#endif > > > +#ifndef AFMT_S32_BE > > > +#define AFMT_S32_BE 0x00002000 > > > +#endif > > > +#ifndef AFMT_S24_LE > > > +#define AFMT_S24_LE 0x00008000 > > > +#endif > > > +#ifndef AFMT_S24_BE > > > +#define AFMT_S24_BE 0x00010000 > > > +#endif > > > +#ifndef AFMT_S24_PACKED > > > +#define AFMT_S24_PACKED 0x00040000 > > > +#endif > > > +#ifndef AFMT_FLOAT > > > +#define AFMT_FLOAT 0x00004000 > > > +#endif > > > +#ifndef AFMT_SPDIF_RAW > > > +#define AFMT_SPDIF_RAW 0x00020000 > > > +#endif > > > +#ifndef AFMT_VORBIS > > > +#define AFMT_VORBIS 0x00000800 > > > +#endif > > > + > > > typedef struct snd_pcm_oss { > > > snd_pcm_ioplug_t io; > > > char *device; > > > @@ -165,6 +191,143 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, > > > case SND_PCM_FORMAT_S16_BE: > > > oss->format = AFMT_S16_BE; > > > break; > > > + /* allow additional data formats (such as 32 bit) as input > > > + to pass to OSS (set in OSS driver) */ > > > + case SND_PCM_FORMAT_S32_LE: > > > + oss->format = AFMT_S32_LE; > > > + break; > > > + case SND_PCM_FORMAT_S32_BE: > > > + oss->format = AFMT_S32_BE; > > > + break; > > > + case SND_PCM_FORMAT_S8: > > > + oss->format = AFMT_S8; > > > + break; > > > + case SND_PCM_FORMAT_U16_LE: > > > + oss->format = AFMT_U16_LE; > > > + break; > > > + case SND_PCM_FORMAT_U16_BE: > > > + oss->format = AFMT_U16_BE; > > > + break; > > > + case SND_PCM_FORMAT_S24_LE: > > > + oss->format = AFMT_S24_LE; > > > + break; > > > + case SND_PCM_FORMAT_S24_BE: > > > + oss->format = AFMT_S24_BE; > > > + break; > > > + case SND_PCM_FORMAT_MU_LAW: > > > + oss->format = AFMT_MU_LAW; > > > + break; > > > + case SND_PCM_FORMAT_A_LAW: > > > + oss->format = AFMT_A_LAW; > > > + break; > > > + case SND_PCM_FORMAT_IMA_ADPCM: > > > + oss->format = AFMT_IMA_ADPCM; > > > + break; > > > + case SND_PCM_FORMAT_MPEG: > > > + oss->format = AFMT_MPEG; > > > + break; > > > + case SND_PCM_FORMAT_S24_3LE: > > > + oss->format = AFMT_S24_PACKED; > > > + break; > > > + case SND_PCM_FORMAT_FLOAT: > > > + oss->format = AFMT_FLOAT; > > > + break; > > > + case SND_PCM_FORMAT_IEC958_SUBFRAME: > > > + oss->format = AFMT_SPDIF_RAW; > > > + break; > > > + /* following formats need defining checking native endian: > > > + case SND_PCM_FORMAT_S16: > > > + oss->format = AFMT_S16_NE; > > > + break; > > > + case SND_PCM_FORMAT_U16: > > > + oss->format = AFMT_U16_NE; > > > + break; > > > + case SND_PCM_FORMAT_S24: > > > + oss->format = AFMT_S24_NE; > > > + break; > > > + case SND_PCM_FORMAT_S32: > > > + oss->format = AFMT_S32_NE; > > > + */ > > > > Use #if/#endif instead of multi-line comments. > > > > > + /* following formats found in ALSA but not in OSS: > > > + case SND_PCM_FORMAT_U24_LE: > > > + oss->format = AFMT_U24_LE; > > > + break; > > > + case SND_PCM_FORMAT_U24_BE: > > > + oss->format = AFMT_U24_BE; > > > + break; > > > + case SND_PCM_FORMAT_U32_LE: > > > + oss->format = AFMT_U32_LE; > > > + break; > > > + case SND_PCM_FORMAT_U32_BE: > > > + oss->format = AFMT_U32_BE; > > > + break; > > > + case SND_PCM_FORMAT_FLOAT_LE: > > > + oss->format = AFMT_FLOAT_LE; > > > + break; > > > + case SND_PCM_FORMAT_FLOAT_BE: > > > + oss->format = AFMT_FLOAT_BE; > > > + break; > > > + case SND_PCM_FORMAT_FLOAT64_LE: > > > + oss->format = AFMT_FLOAT64_LE; > > > + break; > > > + case SND_PCM_FORMAT_FLOAT64_BE: > > > + oss->format = AFMT_FLOAT64_BE; > > > + break; > > > + case SND_PCM_FORMAT_IEC958_SUBFRAME_LE: > > > + oss->format = AFMT_SPDIF_RAW_LE; > > > + break; > > > + case SND_PCM_FORMAT_IEC958_SUBFRAME_BE: > > > + oss->format = AFMT_SPDIF_RAW_BE; > > > + break; > > > + case SND_PCM_FORMAT_GSM: > > > + oss->format = AFMT_GSM; > > > + break; > > > + case SND_PCM_FORMAT_SPECIAL: > > > + oss->format = AFMT_SPECIAL; > > > + break; > > > + case SND_PCM_FORMAT_S24_3BE: > > > + oss->format = AFMT_S24_PACKED_BE; > > > + break; > > > + case SND_PCM_FORMAT_U24_3LE: > > > + oss->format = AFMT_U24_PACKED; > > > + break; > > > + case SND_PCM_FORMAT_U24_3BE: > > > + oss->format = AFMT_U24_PACKED_BE; > > > + break; > > > + case SND_PCM_FORMAT_S20_3LE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_S20_3BE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_U20_3LE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_U20_3BE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_S18_3LE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_S18_3BE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_U18_3LE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_U18_3BE: > > > + oss->format = ; > > > + break; > > > + case SND_PCM_FORMAT_U24: > > > + oss->format = AFMT_U24_NE; > > > + break; > > > + case SND_PCM_FORMAT_U32: > > > + oss->format = AFMT_U32_NE; > > > + break; > > > + case SND_PCM_FORMAT_FLOAT64: > > > + oss->format = AFMT_FLOAT64; > > > + break; > > > + */ > > > > Ditto. > > > > > > > default: > > > fprintf(stderr, "*** OSS: unsupported format %s\n", > > snd_pcm_format_name(io->format)); > > > return -EINVAL; > > > @@ -273,6 +436,40 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) > > > format[nformats++] = SND_PCM_FORMAT_S16_BE; > > > if (tmp & AFMT_MU_LAW) > > > format[nformats++] = SND_PCM_FORMAT_MU_LAW; > > > + /* allow additional data formats (such as 32 bit) > > > + to be reported from OSS to ALSA below */ > > > + if (tmp & AFMT_S32_LE) > > > + format[nformats++] = SND_PCM_FORMAT_S32_LE; > > > + if (tmp & AFMT_S32_BE) > > > + format[nformats++] = SND_PCM_FORMAT_S32_BE; > > > + if (tmp & AFMT_A_LAW) > > > + format[nformats++] = SND_PCM_FORMAT_A_LAW; > > > + if (tmp & AFMT_IMA_ADPCM) > > > + format[nformats++] = SND_PCM_FORMAT_IMA_ADPCM; > > > + if (tmp & AFMT_S8) > > > + format[nformats++] = SND_PCM_FORMAT_S8; > > > + if (tmp & AFMT_U16_LE) > > > + format[nformats++] = SND_PCM_FORMAT_U16_LE; > > > + if (tmp & AFMT_U16_BE) > > > + format[nformats++] = SND_PCM_FORMAT_U16_BE ; > > > + if (tmp & AFMT_MPEG) > > > + format[nformats++] = SND_PCM_FORMAT_MPEG; > > > + if (tmp & AFMT_FLOAT) > > > + format[nformats++] = SND_PCM_FORMAT_FLOAT; > > > + if (tmp & AFMT_S24_LE) > > > + format[nformats++] = SND_PCM_FORMAT_S24_LE; > > > + if (tmp & AFMT_S24_BE) > > > + format[nformats++] = SND_PCM_FORMAT_S24_BE; > > > + if (tmp & AFMT_SPDIF_RAW) > > > + format[nformats++] = SND_PCM_FORMAT_IEC958_SUBFRAME; > > > + if (tmp & AFMT_S24_PACKED) > > > + format[nformats++] = SND_PCM_FORMAT_S24_3LE; > > > + /* following formats found in OSS but not in ALSA */ > > > + if (tmp & AFMT_AC3) > > > + format[nformats++] = SND_PCM_FORMAT_UNKNOWN; > > > + if (tmp & AFMT_VORBIS) > > > + format[nformats++] = SND_PCM_FORMAT_UNKNOWN; > > > + /* assume signed 16 bit (native CPU endian) if not found above */ > > > if (! nformats) > > > format[nformats++] = SND_PCM_FORMAT_S16; > > > if ((err = snd_pcm_ioplug_set_param_list(io, > > SND_PCM_IOPLUG_HW_FORMAT, > > > > You need to adjust format[] array size if you add more possible > > formats. > > > > > > thanks, > > > > Takashi > > > [2 <text/html; ISO-8859-1 (quoted-printable)>] >

1 0

[alsa-devel] [PATCH 1/2] ALSA: hda - Remove unused variable
by Wang Xingchao 25 Jun '13

25 Jun '13

Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7803ddd..0f7a380 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1891,7 +1891,6 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec, /* override pins connection list */ snd_printdd("hdmi: haswell: override pin connection 0x%x\n", nid); - nconns = max(spec->num_cvts, 4); snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); } -- 1.8.1.2

3 5

[alsa-devel] [PATCH v4 0/4] ASoC: codecs: some more improvements for adau1701
by Daniel Mack 24 Jun '13

24 Jun '13

v4: - added one more patch to move the firmware download, for more clarity. - postpone the firmware download to the first call of hw_params(), so we don't need to pass a default pll div in DT. - drop adi,pll-clkdiv entirely v3: - fixed documentation for adi,pll-clkdiv - droped implicit I2C_M_STOP - moved regcache_sync() to adau1761_reset() - added regcache_mark_dirty() - made gpio_pll_mode and array - dropped ADAU1701_CLKDIV_MCLK_LRCLK Daniel Mack (4): ASoC: codecs: adau1701: move firmware download to adau1701_reset() ASoC: codecs: adau1701: allow configuration of PLL mode pins ASoC: codecs: adau1701: switch to direct regmap API usage ASoC: codecs: adau1701: add support for pin muxing .../devicetree/bindings/sound/adi,adau1701.txt | 12 + sound/soc/codecs/adau1701.c | 277 ++++++++++++++++----- 2 files changed, 232 insertions(+), 57 deletions(-) -- 1.8.1.4

2 6

[alsa-devel] [PATCH 0/3] Support auto-mute via amp in HD-audio generic driver
by Takashi Iwai 24 Jun '13

24 Jun '13

Hi, this is a patch set to add the support of the headphone/line-out auto- mute via amp mute instead of pin-control values. The motivation of this is that we found that some machines don't honor the pin-control values but just ignore and keep speaker on. So, instead of muting via the pin control value, we need to mute via the amp value of the pin. The mechanism to add an extra mute check in software is relatively easy: just add the new mute flag and check it in the mixer put callback. The only tricky part is to update all relevant controls by jack plug/unplug or the auto-mute switch. For that, the new helper function, snd_ctl_vmaster_sync(), is added, so that the codec driver just updates the bit mask and call the sync at the last. There should be no behavior change unless the new flag is set. [PATCH 1/3] ALSA: vmaster: Add snd_ctl_sync_vmaster() helper function [PATCH 2/3] ALSA: hda - Add auto_mute_via_amp flag to generic parser [PATCH 3/3] ALSA: hda - Use auto_mute_via_amp=1 for VT1708 Takashi

1 3

[alsa-devel] [GIT PULL] ASoC updates for v3.10
by Mark Brown 24 Jun '13

24 Jun '13

The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f: Linux 3.10-rc6 (2013-06-15 11:51:07 -1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.10-rc7 for you to fetch changes up to b12a530682ec725ff7a95871d8003d1753e315b8: Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus (2013-06-19 19:49:23 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.10 A few small updates, one small core fix and several simple driver ones. The wm8962 changes are a little large but are pretty important. ---------------------------------------------------------------- Axel Lin (1): ASoC: adav80x: Select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI Charles Keepax (1): ASoC: wm5110: Correct rate control for DSP4 Lars-Peter Clausen (1): ASoC: dapm: Add snd_soc_dapm_switch to the power up/down sequence table Mark Brown (4): Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linus Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus Nicolin Chen (2): ASoC: wm8962: Remove remaining direct register cache accesses ASoC: wm8962: Enable start-up and normal bias after reset in runtime resume sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm8962.c | 35 ++++++++++++++++++++++++----------- sound/soc/codecs/wm_adsp.c | 2 +- sound/soc/soc-dapm.c | 2 ++ 4 files changed, 28 insertions(+), 13 deletions(-)

2 2

[alsa-devel] [PATCH 1/2] ALSA: hda - Remove unused variable
by Wang Xingchao 24 Jun '13

24 Jun '13

Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7803ddd..0f7a380 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1891,7 +1891,6 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec, /* override pins connection list */ snd_printdd("hdmi: haswell: override pin connection 0x%x\n", nid); - nconns = max(spec->num_cvts, 4); snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); } -- 1.8.1.2

3 4

[alsa-devel] [RFC PATCH] ALSA: hda - reset hda link during system/runtime suspend
by mengdong.lin＠intel.com 24 Jun '13

24 Jun '13

From: Mengdong Lin <mengdong.lin(a)intel.com> If all the codecs report ClkStopOK (OK to stop bus clock) after being put to D3, this patch will reset the HDA link before the controller is put to D3. So the link will be in reset during system or runtime suspend, the bus clock stops and the codecs are in D3(ClkStop) state. This may help to reduce power consumption by dozens of mW on some peripheral hda codecs. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index f089fa0..9f110c7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1120,6 +1120,20 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus, struct snd_dma_buffer *dmab); #endif +/* enter link reset */ +static void azx_reset_link(struct azx *chip) +{ + unsigned long timeout; + + /* reset controller */ + azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET); + + timeout = jiffies + msecs_to_jiffies(100); + while ((azx_readb(chip, GCTL) & ICH6_GCTL_RESET) && + time_before(jiffies, timeout)) + usleep_range(500, 1000); +} + /* reset codec link */ static int azx_reset(struct azx *chip, int full_reset) { @@ -2894,6 +2908,7 @@ static int azx_suspend(struct device *dev) if (chip->initialized) snd_hda_suspend(chip->bus); azx_stop_chip(chip); + azx_reset_link(chip); if (chip->irq >= 0) { free_irq(chip->irq, chip); chip->irq = -1; @@ -2946,6 +2961,7 @@ static int azx_runtime_suspend(struct device *dev) struct azx *chip = card->private_data; azx_stop_chip(chip); + azx_reset_link(chip); azx_clear_irq_pending(chip); return 0; } -- 1.7.10.4

3 2

Re: [alsa-devel] [PATCH - oss plugin update 2/2] oss: Add user variables to set period and buffer config
by Takashi Iwai 24 Jun '13

24 Jun '13

At Sun, 23 Jun 2013 01:25:19 +0100, alex.d.wiggins(a)gmail.com wrote: > > From: Alex Wiggins <alex.d.wiggins(a)gmail.com> > > Added 4 user variables to control the OSS period and buffer config: > > - period_size_allowany (boolean): > if not set then queries OSS for period size > (by using SNDCTL_DSP_GETBLKSIZE), > if set to true then allows any power of 2 period size; > I'd suggest to put an underscore between "allow" and "any". Or, instead of adding a flag... > - period_size (integer): > sets the OSS period size (SND_PCM_IOPLUG_HW_PERIOD_BYTES); ... handle allowany when period_size < 0, for example. Takashi > - periods (integer): > sets the number of OSS periods (SND_PCM_IOPLUG_HW_PERIODS); > > - buffer_size (integer): > sets the OSS buffer size (SND_PCM_IOPLUG_HW_BUFFER_BYTES). > > Note that ALSA performs sanity checks to prevent conflicts. > > Signed-off-by: Alex Wiggins <alex.d.wiggins(a)gmail.com> > > diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c > index 6d8dea4..7131e54 100644 > --- a/oss/pcm_oss.c > +++ b/oss/pcm_oss.c > @@ -60,6 +60,13 @@ typedef struct snd_pcm_oss { > unsigned int period_shift; > unsigned int periods; > unsigned int frame_bytes; > + /* user variables set using ALSA config files */ > + /* included here as this snd_pcm_oss_t struct > + is stored in io->private_data */ > + int user_period_size_allowany; > + long int user_period_size; > + long int user_periods; > + long int user_buffer_size; > } snd_pcm_oss_t; > > static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *io, > @@ -406,6 +413,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) > unsigned int nchannels; > unsigned int channel[6]; > /* period and buffer bytes must be power of two */ > + /* minimum: 2^8 = 256; maximum: 2^23 = 8388608 */ > static const unsigned int bytes_list[] = { > 1U<<8, 1U<<9, 1U<<10, 1U<<11, 1U<<12, 1U<<13, 1U<<14, 1U<<15, > 1U<<16, 1U<<17, 1U<<18, 1U<<19, 1U<<20, 1U<<21, 1U<<22, 1U<<23 > @@ -498,20 +506,96 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) > if (err < 0) > return err; > > - /* period size (in power of two) */ > - err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, > - ARRAY_SIZE(bytes_list), bytes_list); > - if (err < 0) > - return err; > - /* periods */ > - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIODS, 2, 1024); > - if (err < 0) > - return err; > - /* buffer size (in power of two) */ > - err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, > - ARRAY_SIZE(bytes_list), bytes_list); > - if (err < 0) > - return err; > + /* period and buffer sizes: default behaviour below is to > + query period size from OSS */ > + > + /* consider user set paramaters > + (period_size_allowany; period_size; periods; buffer_size) */ > + /* note: ALSA performs sanity checks > + to prevent conflicting parameters */ > + > + /* period_size_allowany and period_size */ > + if (oss->user_period_size_allowany) { > + /* period_size_allowany flag set: > + allow any power of 2 period size */ > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_PERIOD_BYTES, > + ARRAY_SIZE(bytes_list), bytes_list); > + if (err < 0) > + return err; > + } else { > + if (oss->user_period_size > 0) { > + /* period_size set to positive value: > + use user set period size */ > + const unsigned int user_period_size > + = oss->user_period_size; > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_PERIOD_BYTES, 1, > + &user_period_size); > + } else { > + /* query OSS for period size (called fragment size) */ > + unsigned int fragsize; > + if (ioctl(oss->fd, SNDCTL_DSP_GETBLKSIZE, &fragsize) > + < 0) > + fprintf(stderr, > +"*** alsa-plugins-oss: error querying SNDCTL_DSP_GETBLKSIZE.\n"); > + > + /* note: second query of SNDCTL_DSP_GETBLKSIZE > + can give different result > + (i.e. 4096 instead of 2048) */ > + /* in oss_audio_core.c getblksize function, > + 4096 is the default return value: > + so second time probably not reliable */ > + > + /* period size (in power of two) */ > + unsigned int x = fragsize; > + /* check if fragsize is a power of two */ > + if ((x != 0) && ((x & (~x + 1)) == x)) > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_PERIOD_BYTES, > + 1, &fragsize); > + else > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_PERIOD_BYTES, > + ARRAY_SIZE(bytes_list), bytes_list); > + if (err < 0) > + return err; > + } > + } > + > + /* periods (number of periods per buffer) */ > + if (oss->user_periods > 0) { > + /* force number of periods to user set periods */ > + const unsigned int user_periods = oss->user_periods; > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_PERIODS, 1, &user_periods); > + if (err < 0) > + return err; > + } else { > + /* allow any number of periods between 2 and 1024 inclusive > + (ALSA can choose) */ > + err = snd_pcm_ioplug_set_param_minmax(io, > + SND_PCM_IOPLUG_HW_PERIODS, 2, 1024); > + if (err < 0) > + return err; > + } > + > + /* buffer_size */ > + if (oss->user_buffer_size > 0) { > + /* force buffer size to user set buffer_size */ > + const unsigned int user_buffer_size = oss->user_buffer_size; > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_BUFFER_BYTES, 1, &user_buffer_size); > + if (err < 0) > + return err; > + } else { > + /* buffer size (in power of two) */ > + err = snd_pcm_ioplug_set_param_list(io, > + SND_PCM_IOPLUG_HW_BUFFER_BYTES, > + ARRAY_SIZE(bytes_list), bytes_list); > + if (err < 0) > + return err; > + } > > return 0; > } > @@ -556,6 +640,11 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) > const char *device = "/dev/dsp"; > int err; > snd_pcm_oss_t *oss; > + /* default values for user variables*/ > + int user_period_size_allowany = 0; > + long int user_period_size = 0; > + long int user_periods = 0; > + long int user_buffer_size = 0; > > snd_config_for_each(i, next, conf) { > snd_config_t *n = snd_config_iterator_entry(i); > @@ -571,6 +660,39 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) > } > continue; > } > + > + /* user variables */ > + if (strcmp(id, "period_size_allowany") == 0) { > + if (snd_config_get_bool(n) < 0) { > + SNDERR("Invalid type for %s", id); > + return -EINVAL; > + } else > + user_period_size_allowany = > + snd_config_get_bool(n); > + continue; > + } > + if (strcmp(id, "period_size") == 0) { > + if (snd_config_get_integer(n, &user_period_size) < 0) { > + SNDERR("Invalid type for %s", id); > + return -EINVAL; > + } > + continue; > + } > + if (strcmp(id, "periods") == 0) { > + if (snd_config_get_integer(n, &user_periods) < 0) { > + SNDERR("Invalid type for %s", id); > + return -EINVAL; > + } > + continue; > + } > + if (strcmp(id, "buffer_size") == 0) { > + if (snd_config_get_integer(n, &user_buffer_size) < 0) { > + SNDERR("Invalid type for %s", id); > + return -EINVAL; > + } > + continue; > + } > + > SNDERR("Unknown field %s", id); > return -EINVAL; > } > @@ -595,6 +717,12 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) > goto error; > } > > + /* save user variables from ALSA config files */ > + oss->user_period_size_allowany = user_period_size_allowany; > + oss->user_period_size = user_period_size; > + oss->user_periods = user_periods; > + oss->user_buffer_size = user_buffer_size; > + > oss->io.version = SND_PCM_IOPLUG_VERSION; > oss->io.name = "ALSA <-> OSS PCM I/O Plugin"; > oss->io.poll_fd = oss->fd; > -- > 1.8.3.1 >

1 0

Re: [alsa-devel] [PATCH - oss plugin update 1/2] oss: Add support of 32-bit and other formats
by Takashi Iwai 24 Jun '13

24 Jun '13

At Sun, 23 Jun 2013 01:25:18 +0100, alex.d.wiggins(a)gmail.com wrote: > > From: Alex Wiggins <alex.d.wiggins(a)gmail.com> > > Added support of 32-bit and other audio formats via 3 changes: > > - Additional audio format definitions > at the top of the file (if required); > > - Additional audio formats in oss_hw_params > (to allow as input to pass to OSS); > > - Additional audio formats in oss_hw_constraint > (to allow to report to ALSA). > > Signed-off-by: Alex Wiggins <alex.d.wiggins(a)gmail.com> > > diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c > index d43b44c..6d8dea4 100644 > --- a/oss/pcm_oss.c > +++ b/oss/pcm_oss.c > @@ -24,6 +24,32 @@ > #include <alsa/pcm_external.h> > #include <linux/soundcard.h> > > +/* definitions for additional OSS formats if required */ > +#ifndef AFMT_S32_LE > +#define AFMT_S32_LE 0x00001000 > +#endif > +#ifndef AFMT_S32_BE > +#define AFMT_S32_BE 0x00002000 > +#endif > +#ifndef AFMT_S24_LE > +#define AFMT_S24_LE 0x00008000 > +#endif > +#ifndef AFMT_S24_BE > +#define AFMT_S24_BE 0x00010000 > +#endif > +#ifndef AFMT_S24_PACKED > +#define AFMT_S24_PACKED 0x00040000 > +#endif > +#ifndef AFMT_FLOAT > +#define AFMT_FLOAT 0x00004000 > +#endif > +#ifndef AFMT_SPDIF_RAW > +#define AFMT_SPDIF_RAW 0x00020000 > +#endif > +#ifndef AFMT_VORBIS > +#define AFMT_VORBIS 0x00000800 > +#endif > + > typedef struct snd_pcm_oss { > snd_pcm_ioplug_t io; > char *device; > @@ -165,6 +191,143 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, > case SND_PCM_FORMAT_S16_BE: > oss->format = AFMT_S16_BE; > break; > + /* allow additional data formats (such as 32 bit) as input > + to pass to OSS (set in OSS driver) */ > + case SND_PCM_FORMAT_S32_LE: > + oss->format = AFMT_S32_LE; > + break; > + case SND_PCM_FORMAT_S32_BE: > + oss->format = AFMT_S32_BE; > + break; > + case SND_PCM_FORMAT_S8: > + oss->format = AFMT_S8; > + break; > + case SND_PCM_FORMAT_U16_LE: > + oss->format = AFMT_U16_LE; > + break; > + case SND_PCM_FORMAT_U16_BE: > + oss->format = AFMT_U16_BE; > + break; > + case SND_PCM_FORMAT_S24_LE: > + oss->format = AFMT_S24_LE; > + break; > + case SND_PCM_FORMAT_S24_BE: > + oss->format = AFMT_S24_BE; > + break; > + case SND_PCM_FORMAT_MU_LAW: > + oss->format = AFMT_MU_LAW; > + break; > + case SND_PCM_FORMAT_A_LAW: > + oss->format = AFMT_A_LAW; > + break; > + case SND_PCM_FORMAT_IMA_ADPCM: > + oss->format = AFMT_IMA_ADPCM; > + break; > + case SND_PCM_FORMAT_MPEG: > + oss->format = AFMT_MPEG; > + break; > + case SND_PCM_FORMAT_S24_3LE: > + oss->format = AFMT_S24_PACKED; > + break; > + case SND_PCM_FORMAT_FLOAT: > + oss->format = AFMT_FLOAT; > + break; > + case SND_PCM_FORMAT_IEC958_SUBFRAME: > + oss->format = AFMT_SPDIF_RAW; > + break; > + /* following formats need defining checking native endian: > + case SND_PCM_FORMAT_S16: > + oss->format = AFMT_S16_NE; > + break; > + case SND_PCM_FORMAT_U16: > + oss->format = AFMT_U16_NE; > + break; > + case SND_PCM_FORMAT_S24: > + oss->format = AFMT_S24_NE; > + break; > + case SND_PCM_FORMAT_S32: > + oss->format = AFMT_S32_NE; > + */ Use #if/#endif instead of multi-line comments. > + /* following formats found in ALSA but not in OSS: > + case SND_PCM_FORMAT_U24_LE: > + oss->format = AFMT_U24_LE; > + break; > + case SND_PCM_FORMAT_U24_BE: > + oss->format = AFMT_U24_BE; > + break; > + case SND_PCM_FORMAT_U32_LE: > + oss->format = AFMT_U32_LE; > + break; > + case SND_PCM_FORMAT_U32_BE: > + oss->format = AFMT_U32_BE; > + break; > + case SND_PCM_FORMAT_FLOAT_LE: > + oss->format = AFMT_FLOAT_LE; > + break; > + case SND_PCM_FORMAT_FLOAT_BE: > + oss->format = AFMT_FLOAT_BE; > + break; > + case SND_PCM_FORMAT_FLOAT64_LE: > + oss->format = AFMT_FLOAT64_LE; > + break; > + case SND_PCM_FORMAT_FLOAT64_BE: > + oss->format = AFMT_FLOAT64_BE; > + break; > + case SND_PCM_FORMAT_IEC958_SUBFRAME_LE: > + oss->format = AFMT_SPDIF_RAW_LE; > + break; > + case SND_PCM_FORMAT_IEC958_SUBFRAME_BE: > + oss->format = AFMT_SPDIF_RAW_BE; > + break; > + case SND_PCM_FORMAT_GSM: > + oss->format = AFMT_GSM; > + break; > + case SND_PCM_FORMAT_SPECIAL: > + oss->format = AFMT_SPECIAL; > + break; > + case SND_PCM_FORMAT_S24_3BE: > + oss->format = AFMT_S24_PACKED_BE; > + break; > + case SND_PCM_FORMAT_U24_3LE: > + oss->format = AFMT_U24_PACKED; > + break; > + case SND_PCM_FORMAT_U24_3BE: > + oss->format = AFMT_U24_PACKED_BE; > + break; > + case SND_PCM_FORMAT_S20_3LE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_S20_3BE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_U20_3LE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_U20_3BE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_S18_3LE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_S18_3BE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_U18_3LE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_U18_3BE: > + oss->format = ; > + break; > + case SND_PCM_FORMAT_U24: > + oss->format = AFMT_U24_NE; > + break; > + case SND_PCM_FORMAT_U32: > + oss->format = AFMT_U32_NE; > + break; > + case SND_PCM_FORMAT_FLOAT64: > + oss->format = AFMT_FLOAT64; > + break; > + */ Ditto. > default: > fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format)); > return -EINVAL; > @@ -273,6 +436,40 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) > format[nformats++] = SND_PCM_FORMAT_S16_BE; > if (tmp & AFMT_MU_LAW) > format[nformats++] = SND_PCM_FORMAT_MU_LAW; > + /* allow additional data formats (such as 32 bit) > + to be reported from OSS to ALSA below */ > + if (tmp & AFMT_S32_LE) > + format[nformats++] = SND_PCM_FORMAT_S32_LE; > + if (tmp & AFMT_S32_BE) > + format[nformats++] = SND_PCM_FORMAT_S32_BE; > + if (tmp & AFMT_A_LAW) > + format[nformats++] = SND_PCM_FORMAT_A_LAW; > + if (tmp & AFMT_IMA_ADPCM) > + format[nformats++] = SND_PCM_FORMAT_IMA_ADPCM; > + if (tmp & AFMT_S8) > + format[nformats++] = SND_PCM_FORMAT_S8; > + if (tmp & AFMT_U16_LE) > + format[nformats++] = SND_PCM_FORMAT_U16_LE; > + if (tmp & AFMT_U16_BE) > + format[nformats++] = SND_PCM_FORMAT_U16_BE ; > + if (tmp & AFMT_MPEG) > + format[nformats++] = SND_PCM_FORMAT_MPEG; > + if (tmp & AFMT_FLOAT) > + format[nformats++] = SND_PCM_FORMAT_FLOAT; > + if (tmp & AFMT_S24_LE) > + format[nformats++] = SND_PCM_FORMAT_S24_LE; > + if (tmp & AFMT_S24_BE) > + format[nformats++] = SND_PCM_FORMAT_S24_BE; > + if (tmp & AFMT_SPDIF_RAW) > + format[nformats++] = SND_PCM_FORMAT_IEC958_SUBFRAME; > + if (tmp & AFMT_S24_PACKED) > + format[nformats++] = SND_PCM_FORMAT_S24_3LE; > + /* following formats found in OSS but not in ALSA */ > + if (tmp & AFMT_AC3) > + format[nformats++] = SND_PCM_FORMAT_UNKNOWN; > + if (tmp & AFMT_VORBIS) > + format[nformats++] = SND_PCM_FORMAT_UNKNOWN; > + /* assume signed 16 bit (native CPU endian) if not found above */ > if (! nformats) > format[nformats++] = SND_PCM_FORMAT_S16; > if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT, You need to adjust format[] array size if you add more possible formats. thanks, Takashi

1 0

[alsa-devel] [PATCH] Add M2Tech hiFace USB-SPDIF driver
by Antonio Ospite 24 Jun '13

24 Jun '13

Add driver for M2Tech hiFace USB-SPDIF interface and compatible devices. The supported products are: * M2Tech Young * M2Tech hiFace * M2Tech North Star * M2Tech W4S Young * M2Tech Corrson * M2Tech AUDIA * M2Tech SL Audio * M2Tech Empirical * M2Tech Rockna * M2Tech Pathos * M2Tech Metronome * M2Tech CAD * M2Tech Audio Esclusive * M2Tech Rotel * M2Tech Eeaudio * The Chord Company CHORD * AVA Group A/S Vitus Signed-off-by: Antonio Ospite <ao2(a)amarulasolutions.com> --- Hi, this is my first ALSA driver I still have some doubts and I marked them in the comments below with a XXX prefix, could someone please take a look at them? I plan on submitting a version 2 of the driver after I get some feedback, especially on those doubts. I also noticed that many drivers under sound/usb/ have text in the Kconfig entry stating "Say Y here to include support for ..." but I only see "[N/m/?]" as options when I run "make oldconfig" maybe because of some dependency, I am not sure, should such text be removed in order to avoid confusion? Thanks, Antonio sound/usb/Kconfig | 33 +++ sound/usb/Makefile | 2 +- sound/usb/hiface/Makefile | 2 + sound/usb/hiface/chip.c | 331 ++++++++++++++++++++++ sound/usb/hiface/chip.h | 34 +++ sound/usb/hiface/pcm.c | 666 +++++++++++++++++++++++++++++++++++++++++++++ sound/usb/hiface/pcm.h | 24 ++ 7 files changed, 1091 insertions(+), 1 deletion(-) create mode 100644 sound/usb/hiface/Makefile create mode 100644 sound/usb/hiface/chip.c create mode 100644 sound/usb/hiface/chip.h create mode 100644 sound/usb/hiface/pcm.c create mode 100644 sound/usb/hiface/pcm.h diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index 225dfd7..2b206e8 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -115,5 +115,38 @@ config SND_USB_6FIRE and further help can be found at http://sixfireusb.sourceforge.net +config SND_USB_HIFACE + tristate "M2Tech hiFace USB-SPDIF driver" + select SND_PCM + help + Say Y here to include support for M2Tech hiFace USB-SPDIF interface. + + M2Tech hiFace and compatible devices offer a Hi-End S/PDIF Output + Interface, see http://www.m2tech.biz/hiface.html + + This driver supports the original M2Tech hiFace and some other + compatible devices. The supported products are: + + * M2Tech Young + * M2Tech hiFace + * M2Tech North Star + * M2Tech W4S Young + * M2Tech Corrson + * M2Tech AUDIA + * M2Tech SL Audio + * M2Tech Empirical + * M2Tech Rockna + * M2Tech Pathos + * M2Tech Metronome + * M2Tech CAD + * M2Tech Audio Esclusive + * M2Tech Rotel + * M2Tech Eeaudio + * The Chord Company CHORD + * AVA Group A/S Vitus + + To compile this driver as a module, choose M here: the module + will be called snd-usb-hiface. + endif # SND_USB diff --git a/sound/usb/Makefile b/sound/usb/Makefile index ac256dc..abe668f 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -23,4 +23,4 @@ obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o -obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ +obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ diff --git a/sound/usb/hiface/Makefile b/sound/usb/hiface/Makefile new file mode 100644 index 0000000..463b136 --- /dev/null +++ b/sound/usb/hiface/Makefile @@ -0,0 +1,2 @@ +snd-usb-hiface-objs := chip.o pcm.o +obj-$(CONFIG_SND_USB_HIFACE) += snd-usb-hiface.o diff --git a/sound/usb/hiface/chip.c b/sound/usb/hiface/chip.c new file mode 100644 index 0000000..dce74e9 --- /dev/null +++ b/sound/usb/hiface/chip.c @@ -0,0 +1,331 @@ +/* + * Linux driver for M2Tech HiFace compatible devices + * + * Copyright 2012-2013 (C) M2TECH S.r.l and Amarula Solutions B.V. + * + * Authors: Michael Trimarchi <michael(a)amarulasolutions.com> + * Antonio Ospite <ao2(a)amarulasolutions.com> + * + * The driver is based on the work done in TerraTec DMX 6Fire USB + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <linux/module.h> +#include <linux/slab.h> +#include <sound/initval.h> + +#include "chip.h" +#include "pcm.h" + +MODULE_AUTHOR("Michael Trimarchi <michael(a)amarulasolutions.com>"); +MODULE_AUTHOR("Antonio Ospite <ao2(a)amarulasolutions.com>"); +MODULE_DESCRIPTION("M2Tech HiFace USB audio driver"); +MODULE_LICENSE("GPL v2"); +MODULE_SUPPORTED_DEVICE("{{HiFace, Evo}}"); + +static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ +static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for card */ +static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ + +#define DRIVER_NAME "snd-usb-hiface" +#define CARD_NAME "HiFace" + +module_param_array(index, int, NULL, 0444); +MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard."); +module_param_array(id, charp, NULL, 0444); +MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard."); +module_param_array(enable, bool, NULL, 0444); +MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard."); + +static struct hiface_chip *chips[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; + +static DEFINE_MUTEX(register_mutex); + +struct hiface_vendor_quirk { + const char *device_name; + u8 extra_freq; +}; + +static int hiface_dev_free(struct snd_device *device) +{ + struct hiface_chip *chip = device->device_data; + kfree(chip); + return 0; +} + +static int hiface_chip_create(struct usb_device *device, int idx, + const struct hiface_vendor_quirk *quirk, + struct hiface_chip **rchip) +{ + struct snd_card *card = NULL; + struct hiface_chip *chip; + int ret; + static struct snd_device_ops ops = { + .dev_free = hiface_dev_free, + }; + + *rchip = NULL; + + /* if we are here, card can be registered in alsa. */ + ret = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card); + if (ret < 0) { + snd_printk(KERN_ERR "cannot create alsa card.\n"); + return ret; + } + + strcpy(card->driver, DRIVER_NAME); + + if (quirk && quirk->device_name) + strcpy(card->shortname, quirk->device_name); + else + strcpy(card->shortname, "M2Tech generic audio"); + + sprintf(card->longname, "%s at %d:%d", card->shortname, + device->bus->busnum, device->devnum); + + chip = kzalloc(sizeof(*chip), GFP_KERNEL); + if (!chip) { + snd_card_free(card); + return -ENOMEM; + } + + chip->dev = device; + chip->index = idx; + chip->card = card; + + ret = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (ret < 0) { + kfree(chip); + snd_card_free(card); + return ret; + } + + *rchip = chip; + return 0; +} + +static int hiface_chip_probe(struct usb_interface *intf, + const struct usb_device_id *usb_id) +{ + const struct hiface_vendor_quirk *quirk = (struct hiface_vendor_quirk *)usb_id->driver_info; + int ret; + int i; + struct hiface_chip *chip; + struct usb_device *device = interface_to_usbdev(intf); + + pr_info("Probe " DRIVER_NAME " driver.\n"); + + ret = usb_set_interface(device, 0, 0); + if (ret != 0) { + snd_printk(KERN_ERR "can't set first interface for " CARD_NAME " device.\n"); + return -EIO; + } + + /* check whether the card is already registered */ + chip = NULL; + mutex_lock(&register_mutex); + for (i = 0; i < SNDRV_CARDS; i++) { + if (chips[i] && chips[i]->dev == device) { + if (chips[i]->shutdown) { + snd_printk(KERN_ERR CARD_NAME " device is in the shutdown state, cannot create a card instance\n"); + ret = -ENODEV; + goto err; + } + chip = chips[i]; + break; + } + } + if (!chip) { + /* it's a fresh one. + * now look for an empty slot and create a new card instance + */ + for (i = 0; i < SNDRV_CARDS; i++) + if (enable[i] && !chips[i]) { + ret = hiface_chip_create(device, i, quirk, + &chip); + if (ret < 0) + goto err; + + snd_card_set_dev(chip->card, &intf->dev); + break; + } + if (!chip) { + snd_printk(KERN_ERR "no available " CARD_NAME " audio device\n"); + ret = -ENODEV; + goto err; + } + } + + ret = hiface_pcm_init(chip, quirk ? quirk->extra_freq : 0); + if (ret < 0) + goto err_chip_destroy; + + ret = snd_card_register(chip->card); + if (ret < 0) { + snd_printk(KERN_ERR "cannot register " CARD_NAME " card\n"); + goto err_chip_destroy; + } + + chips[chip->index] = chip; + chip->intf_count++; + + mutex_unlock(&register_mutex); + + usb_set_intfdata(intf, chip); + return 0; + +err_chip_destroy: + snd_card_free(chip->card); +err: + mutex_unlock(&register_mutex); + return ret; +} + +static void hiface_chip_disconnect(struct usb_interface *intf) +{ + struct hiface_chip *chip; + struct snd_card *card; + + pr_debug("%s: called.\n", __func__); + + chip = usb_get_intfdata(intf); + if (!chip) + return; + + card = chip->card; + chip->intf_count--; + if (chip->intf_count <= 0) { + /* Make sure that the userspace cannot create new request */ + snd_card_disconnect(card); + + mutex_lock(&register_mutex); + chips[chip->index] = NULL; + mutex_unlock(&register_mutex); + + chip->shutdown = true; + hiface_pcm_abort(chip); + snd_card_free_when_closed(card); + } +} + +static struct usb_device_id device_table[] = { + { + USB_DEVICE(0x04b4, 0x0384), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Young", + .extra_freq = 1, + } + }, + { + USB_DEVICE(0x04b4, 0x930b), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "hiFace", + } + }, + { + USB_DEVICE(0x04b4, 0x931b), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "North Star", + } + }, + { + USB_DEVICE(0x04b4, 0x931c), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "W4S Young", + } + }, + { + USB_DEVICE(0x04b4, 0x931d), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Corrson", + } + }, + { + USB_DEVICE(0x04b4, 0x931e), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "AUDIA", + } + }, + { + USB_DEVICE(0x04b4, 0x931f), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "SL Audio", + } + }, + { + USB_DEVICE(0x04b4, 0x9320), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Empirical", + } + }, + { + USB_DEVICE(0x04b4, 0x9321), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Rockna", + } + }, + { + USB_DEVICE(0x249c, 0x9001), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Pathos", + } + }, + { + USB_DEVICE(0x249c, 0x9002), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Metronome", + } + }, + { + USB_DEVICE(0x249c, 0x9006), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "CAD", + } + }, + { + USB_DEVICE(0x249c, 0x9008), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Audio Esclusive", + } + }, + { + USB_DEVICE(0x249c, 0x931c), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Rotel", + } + }, + { + USB_DEVICE(0x249c, 0x932c), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Eeaudio", + } + }, + { + USB_DEVICE(0x245f, 0x931c), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "CHORD", + } + }, + { + USB_DEVICE(0x25c6, 0x9002), + .driver_info = (unsigned long)&(const struct hiface_vendor_quirk) { + .device_name = "Vitus", + } + }, + {} +}; + +MODULE_DEVICE_TABLE(usb, device_table); + +static struct usb_driver hiface_usb_driver = { + .name = DRIVER_NAME, + .probe = hiface_chip_probe, + .disconnect = hiface_chip_disconnect, + .id_table = device_table, +}; + +module_usb_driver(hiface_usb_driver); diff --git a/sound/usb/hiface/chip.h b/sound/usb/hiface/chip.h new file mode 100644 index 0000000..c2e9fda --- /dev/null +++ b/sound/usb/hiface/chip.h @@ -0,0 +1,34 @@ +/* + * Linux driver for M2Tech HiFace compatible devices + * + * Copyright 2012-2013 (C) M2TECH S.r.l and Amarula Solutions B.V. + * + * Authors: Michael Trimarchi <michael(a)amarulasolutions.com> + * Antonio Ospite <ao2(a)amarulasolutions.com> + * + * The driver is based on the work done in TerraTec DMX 6Fire USB + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef HIFACE_CHIP_H +#define HIFACE_CHIP_H + +#include <linux/usb.h> +#include <sound/core.h> + +struct pcm_runtime; + +struct hiface_chip { + struct usb_device *dev; + struct snd_card *card; + int intf_count; /* number of registered interfaces */ + int index; /* index in module parameter arrays */ + bool shutdown; + + struct pcm_runtime *pcm; +}; +#endif /* HIFACE_CHIP_H */ diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c new file mode 100644 index 0000000..34fe0ed --- /dev/null +++ b/sound/usb/hiface/pcm.c @@ -0,0 +1,666 @@ +/* + * Linux driver for M2Tech HiFace compatible devices + * + * Copyright 2012-2013 (C) M2TECH S.r.l and Amarula Solutions B.V. + * + * Authors: Michael Trimarchi <michael(a)amarulasolutions.com> + * Antonio Ospite <ao2(a)amarulasolutions.com> + * + * The driver is based on the work done in TerraTec DMX 6Fire USB + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <linux/slab.h> +#include <sound/pcm.h> + +#include "pcm.h" +#include "chip.h" + +#define OUT_EP 0x2 +#define PCM_N_URBS 8 +#define PCM_MAX_PACKET_SIZE 4096 +#define MAX_BUFSIZE (2 * PCM_N_URBS * PCM_MAX_PACKET_SIZE) + +struct pcm_urb { + struct hiface_chip *chip; + + struct urb instance; + struct usb_anchor submitted; + u8 *buffer; +}; + +struct pcm_substream { + spinlock_t lock; + struct snd_pcm_substream *instance; + + bool active; + snd_pcm_uframes_t dma_off; /* current position in alsa dma_area */ + snd_pcm_uframes_t period_off; /* current position in current period */ +}; + +enum { /* pcm streaming states */ + STREAM_DISABLED, /* no pcm streaming */ + STREAM_STARTING, /* pcm streaming requested, waiting to become ready */ + STREAM_RUNNING, /* pcm streaming running */ + STREAM_STOPPING +}; + +struct pcm_runtime { + struct hiface_chip *chip; + struct snd_pcm *instance; + + struct pcm_substream playback; + bool panic; /* if set driver won't do anymore pcm on device */ + + struct pcm_urb out_urbs[PCM_N_URBS]; + + struct mutex stream_mutex; + u8 stream_state; /* one of STREAM_XXX */ + u8 rate; /* one of PCM_RATE_XXX */ + u8 extra_freq; + wait_queue_head_t stream_wait_queue; + bool stream_wait_cond; +}; + +static const unsigned int rates[] = { 44100, 48000, 88200, 96000, 176400, 192000, + 352800, 384000 }; +static struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates) - 2, /* by default rates up to 192000 are supported */ + .list = rates, + .mask = 0, +}; + +static const int rates_alsaid[] = { + SNDRV_PCM_RATE_44100, SNDRV_PCM_RATE_48000, + SNDRV_PCM_RATE_88200, SNDRV_PCM_RATE_96000, + SNDRV_PCM_RATE_176400, SNDRV_PCM_RATE_192000, + SNDRV_PCM_RATE_KNOT, SNDRV_PCM_RATE_KNOT }; + +static const struct snd_pcm_hardware pcm_hw = { + .info = SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_BATCH, + + .formats = SNDRV_PCM_FMTBIT_S32_LE, + + .rates = SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_88200 | + SNDRV_PCM_RATE_96000 | + SNDRV_PCM_RATE_176400 | + SNDRV_PCM_RATE_192000 | + SNDRV_PCM_RATE_KNOT, + + .rate_min = 44100, + .rate_max = 192000, /* changes in hiface_pcm_open to support extra rates */ + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = MAX_BUFSIZE, + .period_bytes_min = PCM_MAX_PACKET_SIZE, + .period_bytes_max = MAX_BUFSIZE, + .periods_min = 2, + .periods_max = 1024 +}; + +static int hiface_pcm_set_rate(struct pcm_runtime *rt, unsigned int rate) +{ + u8 rate_value[] = { 0x43, 0x4b, 0x42, 0x4a, 0x40, 0x48, 0x58, 0x68 }; + int ret; + struct usb_device *device = rt->chip->dev; + + /* We are already sure that the rate is supported here thanks to the + * contraints set in hiface_pcm_open(), but we have to retrieve the + * index to access rate_value. + */ + for (rt->rate = 0; rt->rate < ARRAY_SIZE(rates); rt->rate++) + if (rate == rates[rt->rate]) + break; + + if (unlikely(rt->rate == ARRAY_SIZE(rates))) { + pr_err("Unsupported rate %d\n", rate); + return -EINVAL; + } + + /* + * USBIO: Vendor 0xb0(wValue=0x0043, wIndex=0x0000) + * 43 b0 43 00 00 00 00 00 + * USBIO: Vendor 0xb0(wValue=0x004b, wIndex=0x0000) + * 43 b0 4b 00 00 00 00 00 + * This control message doesn't have any ack from the + * other side + */ + ret = usb_control_msg(device, usb_sndctrlpipe(device, 0), + 0xb0, + USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, + rate_value[rt->rate], 0, NULL, 0, 100); + if (ret < 0) { + snd_printk(KERN_ERR "Error setting samplerate %d.\n", + rates[rt->rate]); + return ret; + } + + return 0; +} + +static struct pcm_substream *hiface_pcm_get_substream( + struct snd_pcm_substream *alsa_sub) +{ + struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub); + + if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) + return &rt->playback; + + pr_debug("Error getting pcm substream slot.\n"); + return NULL; +} + +/* call with stream_mutex locked */ +static void hiface_pcm_stream_stop(struct pcm_runtime *rt) +{ + int i, time; + + if (rt->stream_state != STREAM_DISABLED) { + rt->stream_state = STREAM_STOPPING; + + for (i = 0; i < PCM_N_URBS; i++) { + time = usb_wait_anchor_empty_timeout( + &rt->out_urbs[i].submitted, 100); + if (!time) + usb_kill_anchored_urbs( + &rt->out_urbs[i].submitted); + usb_kill_urb(&rt->out_urbs[i].instance); + } + + rt->stream_state = STREAM_DISABLED; + } +} + +/* call with stream_mutex locked */ +static int hiface_pcm_stream_start(struct pcm_runtime *rt) +{ + int ret = 0, i; + + if (rt->stream_state == STREAM_DISABLED) { + /* submit our out urbs zero init */ + rt->stream_state = STREAM_STARTING; + for (i = 0; i < PCM_N_URBS; i++) { + memset(rt->out_urbs[i].buffer, 0, PCM_MAX_PACKET_SIZE); + usb_anchor_urb(&rt->out_urbs[i].instance, + &rt->out_urbs[i].submitted); + ret = usb_submit_urb(&rt->out_urbs[i].instance, + GFP_ATOMIC); + if (ret) { + hiface_pcm_stream_stop(rt); + return ret; + } + } + + /* wait for first out urb to return (sent in in urb handler) */ + wait_event_timeout(rt->stream_wait_queue, rt->stream_wait_cond, + HZ); + if (rt->stream_wait_cond) { + pr_debug("%s: Stream is running wakeup event\n", + __func__); + rt->stream_state = STREAM_RUNNING; + } else { + hiface_pcm_stream_stop(rt); + return -EIO; + } + } + return ret; +} + + +/* The hardware wants word-swapped 32-bit values */ +void memcpy_swahw32(u8 *dest, u8 *src, unsigned int n) +{ + unsigned int i; + + for (i = 0; i < n / 4; i++) + ((u32 *)dest)[i] = swahw32(((u32 *)src)[i]); +} + +/* call with substream locked */ +static int hiface_pcm_playback(struct pcm_substream *sub, + struct pcm_urb *urb) +{ + struct snd_pcm_runtime *alsa_rt = sub->instance->runtime; + u8 *source; + unsigned int pcm_buffer_size; + + /* XXX Can an invalid format make it to here? + * Isn't ALSA checking pcm_hw.formats ? + */ + if (alsa_rt->format != SNDRV_PCM_FORMAT_S32_LE) { + pr_err("Unsupported sample format\n"); + return -EINVAL; + } + + pcm_buffer_size = snd_pcm_lib_buffer_bytes(sub->instance); + + if (sub->dma_off + PCM_MAX_PACKET_SIZE <= pcm_buffer_size) { + pr_debug("%s: (1) buffer_size %#x dma_offset %#x\n", __func__, + (unsigned int) pcm_buffer_size, + (unsigned int) sub->dma_off); + + source = alsa_rt->dma_area + sub->dma_off; + memcpy_swahw32(urb->buffer, source, PCM_MAX_PACKET_SIZE); + } else { + /* wrap around at end of ring buffer */ + unsigned int len; + + pr_debug("%s: (2) buffer_size %#x dma_offset %#x\n", __func__, + (unsigned int) pcm_buffer_size, + (unsigned int) sub->dma_off); + + len = pcm_buffer_size - sub->dma_off; + + source = alsa_rt->dma_area + sub->dma_off; + memcpy_swahw32(urb->buffer, source, len); + + source = alsa_rt->dma_area; + memcpy_swahw32(urb->buffer + len, source, + PCM_MAX_PACKET_SIZE - len); + } + sub->dma_off += PCM_MAX_PACKET_SIZE; + if (sub->dma_off >= pcm_buffer_size) + sub->dma_off -= pcm_buffer_size; + + sub->period_off += PCM_MAX_PACKET_SIZE; + + return 0; +} + +static void hiface_pcm_out_urb_handler(struct urb *usb_urb) +{ + struct pcm_urb *out_urb = usb_urb->context; + struct pcm_runtime *rt = out_urb->chip->pcm; + struct pcm_substream *sub; + unsigned long flags; + + pr_debug("%s: called.\n", __func__); + + if (usb_urb->status || rt->panic || rt->stream_state == STREAM_STOPPING) + return; + + if (rt->stream_state == STREAM_STARTING) { + rt->stream_wait_cond = true; + wake_up(&rt->stream_wait_queue); + } + + /* now send our playback data (if a free out urb was found) */ + sub = &rt->playback; + spin_lock_irqsave(&sub->lock, flags); + if (sub->active) { + int ret; + + ret = hiface_pcm_playback(sub, out_urb); + if (ret < 0) { + spin_unlock_irqrestore(&sub->lock, flags); + goto out_fail; + } + if (sub->period_off >= sub->instance->runtime->period_size) { + sub->period_off %= sub->instance->runtime->period_size; + spin_unlock_irqrestore(&sub->lock, flags); + snd_pcm_period_elapsed(sub->instance); + } else { + spin_unlock_irqrestore(&sub->lock, flags); + } + } else { + memset(out_urb->buffer, 0, PCM_MAX_PACKET_SIZE); + spin_unlock_irqrestore(&sub->lock, flags); + } +out_fail: + usb_submit_urb(&out_urb->instance, GFP_ATOMIC); +} + +static int hiface_pcm_open(struct snd_pcm_substream *alsa_sub) +{ + struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub); + struct pcm_substream *sub = NULL; + struct snd_pcm_runtime *alsa_rt = alsa_sub->runtime; + int ret; + + pr_debug("%s: called.\n", __func__); + + if (rt->panic) + return -EPIPE; + + mutex_lock(&rt->stream_mutex); + alsa_rt->hw = pcm_hw; + + if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) { + + /* XXX can we avoid setting hw.rates below? + * + * FWIU setting alsa_rt->hw.rates in the open callback can be + * useful in two cases: + * + * - different hardware revisions have different + * capabilities + * + * - different stream types must have the same capabilities + * + * but in our case it should not be needed as we only have one + * playback stream and we define the capabilities via + * constraints already to avoid invalid rates to be used. + * + * Moreover, following the code stolen from 6fire it seems + * impossible to get to setting alsa_rt->hw.rates here: + * + * hiface_pcm_init: + * rt->rate = ARRAY_SIZE(rates); + * + * hiface_pcm_open: + * if (rt->rate < ARRAY_SIZE(rates)) + * alsa_rt->hw.rates = rates_alsaid[rt->rate]; + * // So it does not get here on the first open + * + * hiface_pcm_prepare: + * hiface_pcm_set_rate: + * for (rt->rate = 0; rt->rate < ARRAY_SIZE(rates); rt->rate++) + * if (rate == rates[rt->rate]) + * break; + * + * hiface_pcm_close: + * rt->rate = ARRAY_SIZE(rates); + * // So it won't set alsa_rt->hw.rates at the next open either + * + * So the only way to set alsa_rt->hw.rates is to have two + * calls to the open callback, is that even possible? ALSA + * does not allow sharing PCM streams AFAIK and we use only + * one playback stream. + * + * Maybe the 6fire driver was setting alsa_rt->hw.rates in + * order to have the playback stream and the capture stream + * use the same rate? I.e. the first open,prepare,set_rate() + * sequence on one type of stream will decide the rate and the + * second open on the other type would restrict the supported + * rate to the one already in use, but I am not sure. + * + * If the rationale makes sense then we don't need to set + * alsa_rt->hw.rates and we can remove this and related code. + */ + if (rt->rate < ARRAY_SIZE(rates)) + alsa_rt->hw.rates = rates_alsaid[rt->rate]; + + sub = &rt->playback; + } + + if (!sub) { + mutex_unlock(&rt->stream_mutex); + pr_err("Invalid stream type\n"); + return -EINVAL; + } + + if (rt->extra_freq) { + alsa_rt->hw.rate_max = 384000; + constraints_rates.count = ARRAY_SIZE(rates); + } + + ret = snd_pcm_hw_constraint_list(alsa_sub->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + mutex_unlock(&rt->stream_mutex); + return ret; + } + + sub->instance = alsa_sub; + sub->active = false; + mutex_unlock(&rt->stream_mutex); + return 0; +} + +static int hiface_pcm_close(struct snd_pcm_substream *alsa_sub) +{ + struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub); + struct pcm_substream *sub = hiface_pcm_get_substream(alsa_sub); + unsigned long flags; + + if (rt->panic) + return 0; + + pr_debug("%s: called.\n", __func__); + + mutex_lock(&rt->stream_mutex); + if (sub) { + /* deactivate substream */ + spin_lock_irqsave(&sub->lock, flags); + sub->instance = NULL; + sub->active = false; + spin_unlock_irqrestore(&sub->lock, flags); + + /* all substreams closed? if so, stop streaming */ + if (!rt->playback.instance) { + hiface_pcm_stream_stop(rt); + rt->rate = ARRAY_SIZE(rates); + } + } + mutex_unlock(&rt->stream_mutex); + return 0; +} + +static int hiface_pcm_hw_params(struct snd_pcm_substream *alsa_sub, + struct snd_pcm_hw_params *hw_params) +{ + pr_debug("%s: called.\n", __func__); + return snd_pcm_lib_malloc_pages(alsa_sub, + params_buffer_bytes(hw_params)); +} + +static int hiface_pcm_hw_free(struct snd_pcm_substream *alsa_sub) +{ + pr_debug("%s: called.\n", __func__); + return snd_pcm_lib_free_pages(alsa_sub); +} + +static int hiface_pcm_prepare(struct snd_pcm_substream *alsa_sub) +{ + struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub); + struct pcm_substream *sub = hiface_pcm_get_substream(alsa_sub); + struct snd_pcm_runtime *alsa_rt = alsa_sub->runtime; + int ret; + + pr_debug("%s: called.\n", __func__); + + if (rt->panic) + return -EPIPE; + if (!sub) + return -ENODEV; + + mutex_lock(&rt->stream_mutex); + + sub->dma_off = 0; + sub->period_off = 0; + + if (rt->stream_state == STREAM_DISABLED) { + + ret = hiface_pcm_set_rate(rt, alsa_rt->rate); + if (ret) { + mutex_unlock(&rt->stream_mutex); + return ret; + } + ret = hiface_pcm_stream_start(rt); + if (ret) { + mutex_unlock(&rt->stream_mutex); + return ret; + } + } + mutex_unlock(&rt->stream_mutex); + return 0; +} + +static int hiface_pcm_trigger(struct snd_pcm_substream *alsa_sub, int cmd) +{ + struct pcm_substream *sub = hiface_pcm_get_substream(alsa_sub); + struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub); + unsigned long flags; + + pr_debug("%s: called.\n", __func__); + + if (rt->panic) + return -EPIPE; + if (!sub) + return -ENODEV; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + spin_lock_irqsave(&sub->lock, flags); + sub->active = true; + spin_unlock_irqrestore(&sub->lock, flags); + return 0; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + spin_lock_irqsave(&sub->lock, flags); + sub->active = false; + spin_unlock_irqrestore(&sub->lock, flags); + return 0; + + default: + return -EINVAL; + } +} + +static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub) +{ + struct pcm_substream *sub = hiface_pcm_get_substream(alsa_sub); + struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub); + unsigned long flags; + snd_pcm_uframes_t dma_offset; + + if (rt->panic || !sub) + return SNDRV_PCM_STATE_XRUN; + + spin_lock_irqsave(&sub->lock, flags); + dma_offset = sub->dma_off; + spin_unlock_irqrestore(&sub->lock, flags); + return bytes_to_frames(alsa_sub->runtime, dma_offset); +} + +static struct snd_pcm_ops pcm_ops = { + .open = hiface_pcm_open, + .close = hiface_pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = hiface_pcm_hw_params, + .hw_free = hiface_pcm_hw_free, + .prepare = hiface_pcm_prepare, + .trigger = hiface_pcm_trigger, + .pointer = hiface_pcm_pointer, +}; + +static int hiface_pcm_init_urb(struct pcm_urb *urb, + struct hiface_chip *chip, + unsigned int ep, + void (*handler)(struct urb *)) +{ + urb->chip = chip; + usb_init_urb(&urb->instance); + + urb->buffer = kzalloc(PCM_MAX_PACKET_SIZE, GFP_KERNEL); + if (!urb->buffer) + return -ENOMEM; + + usb_fill_bulk_urb(&urb->instance, chip->dev, + usb_sndbulkpipe(chip->dev, ep), (void *)urb->buffer, + PCM_MAX_PACKET_SIZE, handler, urb); + init_usb_anchor(&urb->submitted); + + return 0; +} + +void hiface_pcm_abort(struct hiface_chip *chip) +{ + struct pcm_runtime *rt = chip->pcm; + + if (rt) { + rt->panic = true; + + if (rt->playback.instance) { + snd_pcm_stop(rt->playback.instance, + SNDRV_PCM_STATE_XRUN); + } + mutex_lock(&rt->stream_mutex); + hiface_pcm_stream_stop(rt); + mutex_unlock(&rt->stream_mutex); + } +} + +static void hiface_pcm_destroy(struct hiface_chip *chip) +{ + struct pcm_runtime *rt = chip->pcm; + int i; + + for (i = 0; i < PCM_N_URBS; i++) + kfree(rt->out_urbs[i].buffer); + + kfree(chip->pcm); + chip->pcm = NULL; +} + +static void hiface_pcm_free(struct snd_pcm *pcm) +{ + struct pcm_runtime *rt = pcm->private_data; + + pr_debug("%s: called.\n", __func__); + + if (rt) + hiface_pcm_destroy(rt->chip); +} + +int hiface_pcm_init(struct hiface_chip *chip, u8 extra_freq) +{ + int i; + int ret; + struct snd_pcm *pcm; + struct pcm_runtime *rt; + + rt = kzalloc(sizeof(*rt), GFP_KERNEL); + if (!rt) + return -ENOMEM; + + rt->chip = chip; + rt->stream_state = STREAM_DISABLED; + rt->rate = ARRAY_SIZE(rates); + if (extra_freq) + rt->extra_freq = 1; + + init_waitqueue_head(&rt->stream_wait_queue); + mutex_init(&rt->stream_mutex); + spin_lock_init(&rt->playback.lock); + + for (i = 0; i < PCM_N_URBS; i++) + hiface_pcm_init_urb(&rt->out_urbs[i], chip, OUT_EP, + hiface_pcm_out_urb_handler); + + ret = snd_pcm_new(chip->card, "USB-SPDIF Audio", 0, 1, 0, &pcm); + if (ret < 0) { + kfree(rt); + pr_err("Cannot create pcm instance\n"); + return ret; + } + + pcm->private_data = rt; + pcm->private_free = hiface_pcm_free; + + strcpy(pcm->name, "USB-SPDIF Audio"); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &pcm_ops); + + snd_pcm_lib_preallocate_pages_for_all(pcm, + SNDRV_DMA_TYPE_CONTINUOUS, + snd_dma_continuous_data(GFP_KERNEL), + MAX_BUFSIZE, MAX_BUFSIZE); + rt->instance = pcm; + + chip->pcm = rt; + return 0; +} diff --git a/sound/usb/hiface/pcm.h b/sound/usb/hiface/pcm.h new file mode 100644 index 0000000..ddc9fe7 --- /dev/null +++ b/sound/usb/hiface/pcm.h @@ -0,0 +1,24 @@ +/* + * Linux driver for M2Tech HiFace compatible devices + * + * Copyright 2012-2013 (C) M2TECH S.r.l and Amarula Solutions B.V. + * + * Authors: Michael Trimarchi <michael(a)amarulasolutions.com> + * Antonio Ospite <ao2(a)amarulasolutions.com> + * + * The driver is based on the work done in TerraTec DMX 6Fire USB + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef HIFACE_PCM_H +#define HIFACE_PCM_H + +struct hiface_chip; + +int hiface_pcm_init(struct hiface_chip *chip, u8 extra_freq); +void hiface_pcm_abort(struct hiface_chip *chip); +#endif /* HIFACE_PCM_H */ -- 1.7.10.4

6 22