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

[alsa-devel] [PATCH] ALSA: add a module alias to the FSI driver
by Guennadi Liakhovetski 18 Apr '11

18 Apr '11

This patch enables FSI driver autoloading on sh-mobile systems. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> --- sound/soc/sh/fsi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 0c9997e..88b669c 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1321,3 +1321,4 @@ module_exit(fsi_mobile_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SuperH onchip FSI audio driver"); MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori(a)renesas.com>"); +MODULE_ALIAS("platform:fsi-pcm-audio"); -- 1.7.2.5

4 3

Re: [alsa-devel] [PATCH 1/1] sound/oss/aedsp16.c: Remove #define TRUE/FALSE, use bool instead.
by Thiago Farina 18 Apr '11

18 Apr '11

On Sun, Apr 17, 2011 at 10:03 PM, Wanlong Gao <wanlong.gao(a)gmail.com> wrote: > On 4/18/11, Thiago Farina <tfransosi(a)gmail.com> wrote: >> Signed-off-by: Thiago Farina <tfransosi(a)gmail.com> >> --- >> sound/oss/aedsp16.c | 324 >> +++++++++++++++++++++++++-------------------------- >> 1 files changed, 158 insertions(+), 166 deletions(-) >> >> diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c >> index 35b5912..5ae37b6 100644 >> --- a/sound/oss/aedsp16.c >> +++ b/sound/oss/aedsp16.c >> @@ -245,12 +245,11 @@ >> >> */ >> >> +#define VERSION "1.3" /* Version of Audio Excel DSP 16 driver. */ >> >> -#define VERSION "1.3" /* Version of Audio Excel DSP 16 driver */ >> - >> -#undef AEDSP16_DEBUG /* Define this to 1 to enable debug code */ >> -#undef AEDSP16_DEBUG_MORE /* Define this to 1 to enable more debug */ >> -#undef AEDSP16_INFO /* Define this to 1 to enable info code */ >> +#undef AEDSP16_DEBUG /* Define this to 1 to enable debug code. */ >> +#undef AEDSP16_DEBUG_MORE /* Define this to 1 to enable more debug. */ >> +#undef AEDSP16_INFO /* Define this to 1 to enable info code. */ >> >> #if defined(AEDSP16_DEBUG) >> # define DBG(x) printk x >> @@ -265,12 +264,6 @@ >> #endif >> >> /* >> - * Misc definitions >> - */ >> -#define TRUE 1 >> -#define FALSE 0 >> - >> -/* >> * Region Size for request/check/release region. >> */ >> #define IOBASE_REGION_SIZE 0x10 >> @@ -497,7 +490,7 @@ static struct aedsp16_info ae_config = { >> static char DSPCopyright[CARDNAMELEN + 1] __initdata = {0, }; >> static char DSPVersion[CARDVERLEN + 1] __initdata = {0, }; >> >> -static int __init aedsp16_wait_data(int port) >> +static bool __init aedsp16_wait_data(int port) >> { >> int loop = STATUSRETRY; >> unsigned char ret = 0; >> @@ -505,19 +498,19 @@ static int __init aedsp16_wait_data(int port) >> DBG1(("aedsp16_wait_data (0x%x): ", port)); >> >> do { >> - ret = inb(port + DSP_DATAVAIL); >> - /* >> - * Wait for data available (bit 7 of ret == 1) >> - */ >> - } while (!(ret & 0x80) && loop--); >> + ret = inb(port + DSP_DATAVAIL); >> + /* >> + * Wait for data available (bit 7 of ret == 1) >> + */ >> + } while (!(ret & 0x80) && loop--); >> >> if (ret & 0x80) { >> DBG1(("success.\n")); >> - return TRUE; >> + return true; >> } >> >> DBG1(("failure.\n")); >> - return FALSE; >> + return false; >> } >> >> static int __init aedsp16_read(int port) >> @@ -526,7 +519,7 @@ static int __init aedsp16_read(int port) >> >> DBG((" Read DSP Byte (0x%x): ", port)); >> >> - if (aedsp16_wait_data(port) == FALSE) { >> + if (aedsp16_wait_data(port) == false) { >> DBG(("failure.\n")); >> return -1; >> } >> @@ -538,17 +531,16 @@ static int __init aedsp16_read(int port) >> return inbyte; >> } >> >> -static int __init aedsp16_test_dsp(int port) >> +static bool __init aedsp16_test_dsp(int port) >> { >> - return ((aedsp16_read(port) == 0xaa) ? TRUE : FALSE); >> + return ((aedsp16_read(port) == 0xaa) ? true : false); >> } >> >> -static int __init aedsp16_dsp_reset(int port) >> +static bool __init aedsp16_dsp_reset(int port) >> { >> /* >> - * Reset DSP >> + * Reset DSP. >> */ >> - >> DBG(("Reset DSP:\n")); >> >> outb(1, (port + DSP_RESET)); >> @@ -556,12 +548,12 @@ static int __init aedsp16_dsp_reset(int port) >> outb(0, (port + DSP_RESET)); >> udelay(10); >> udelay(10); >> - if (aedsp16_test_dsp(port) == TRUE) { >> + if (aedsp16_test_dsp(port) == true) { >> DBG(("success.\n")); >> - return TRUE; >> + return true; >> } else >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> >> static int __init aedsp16_write(int port, int cmd) >> @@ -678,66 +670,66 @@ static int __init aedsp16_hard_write(int port) { >> if (aedsp16_write(port, COMMAND_6C)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_6C); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, COMMAND_5C)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, hard_cfg[0])) { >> printk("[AEDSP16] DATA 0x%x: failed!\n", hard_cfg[0]); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, hard_cfg[1])) { >> printk("[AEDSP16] DATA 0x%x: failed!\n", hard_cfg[1]); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, COMMAND_C5)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_C5); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> >> DBG(("success.\n")); >> >> - return TRUE; >> + return true; >> } >> >> -static int __init aedsp16_hard_read(int port) { >> +static bool __init aedsp16_hard_read(int port) { >> >> DBG(("aedsp16_hard_read:\n")); >> >> if (aedsp16_write(port, READ_HARD_CFG)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", READ_HARD_CFG); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> >> if ((hard_cfg[0] = aedsp16_read(port)) == -1) { >> printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n", >> READ_HARD_CFG); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> if ((hard_cfg[1] = aedsp16_read(port)) == -1) { >> printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n", >> READ_HARD_CFG); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> if (aedsp16_read(port) == -1) { >> printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n", >> READ_HARD_CFG); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> >> DBG(("success.\n")); >> >> - return TRUE; >> + return true; >> } >> >> static int __init aedsp16_ext_cfg_write(int port) { >> @@ -746,7 +738,7 @@ static int __init aedsp16_ext_cfg_write(int port) { >> >> if (aedsp16_write(port, COMMAND_66)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_66); >> - return FALSE; >> + return false; >> } >> >> extcfg = 7; >> @@ -762,51 +754,51 @@ static int __init aedsp16_ext_cfg_write(int port) { >> >> if (aedsp16_write(port, extcfg)) { >> printk("[AEDSP16] Write extcfg: failed!\n"); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, 0)) { >> printk("[AEDSP16] Write extcfg: failed!\n"); >> - return FALSE; >> + return false; >> } >> if (decoded_hcfg.cdrom == 3) { >> if (aedsp16_write(port, COMMAND_52)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_52); >> - return FALSE; >> + return false; >> } >> if ((val = aedsp16_read(port)) == -1) { >> printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n" >> , COMMAND_52); >> - return FALSE; >> + return false; >> } >> val &= 0x7F; >> if (aedsp16_write(port, COMMAND_60)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_60); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, val)) { >> printk("[AEDSP16] Write val: failed!\n"); >> - return FALSE; >> + return false; >> } >> } >> >> - return TRUE; >> + return true; >> } >> >> #endif /* CONFIG_SC6600 */ >> >> -static int __init aedsp16_cfg_write(int port) { >> +static bool __init aedsp16_cfg_write(int port) { >> if (aedsp16_write(port, WRITE_MDIRQ_CFG)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, soft_cfg)) { >> printk("[AEDSP16] Initialization of (M)IRQ and DMA: failed!\n"); >> - return FALSE; >> + return false; >> } >> - return TRUE; >> + return true; >> } >> >> -static int __init aedsp16_init_mss(int port) >> +static bool __init aedsp16_init_mss(int port) >> { >> DBG(("aedsp16_init_mss:\n")); >> >> @@ -816,154 +808,153 @@ static int __init aedsp16_init_mss(int port) >> printk("[AEDSP16] aedsp16_init_mss [0x%x]: failed!\n", >> DSP_INIT_MSS); >> DBG(("failure.\n")); >> - return FALSE; >> + return false; >> } >> - >> mdelay(10); >> >> - if (aedsp16_cfg_write(port) == FALSE) >> - return FALSE; >> + if (aedsp16_cfg_write(port) == false) >> + return false; >> >> outb(soft_cfg_mss, ae_config.mss_base); >> >> DBG(("success.\n")); >> >> - return TRUE; >> + return true; >> } >> >> -static int __init aedsp16_setup_board(int port) { >> - int loop = RETRY; >> +static bool __init aedsp16_setup_board(int port) { >> + int loop = RETRY; >> >> #if defined(CONFIG_SC6600) >> - int val = 0; >> + int val = 0; >> >> - if (aedsp16_hard_read(port) == FALSE) { >> + if (aedsp16_hard_read(port) == false) { >> printk("[AEDSP16] aedsp16_hard_read: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> if (aedsp16_write(port, COMMAND_52)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_52); >> - return FALSE; >> + return false; >> } >> >> if ((val = aedsp16_read(port)) == -1) { >> printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n", >> COMMAND_52); >> - return FALSE; >> + return false; >> } >> #endif >> >> do { >> if (aedsp16_write(port, COMMAND_88)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_88); >> - return FALSE; >> + return false; >> } >> mdelay(10); >> - } while ((aedsp16_wait_data(port) == FALSE) && loop--); >> + } while ((aedsp16_wait_data(port) == false) && loop--); >> >> if (aedsp16_read(port) == -1) { >> printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n", >> COMMAND_88); >> - return FALSE; >> + return false; >> } >> >> #if !defined(CONFIG_SC6600) >> if (aedsp16_write(port, COMMAND_5C)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C); >> - return FALSE; >> + return false; >> } >> #endif >> >> - if (aedsp16_cfg_write(port) == FALSE) >> - return FALSE; >> + if (aedsp16_cfg_write(port) == false) >> + return false; >> >> #if defined(CONFIG_SC6600) >> if (aedsp16_write(port, COMMAND_60)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_60); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, val)) { >> printk("[AEDSP16] DATA 0x%x: failed!\n", val); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, COMMAND_6E)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_6E); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, ver[0])) { >> printk("[AEDSP16] DATA 0x%x: failed!\n", ver[0]); >> - return FALSE; >> + return false; >> } >> if (aedsp16_write(port, ver[1])) { >> printk("[AEDSP16] DATA 0x%x: failed!\n", ver[1]); >> - return FALSE; >> + return false; >> } >> >> - if (aedsp16_hard_write(port) == FALSE) { >> + if (aedsp16_hard_write(port) == false) { >> printk("[AEDSP16] aedsp16_hard_write: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> if (aedsp16_write(port, COMMAND_5C)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C); >> - return FALSE; >> + return false; >> } >> >> #if defined(THIS_IS_A_THING_I_HAVE_NOT_TESTED_YET) >> - if (aedsp16_cfg_write(port) == FALSE) >> - return FALSE; >> + if (aedsp16_cfg_write(port) == false) >> + return false; >> #endif >> >> #endif >> >> - return TRUE; >> + return true; >> } >> >> -static int __init aedsp16_stdcfg(int port) { >> +static bool __init aedsp16_stdcfg(int port) { >> if (aedsp16_write(port, WRITE_MDIRQ_CFG)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG); >> - return FALSE; >> + return false; >> } >> /* >> * 0x0A == (IRQ 7, DMA 1, MIRQ 0) >> */ >> if (aedsp16_write(port, 0x0A)) { >> printk("[AEDSP16] aedsp16_stdcfg: failed!\n"); >> - return FALSE; >> + return false; >> } >> - return TRUE; >> + return true; >> } >> >> -static int __init aedsp16_dsp_version(int port) >> +static bool __init aedsp16_dsp_version(int port) >> { >> - int len = 0; >> - int ret; >> + int len = 0; >> + int ret; >> >> DBG(("Get DSP Version:\n")); >> >> if (aedsp16_write(ae_config.base_io, GET_DSP_VERSION)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", GET_DSP_VERSION); >> DBG(("failed.\n")); >> - return FALSE; >> + return false; >> } >> >> do { >> if ((ret = aedsp16_read(port)) == -1) { >> DBG(("failed.\n")); >> - return FALSE; >> + return false; >> } >> - /* >> - * We already know how many int are stored (2), so we know when the >> - * string is finished. >> - */ >> + /* >> + * We already know how many int are stored (2), so we know when >> + * the string is finished. >> + */ >> ver[len++] = ret; >> } while (len < CARDVERDIGITS); >> sprintf(DSPVersion, "%d.%d", ver[0], ver[1]); >> >> DBG(("success.\n")); >> >> - return TRUE; >> + return true; >> } >> >> static int __init aedsp16_dsp_copyright(int port) >> @@ -976,20 +967,21 @@ static int __init aedsp16_dsp_copyright(int port) >> if (aedsp16_write(ae_config.base_io, GET_DSP_COPYRIGHT)) { >> printk("[AEDSP16] CMD 0x%x: failed!\n", GET_DSP_COPYRIGHT); >> DBG(("failed.\n")); >> - return FALSE; >> + return false; >> } >> >> do { >> if ((ret = aedsp16_read(port)) == -1) { >> - /* >> - * If no more data available, return to the caller, no error if len>0. >> - * We have no other way to know when the string is finished. >> - */ >> + /* >> + * If no more data available, return to the caller, no >> + * error if len > 0. We have no other way to know when >> + * the string is finished. >> + */ >> if (len) >> break; >> else { >> DBG(("failed.\n")); >> - return FALSE; >> + return false; >> } >> } >> >> @@ -999,7 +991,7 @@ static int __init aedsp16_dsp_copyright(int port) >> >> DBG(("success.\n")); >> >> - return TRUE; >> + return true; >> } >> >> static void __init aedsp16_init_tables(void) >> @@ -1026,17 +1018,17 @@ static void __init aedsp16_init_tables(void) >> } >> } >> >> -static int __init aedsp16_init_board(void) >> +static bool __init aedsp16_init_board(void) >> { >> aedsp16_init_tables(); >> >> - if (aedsp16_dsp_reset(ae_config.base_io) == FALSE) { >> + if (aedsp16_dsp_reset(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_dsp_reset: failed!\n"); >> - return FALSE; >> + return false; >> } >> - if (aedsp16_dsp_copyright(ae_config.base_io) == FALSE) { >> + if (aedsp16_dsp_copyright(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_dsp_copyright: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> /* >> @@ -1046,48 +1038,48 @@ static int __init aedsp16_init_board(void) >> if (strcmp("SC-6000", DSPCopyright)) >> printk("[AEDSP16] Warning: non SC-6000 audio card!\n"); >> >> - if (aedsp16_dsp_version(ae_config.base_io) == FALSE) { >> + if (aedsp16_dsp_version(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_dsp_version: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> - if (aedsp16_stdcfg(ae_config.base_io) == FALSE) { >> + if (aedsp16_stdcfg(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_stdcfg: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> #if defined(CONFIG_SC6600) >> - if (aedsp16_hard_read(ae_config.base_io) == FALSE) { >> + if (aedsp16_hard_read(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_hard_read: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> aedsp16_hard_decode(); >> >> aedsp16_hard_encode(); >> >> - if (aedsp16_hard_write(ae_config.base_io) == FALSE) { >> + if (aedsp16_hard_write(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_hard_write: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> - if (aedsp16_ext_cfg_write(ae_config.base_io) == FALSE) { >> + if (aedsp16_ext_cfg_write(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_ext_cfg_write: failed!\n"); >> - return FALSE; >> + return false; >> } >> #endif /* CONFIG_SC6600 */ >> >> - if (aedsp16_setup_board(ae_config.base_io) == FALSE) { >> + if (aedsp16_setup_board(ae_config.base_io) == false) { >> printk("[AEDSP16] aedsp16_setup_board: failed!\n"); >> - return FALSE; >> + return false; >> } >> >> if (ae_config.mss_base != -1) { >> if (ae_config.init & INIT_MSS) { >> - if (aedsp16_init_mss(ae_config.base_io) == FALSE) { >> + if (aedsp16_init_mss(ae_config.base_io) == false) { >> printk("[AEDSP16] Can not initialize" >> "Microsoft Sound System mode.\n"); >> - return FALSE; >> + return false; >> } >> } >> } >> @@ -1124,27 +1116,27 @@ static int __init aedsp16_init_board(void) >> >> mdelay(10); >> >> - return TRUE; >> + return true; >> } >> >> -static int __init init_aedsp16_sb(void) >> +static bool __init init_aedsp16_sb(void) >> { >> DBG(("init_aedsp16_sb: ")); >> >> -/* >> - * If the card is already init'ed MSS, we can not init it to SBPRO too >> - * because the board can not emulate simultaneously MSS and SBPRO. >> - */ >> + /* >> + * If the card is already init'ed MSS, we can not init it to SBPRO too >> + * because the board can not emulate simultaneously MSS and SBPRO. >> + */ >> if (ae_config.init & INIT_MSS) >> - return FALSE; >> + return false; >> if (ae_config.init & INIT_SBPRO) >> - return FALSE; >> + return false; >> >> ae_config.init |= INIT_SBPRO; >> >> DBG(("done.\n")); >> >> - return TRUE; >> + return true; >> } >> >> static void uninit_aedsp16_sb(void) >> @@ -1160,24 +1152,24 @@ static int __init init_aedsp16_mss(void) >> { >> DBG(("init_aedsp16_mss: ")); >> >> -/* >> - * If the card is already init'ed SBPRO, we can not init it to MSS too >> - * because the board can not emulate simultaneously MSS and SBPRO. >> - */ >> + /* >> + * If the card is already init'ed SBPRO, we can not init it to MSS too >> + * because the board can not emulate simultaneously MSS and SBPRO. >> + */ >> if (ae_config.init & INIT_SBPRO) >> - return FALSE; >> + return false; >> if (ae_config.init & INIT_MSS) >> - return FALSE; >> -/* >> - * We must allocate the CONFIG_AEDSP16_BASE region too because these are >> the >> - * I/O ports to access card's control registers. >> - */ >> + return false; >> + /* >> + * We must allocate the CONFIG_AEDSP16_BASE region too because these are >> + * the I/O ports to access card's control registers. >> + */ >> if (!(ae_config.init & INIT_MPU401)) { >> if (!request_region(ae_config.base_io, IOBASE_REGION_SIZE, >> "aedsp16 (base)")) { >> printk( >> "AEDSP16 BASE I/O port region is already in use.\n"); >> - return FALSE; >> + return false; >> } >> } >> >> @@ -1185,7 +1177,7 @@ static int __init init_aedsp16_mss(void) >> >> DBG(("done.\n")); >> >> - return TRUE; >> + return true; >> } >> >> static void uninit_aedsp16_mss(void) >> @@ -1202,23 +1194,23 @@ static void uninit_aedsp16_mss(void) >> DBG(("done.\n")); >> } >> >> -static int __init init_aedsp16_mpu(void) >> +static bool __init init_aedsp16_mpu(void) >> { >> DBG(("init_aedsp16_mpu: ")); >> >> if (ae_config.init & INIT_MPU401) >> - return FALSE; >> + return false; >> >> -/* >> - * We must request the CONFIG_AEDSP16_BASE region too because these are the >> I/O >> - * ports to access card's control registers. >> - */ >> + /* >> + * We must request the CONFIG_AEDSP16_BASE region too because these are >> + * the I/O ports to access card's control registers. >> + */ >> if (!(ae_config.init & (INIT_MSS | INIT_SBPRO))) { >> if (!request_region(ae_config.base_io, IOBASE_REGION_SIZE, >> "aedsp16 (base)")) { >> printk( >> "AEDSP16 BASE I/O port region is already in use.\n"); >> - return FALSE; >> + return false; >> } >> } >> >> @@ -1226,7 +1218,7 @@ static int __init init_aedsp16_mpu(void) >> >> DBG(("done.\n")); >> >> - return TRUE; >> + return true; >> } >> >> static void uninit_aedsp16_mpu(void) >> @@ -1244,40 +1236,40 @@ static void uninit_aedsp16_mpu(void) >> DBG(("done.\n")); >> } >> >> -static int __init init_aedsp16(void) >> +static bool __init init_aedsp16(void) >> { >> - int initialized = FALSE; >> + int initialized = false; >> >> DBG(("Initializing BASE[0x%x] IRQ[%d] DMA[%d] MIRQ[%d]\n", >> ae_config.base_io,ae_config.irq,ae_config.dma,ae_config.mpu_irq)); >> >> if (ae_config.mss_base == -1) { >> - if (init_aedsp16_sb() == FALSE) { >> + if (init_aedsp16_sb() == false) { >> uninit_aedsp16_sb(); >> } else { >> - initialized = TRUE; >> + initialized = true; >> } >> } >> >> if (ae_config.mpu_base != -1) { >> - if (init_aedsp16_mpu() == FALSE) { >> + if (init_aedsp16_mpu() == false) { >> uninit_aedsp16_mpu(); >> } else { >> - initialized = TRUE; >> + initialized = true; >> } >> } >> >> -/* >> - * In the sequence of init routines, the MSS init MUST be the last! >> - * This because of the special register programming the MSS mode needs. >> - * A board reset would disable the MSS mode restoring the default SBPRO >> - * mode. >> - */ >> + /* >> + * In the sequence of init routines, the MSS init MUST be the last! >> + * This because of the special register programming the MSS mode needs. >> + * A board reset would disable the MSS mode restoring the default SBPRO >> + * mode. >> + */ >> if (ae_config.mss_base != -1) { >> - if (init_aedsp16_mss() == FALSE) { >> + if (init_aedsp16_mss() == false) { >> uninit_aedsp16_mss(); >> } else { >> - initialized = TRUE; >> + initialized = true; >> } >> } >> >> @@ -1334,7 +1326,7 @@ static int __init do_init_aedsp16(void) { >> ae_config.mpu_base = mpu_base; >> ae_config.mpu_irq = mpu_irq; >> >> - if (init_aedsp16() == FALSE) { >> + if (init_aedsp16() == false) { >> printk(KERN_ERR "aedsp16: initialization failed\n"); >> /* >> * XXX >> -- >> 1.7.5.rc2.4.g4d8b3 >> >> -- > I think you just did the wrong thing . Care to explain what thing I did wrong?

2 1

[alsa-devel] alsa-lib: snd_mixer_selem_is_active changes - which event?
by Sebastian H. 17 Apr '11

17 Apr '11

Hello I wonder which event mask notifies an application that snd_mixer_selem_is_active() may have changed. SND_CTL_EVENT_MASK_VALUE or SND_CTL_EVENT_MASK_INFO or something else? I'd be glad for any insights? Sebastian H.

3 9

[alsa-devel] aplay patch to add a --seek parameter
by Lars Magne Ingebrigtsen 16 Apr '11

16 Apr '11

I'm using aplay in a sound editor to play PCM files. But I need to be able to say "start playing at point X" to be able to skip around in the file. I've used the following patch for years, but I think I forgot to submit it for inclusion into alsa-utils. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog http://lars.ingebrigtsen.no/

3 3

[alsa-devel] [PATCH] ASoC: fsi: add dev_pm_ops :: suspend/resume
by Kuninori Morimoto 15 Apr '11

15 Apr '11

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/fsi.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 0c9997e..378945a 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -151,6 +151,13 @@ struct fsi_priv { struct fsi_stream capture; long rate; + + /* for suspend/resume */ + u32 saved_do_fmt; + u32 saved_di_fmt; + u32 saved_ckg1; + u32 saved_ckg2; + u32 saved_out_sel; }; struct fsi_core { @@ -171,6 +178,13 @@ struct fsi_master { struct fsi_core *core; struct sh_fsi_platform_info *info; spinlock_t lock; + + /* for suspend/resume */ + u32 saved_a_mclk; + u32 saved_b_mclk; + u32 saved_iemsk; + u32 saved_imsk; + u32 saved_clk_rst; }; /* @@ -1251,6 +1265,76 @@ static int fsi_remove(struct platform_device *pdev) return 0; } +static void __fsi_suspend(struct fsi_priv *fsi, + struct device *dev, + set_rate_func set_rate) +{ + fsi->saved_do_fmt = fsi_reg_read(fsi, DO_FMT); + fsi->saved_di_fmt = fsi_reg_read(fsi, DI_FMT); + fsi->saved_ckg1 = fsi_reg_read(fsi, CKG1); + fsi->saved_ckg2 = fsi_reg_read(fsi, CKG2); + fsi->saved_out_sel = fsi_reg_read(fsi, OUT_SEL); + + if (fsi->rate) + set_rate(dev, fsi_is_port_a(fsi), fsi->rate, 0); +} + +static void __fsi_resume(struct fsi_priv *fsi, + struct device *dev, + set_rate_func set_rate) +{ + fsi_reg_write(fsi, DO_FMT, fsi->saved_do_fmt); + fsi_reg_write(fsi, DI_FMT, fsi->saved_di_fmt); + fsi_reg_write(fsi, CKG1, fsi->saved_ckg1); + fsi_reg_write(fsi, CKG2, fsi->saved_ckg2); + fsi_reg_write(fsi, OUT_SEL, fsi->saved_out_sel); + + if (fsi->rate) + set_rate(dev, fsi_is_port_a(fsi), fsi->rate, 1); +} + +static int fsi_suspend(struct device *dev) +{ + struct fsi_master *master = dev_get_drvdata(dev); + set_rate_func set_rate = fsi_get_info_set_rate(master); + + pm_runtime_get_sync(dev); + + __fsi_suspend(&master->fsia, dev, set_rate); + __fsi_suspend(&master->fsib, dev, set_rate); + + master->saved_a_mclk = fsi_core_read(master, a_mclk); + master->saved_b_mclk = fsi_core_read(master, b_mclk); + master->saved_iemsk = fsi_core_read(master, iemsk); + master->saved_imsk = fsi_core_read(master, imsk); + master->saved_clk_rst = fsi_master_read(master, CLK_RST); + + pm_runtime_put_sync(dev); + + return 0; +} + +static int fsi_resume(struct device *dev) +{ + struct fsi_master *master = dev_get_drvdata(dev); + set_rate_func set_rate = fsi_get_info_set_rate(master); + + pm_runtime_get_sync(dev); + + __fsi_resume(&master->fsia, dev, set_rate); + __fsi_resume(&master->fsib, dev, set_rate); + + fsi_core_mask_set(master, a_mclk, 0xffff, master->saved_a_mclk); + fsi_core_mask_set(master, b_mclk, 0xffff, master->saved_b_mclk); + fsi_core_mask_set(master, iemsk, 0xffff, master->saved_iemsk); + fsi_core_mask_set(master, imsk, 0xffff, master->saved_imsk); + fsi_master_mask_set(master, CLK_RST, 0xffff, master->saved_clk_rst); + + pm_runtime_put_sync(dev); + + return 0; +} + static int fsi_runtime_nop(struct device *dev) { /* Runtime PM callback shared between ->runtime_suspend() @@ -1264,6 +1348,8 @@ static int fsi_runtime_nop(struct device *dev) } static struct dev_pm_ops fsi_pm_ops = { + .suspend = fsi_suspend, + .resume = fsi_resume, .runtime_suspend = fsi_runtime_nop, .runtime_resume = fsi_runtime_nop, }; -- 1.7.1

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: Add quirks for Audio Kontrol 6
by Daniel Mack 14 Apr '11

14 Apr '11

This new device by Native Instruments is also compliant to the USB standard v2.0, but hides this detail at when connected. It needs the same boot quirks than other models, and also has two non-class-compliant mixer controls. Signed-off-by: Daniel Mack <zonque(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Mark Hills <mark(a)pogo.org.uk> Cc: Clemens Ladisch <clemens(a)ladisch.de> --- sound/usb/mixer_quirks.c | 17 +++++++++++++++++ sound/usb/quirks-table.h | 6 ++++++ sound/usb/quirks.c | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 73dcc82..4a7ad7e 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -398,6 +398,17 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol, return 0; } +static struct snd_kcontrol_new snd_nativeinstruments_ak6_mixers[] = { + { + .name = "Direct Monitor Channel 1+2", + .private_value = _MAKE_NI_CONTROL(0x03, 0x03), + }, + { + .name = "Direct Monitor Channel 3+4", + .private_value = _MAKE_NI_CONTROL(0x03, 0x05), + }, +}; + static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = { { .name = "Direct Thru Channel A", @@ -526,6 +537,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_xonar_u1_controls_create(mixer); break; + case USB_ID(0x17cc, 0x1001): /* Audio Kontrol 6 */ + err = snd_nativeinstruments_create_mixer(mixer, + snd_nativeinstruments_ak6_mixers, + ARRAY_SIZE(snd_nativeinstruments_ak6_mixers)); + break; + case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */ err = snd_nativeinstruments_create_mixer(mixer, snd_nativeinstruments_ta6_mixers, diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index c66d3f6..54e18c1 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2332,6 +2332,12 @@ YAMAHA_DEVICE(0x7010, "UB99"), /* Native Instruments MK2 series */ { + /* Audio Kontrol 6 */ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x17cc, + .idProduct = 0x1000, +}, +{ /* Traktor Audio 6 */ .match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = 0x17cc, diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 355759b..2452edd 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -539,6 +539,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, /* Access Music VirusTI Desktop */ return snd_usb_accessmusic_boot_quirk(dev); + case USB_ID(0x17cc, 0x1000): /* Audio Kontrol 6 */ case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */ case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */ return snd_usb_nativeinstruments_boot_quirk(dev); -- 1.7.1

2 1

[alsa-devel] [PATCH] - ALSA Documentation SB-Live-mixer.txt - Rename Music controls to Synth controls
by Raymond Yau 14 Apr '11

14 Apr '11

Rename "Music" controls to "Synth" controls in Documentation/alsa/SB-Live-mixer.txt as alsa driver had already changed the name of the controls

2 1

[alsa-devel] [PATCH 0/3] hdspmixer: Fix preset loading code
by Adrian Knoth 14 Apr '11

14 Apr '11

Hi! This small series of patches now detects three different file formats for hdspmixer's preset file: - pre 1.0.24 - 1.0.24 and 1.0.24.1 - new format with magic header This should catch almost all mix files available in the wild unless those files were written with an unreleased development version of hdspmixer in the last few weeks. Cheers Adrian Knoth (3): hdspmixer: Fix read/write from/to preset files on MADI-like cards hdspmixer: Handle channel count in old (v1.0.23) preset file format hdspmixer: Handle preset files used in 1.0.24 and 1.0.24.1 hdspmixer/src/HDSPMixerWindow.cxx | 60 ++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 10 deletions(-) -- 1.7.4.1

2 4

[alsa-devel] [PATCH 1/7] ASoC: neo1973_wm8753: Remove scenario management code.
by Lars-Peter Clausen 14 Apr '11

14 Apr '11

It has been proven to be inflexible to do scenario management in kernel space. Since actual neo1973 board support has not been merged in mainline and this patch has been in the neo1973 tree for some time now it should be safe to remove this functionality without breaking existing userspace. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/samsung/neo1973_wm8753.c | 148 +++--------------------------------- 1 files changed, 11 insertions(+), 137 deletions(-) diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index d3cd688..fe92946 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c @@ -37,17 +37,6 @@ #include "dma.h" #include "s3c24xx-i2s.h" -/* define the scenarios */ -#define NEO_AUDIO_OFF 0 -#define NEO_GSM_CALL_AUDIO_HANDSET 1 -#define NEO_GSM_CALL_AUDIO_HEADSET 2 -#define NEO_GSM_CALL_AUDIO_BLUETOOTH 3 -#define NEO_STEREO_TO_SPEAKERS 4 -#define NEO_STEREO_TO_HEADPHONES 5 -#define NEO_CAPTURE_HANDSET 6 -#define NEO_CAPTURE_HEADSET 7 -#define NEO_CAPTURE_BLUETOOTH 8 - static struct snd_soc_card neo1973; static struct i2c_client *i2c; @@ -224,113 +213,6 @@ static struct snd_soc_ops neo1973_voice_ops = { .hw_free = neo1973_voice_hw_free, }; -static int neo1973_scenario; - -static int neo1973_get_scenario(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - ucontrol->value.integer.value[0] = neo1973_scenario; - return 0; -} - -static int set_scenario_endpoints(struct snd_soc_codec *codec, int scenario) -{ - struct snd_soc_dapm_context *dapm = &codec->dapm; - - pr_debug("Entered %s\n", __func__); - - switch (neo1973_scenario) { - case NEO_AUDIO_OFF: - snd_soc_dapm_disable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - case NEO_GSM_CALL_AUDIO_HANDSET: - snd_soc_dapm_enable_pin(dapm, "Audio Out"); - snd_soc_dapm_enable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_enable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_enable_pin(dapm, "Call Mic"); - break; - case NEO_GSM_CALL_AUDIO_HEADSET: - snd_soc_dapm_enable_pin(dapm, "Audio Out"); - snd_soc_dapm_enable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_enable_pin(dapm, "GSM Line In"); - snd_soc_dapm_enable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - case NEO_GSM_CALL_AUDIO_BLUETOOTH: - snd_soc_dapm_disable_pin(dapm, "Audio Out"); - snd_soc_dapm_enable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_enable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - case NEO_STEREO_TO_SPEAKERS: - snd_soc_dapm_enable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - case NEO_STEREO_TO_HEADPHONES: - snd_soc_dapm_enable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - case NEO_CAPTURE_HANDSET: - snd_soc_dapm_disable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_enable_pin(dapm, "Call Mic"); - break; - case NEO_CAPTURE_HEADSET: - snd_soc_dapm_disable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_enable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - case NEO_CAPTURE_BLUETOOTH: - snd_soc_dapm_disable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - break; - default: - snd_soc_dapm_disable_pin(dapm, "Audio Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); - snd_soc_dapm_disable_pin(dapm, "GSM Line In"); - snd_soc_dapm_disable_pin(dapm, "Headset Mic"); - snd_soc_dapm_disable_pin(dapm, "Call Mic"); - } - - snd_soc_dapm_sync(dapm); - - return 0; -} - -static int neo1973_set_scenario(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - - pr_debug("Entered %s\n", __func__); - - if (neo1973_scenario == ucontrol->value.integer.value[0]) - return 0; - - neo1973_scenario = ucontrol->value.integer.value[0]; - set_scenario_endpoints(codec, neo1973_scenario); - return 1; -} - static u8 lm4857_regs[4] = {0x00, 0x40, 0x80, 0xC0}; static void lm4857_write_regs(void) @@ -454,26 +336,16 @@ static const struct soc_enum lm4857_mode_enum[] = { SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(lm4857_mode), lm4857_mode), }; -static const char *neo_scenarios[] = { - "Off", - "GSM Handset", - "GSM Headset", - "GSM Bluetooth", - "Speakers", - "Headphones", - "Capture Handset", - "Capture Headset", - "Capture Bluetooth" -}; - -static const struct soc_enum neo_scenario_enum[] = { - SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(neo_scenarios), neo_scenarios), -}; - static const DECLARE_TLV_DB_SCALE(stereo_tlv, -4050, 150, 0); static const DECLARE_TLV_DB_SCALE(mono_tlv, -3450, 150, 0); static const struct snd_kcontrol_new wm8753_neo1973_controls[] = { + SOC_DAPM_PIN_SWITCH("Audio Out"), + SOC_DAPM_PIN_SWITCH("GSM Line Out"), + SOC_DAPM_PIN_SWITCH("GSM Line In"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("Call Mic"), + SOC_SINGLE_EXT_TLV("Amp Left Playback Volume", LM4857_LVOL, 0, 31, 0, lm4857_get_reg, lm4857_set_reg, stereo_tlv), SOC_SINGLE_EXT_TLV("Amp Right Playback Volume", LM4857_RVOL, 0, 31, 0, @@ -482,8 +354,6 @@ static const struct snd_kcontrol_new wm8753_neo1973_controls[] = { lm4857_get_reg, lm4857_set_reg, mono_tlv), SOC_ENUM_EXT("Amp Mode", lm4857_mode_enum[0], lm4857_get_mode, lm4857_set_mode), - SOC_ENUM_EXT("Neo Mode", neo_scenario_enum[0], - neo1973_get_scenario, neo1973_set_scenario), SOC_SINGLE_EXT("Amp Spk 3D Playback Switch", LM4857_LVOL, 5, 1, 0, lm4857_get_reg, lm4857_set_reg), SOC_SINGLE_EXT("Amp HP 3d Playback Switch", LM4857_RVOL, 5, 1, 0, @@ -520,7 +390,11 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd) ARRAY_SIZE(wm8753_dapm_widgets)); /* set endpoints to default mode */ - set_scenario_endpoints(codec, NEO_AUDIO_OFF); + snd_soc_dapm_disable_pin(dapm, "Audio Out"); + snd_soc_dapm_disable_pin(dapm, "GSM Line Out"); + snd_soc_dapm_disable_pin(dapm, "GSM Line In"); + snd_soc_dapm_disable_pin(dapm, "Headset Mic"); + snd_soc_dapm_disable_pin(dapm, "Call Mic"); /* add neo1973 specific controls */ err = snd_soc_add_controls(codec, wm8753_neo1973_controls, -- 1.7.2.3

4 12

[alsa-devel] [PATCH] ARM: s3c2440: gta02; Register dfbmcs320 device
by Lars-Peter Clausen 14 Apr '11

14 Apr '11

Register the dfbmcs320 device which provides the PCM DAI for the bluetooth module. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Ben Dooks <ben-linux(a)fluff.org> Cc: Kukjin Kim <kgene.kim(a)samsung.com> --- arch/arm/mach-s3c2440/mach-gta02.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 0db2411..7166620 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -409,6 +409,10 @@ struct platform_device s3c24xx_pwm_device = { .num_resources = 0, }; +static struct platform_device gta02_dfbmcs320_device = { + .name = "dfbmcs320", +}; + static struct i2c_board_info gta02_i2c_devs[] __initdata = { { I2C_BOARD_INFO("pcf50633", 0x73), @@ -523,6 +527,7 @@ static struct platform_device *gta02_devices[] __initdata = { &s3c_device_iis, &samsung_asoc_dma, &s3c_device_i2c0, + &gta02_dfbmcs320_device, &gta02_buttons_device, &s3c_device_adc, &s3c_device_ts, -- 1.7.2.5

4 3