nothing to do here */ - if (is_porta) - return 0; - /* clock start */ switch (rate) static struct sh_fsi_platform_info fsi_info = ; static struct resource fsi_resources[] = { diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index cde7c00..59daae2 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c @@ -769,7 769,9 @@ static struct platform_device camera_devices[] = { /* FSI */ static struct sh_fsi_platform_info fsi_info = ; static struct resource fsi_resources[] = { diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 2b07fc0..59f4db8 100644 --- a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c @@ -278,7 278,9 @@ static struct platform_device ceu1_device = { /* FSI */ /* change J20, J21, J22 pin to 1-2 connection to use slave mode */ static struct sh_fsi_platform_info fsi_info = ; static struct resource fsi_resources[] = { diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index 9b1aaca..b457e87 100644 --- a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h @@ -72,10 72,16 @@ #define SH_FSI_BPFMD_32 (5 dev); /* Latch volume updates (right only; we always do left then right).*/ snd_soc_update_bits(codec, WM8994_AIF1_DAC1_LEFT_VOLUME, diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 694564d..378cc5b 100644 --- a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c @@ -13,8 13,11 @@ */ #include func(args)) struct fsi_core static int fsi_is_play(struct snd_pcm_substream *substream) static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream) -static set_rate_func fsi_get_info_set_rate(struct fsi_master *master) static set_rate_func fsi_get_info_set_rate(struct fsi_priv *fsi) static u32 fsi_get_info_flags(struct fsi_priv *fsi) - -static inline int fsi_stream_is_play(int stream) - - -static inline int fsi_is_play(struct snd_pcm_substream *substream) - -static inline struct fsi_stream *fsi_get_stream(struct fsi_priv *fsi, - int is_play) - - -static u32 fsi_get_port_shift(struct fsi_priv *fsi, int is_play) static u32 fsi_get_port_shift(struct fsi_priv *fsi, struct fsi_stream *io) static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, struct fsi_stream *io) static void fsi_count_fifo_err(struct fsi_priv *fsi) /* * fsi_stream_xx() function */ static inline int fsi_stream_is_play(struct fsi_priv *fsi, struct fsi_stream *io) static inline struct fsi_stream *fsi_stream_get(struct fsi_priv *fsi, struct snd_pcm_substream *substream) static int fsi_stream_is_working(struct fsi_priv *fsi, - int is_play) struct fsi_stream *io) static struct fsi_priv *fsi_stream_to_priv(struct fsi_stream *io) static void fsi_stream_init(struct fsi_priv *fsi, - int is_play, struct fsi_stream *io, struct snd_pcm_substream *substream) -static void fsi_stream_quit(struct fsi_priv *fsi, int is_play) static void fsi_stream_quit(struct fsi_priv *fsi, struct fsi_stream *io) -static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, int is_play) - - -static void fsi_count_fifo_err(struct fsi_priv *fsi) static int fsi_stream_transfer(struct fsi_stream *io) -/* - * dma function - */ #define fsi_stream_start(fsi, io)\ fsi_stream_handler_call(io, start_stop, fsi, io, 1) -static u8 *fsi_dma_get_area(struct fsi_priv *fsi, int stream) - - -static void fsi_dma_soft_push16(struct fsi_priv *fsi, int num) static int fsi_stream_probe(struct fsi_priv *fsi) struct fsi_stream *io; int ret1, ret2; -static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int num) - -static void fsi_dma_soft_push32(struct fsi_priv *fsi, int num) static int fsi_stream_remove(struct fsi_priv *fsi) io = &fsi-playback; ret1 = fsi_stream_handler_call(io, remove, fsi, io); -static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int num) - /* * irq function */ -static void fsi_irq_enable(struct fsi_priv *fsi, int is_play) static void fsi_irq_enable(struct fsi_priv *fsi, struct fsi_stream *io) -static void fsi_irq_disable(struct fsi_priv *fsi, int is_play) static void fsi_irq_disable(struct fsi_priv *fsi, struct fsi_stream *io) @@ -951,9 1243,8 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) static void fsi_dai_shutdown(struct snd_pcm_substream *substream, @@ -969,18 1260,19 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct fsi_priv *fsi = fsi_get_priv(substream); - int is_play = fsi_is_play(substream); struct fsi_stream *io = fsi_stream_get(fsi, substream); int ret = 0; switch (cmd) @@ -1031,8 1323,7 @@ static int fsi_set_fmt_spdif(struct fsi_priv *fsi) static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai); - struct fsi_master *master = fsi_get_master(fsi); - set_rate_func set_rate = fsi_get_info_set_rate(master); set_rate_func set_rate = fsi_get_info_set_rate(fsi); u32 flags = fsi_get_info_flags(fsi); int ret; @@ -1146,7 1437,7 @@ static int fsi_hw_free(struct snd_pcm_substream *substream) static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream) @@ -1234,11 1525,24 @@ static struct snd_soc_platform_driver fsi_soc_platform = { /* * platform function */ static void fsi_handler_init(struct fsi_priv *fsi) static int fsi_probe(struct platform_device *pdev) { struct fsi_master *master; const struct platform_device_id *id_entry; struct sh_fsi_platform_info *info = pdev-id); diff --git a/core/init.c b/core/init.c index 3ac49b1..068cf08 100644 --- a/core/init.c b/core/init.c @@ -480,74 480,104 @@ int snd_card_free(struct snd_card *card) EXPORT_SYMBOL(snd_card_free); -static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid) /* retrieve the last word of shortname or longname */ static const char *retrieve_id_from_card_name(const char *name) { - int i, len, idx_flag = 0, loops = SNDRV_CARDS; - const char *spos, *src; - char *id; - - if (nid == NULL) else { - spos = src = nid; const char *spos = name; while (*name) - id = card-id from the given string * If the string conflicts with other ids, add a suffix to make it unique.Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: fsi: Port A/B information was controlled by sh_fsi_port_info Current FSI got each Port A/B parameter by porta_flags/portb_flags from platform. it is preparation for DMAEngine support Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: fsi: don't use is_play as a parameter of fsi functions is_play should be kept as local valuable.it prepare cleanup for DMAEngine support Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: fsi: add fsi_stream_handler and PIO handler This patch adds struct fsi_stream_handler and defined fsi_pio_push/pop_handler. Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: fsi: use fsi_stream in fsi_get_current_fifo_samples() parameter fsi_get_current_fifo_samples() uses fsi_stream instead of is_play.- */ -static const struct hda_input_mux alc260_fujitsu_capture_sources[2] = ; - -/* Acer Travel Mate(/Extensa/Aspire) notebooks have similar configuration to - * the Fujitsu S702x, but jacks are marked differently.- */ -static const struct hda_input_mux alc260_acer_capture_sources[2] = ; - -/* Maxdata Favorit 100XS */ -static const struct hda_input_mux alc260_favorit100_capture_sources[2] = ; - -/* - * This is just place-holder, so there's something for alc_build_pcms to look - * at when it calculates the maximum number of channels.
- * - * Returns zero if successful, or a negative error code on failure.
- */ -static const hda_nid_t alc260_dual_adc_nids[2] = ; - -#define ALC260_DIGOUT_NID 0x03 -#define ALC260_DIGIN_NID 0x06 - -static const struct hda_input_mux alc260_capture_source = ; - -/* On Fujitsu S702x laptops capture only makes sense from Mic/Line In jack, - * headphone jack and the internal CD lines since these are the only pins at - * which audio can appear.
For flexibility, also allow the option of - * recording the mixer output on the second ADC (ADC0 doesn't have a - * connection to the mixer output).
This is just prepare cleanup for DMAEngine support. Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: fsi: tidyup: fsi_stream_xx() functions were gathered This patch gathered fsi_stream_xxx() functions in order to make it readable.
Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: fsi: data push/pop calculation part was divided Next transfer data size of "push" and "pop" had calculated on shared function. Signed-off-by: Kuninori Morimoto Commit Date: Tue Mar 13 2012 0100 ASo C: wm8994: Unsuspend the device while reading GPIO statuses Otherwise we might get an error if the GPIO is configured as an input since that makes the register volatile and a suspended device can't be read from.
For women who have been trying to find that illusive “special someone” for a while, this may seem like an impossible question to answer.
When mad cow struck the bovine industry many farmers were forced to raise this new meat animal.
Microsoft's 5000th patent was Live-related and gave Xbox 360 users access to watch other gamers compete against each other over Xbox Live.