| Message ID | 1350975449-27816-4-git-send-email-rajeshwari.s@samsung.com |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Oct 22, 2012 at 11:57 PM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > This patch adds command to test audio playback. > sound init - Initialises the audio subsystem (i2s and wm8994 codec) > sound play - Plays predefined the audio data when specified length > and frequency. > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> > --- > Changes in V2: > - None > Changes in V3: > - Incorporated comments from Simon Glass. > common/Makefile | 1 + > common/cmd_sound.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 97 insertions(+), 0 deletions(-) > create mode 100644 common/cmd_sound.c > > diff --git a/common/Makefile b/common/Makefile > index 5442fbb..c0aa4a3 100644 > --- a/common/Makefile > +++ b/common/Makefile > @@ -74,6 +74,7 @@ COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o > COBJS-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o > COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o > COBJS-$(CONFIG_CMD_DATE) += cmd_date.o > +COBJS-$(CONFIG_CMD_SOUND) += cmd_sound.o > ifdef CONFIG_4xx > COBJS-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o > endif > diff --git a/common/cmd_sound.c b/common/cmd_sound.c > new file mode 100644 > index 0000000..459d1eb > --- /dev/null > +++ b/common/cmd_sound.c > @@ -0,0 +1,96 @@ > +/* > + * Copyright (C) 2012 Samsung Electronics > + * Rajeshwari Shinde <rajeshwari.s@samsung.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * 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. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +#include <common.h> > +#include <command.h> > +#include <fdtdec.h> > +#include <sound.h> > + > +DECLARE_GLOBAL_DATA_PTR; > + > +/* Initilaise sound subsystem */ > +static int do_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) > +{ > + int ret; > + > + ret = sound_init(); > + if (ret) { > + printf("Initialise Audio driver failed\n"); > + return CMD_RET_FAILURE; > + } > + > + return 0; > +} > + > +/* play sound from buffer */ > +static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) > +{ > + int ret = 0; > + int msec = 1000; > + int freq = 400; > + > + if (argc > 1) > + msec = simple_strtoul(argv[1], NULL, 10); > + if (argc > 2) > + freq = simple_strtoul(argv[2], NULL, 10); > + > + ret = sound_play(msec, freq); > + if (ret) { > + printf("play failed"); > + return CMD_RET_FAILURE; > + } > + > + return 0; > +} > + > +static cmd_tbl_t cmd_sound_sub[] = { > + U_BOOT_CMD_MKENT(init, 0, 1, do_init, "", ""), > + U_BOOT_CMD_MKENT(play, 2, 1, do_play, "", ""), > +}; > + > +/* process sound command */ > +static int do_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) > +{ > + cmd_tbl_t *c; > + > + if (argc < 1) > + return CMD_RET_USAGE; > + > + /* Strip off leading 'sound' command argument */ > + argc--; > + argv++; > + > + c = find_cmd_tbl(argv[0], &cmd_sound_sub[0], ARRAY_SIZE(cmd_sound_sub)); > + > + if (c) > + return c->cmd(cmdtp, flag, argc, argv); > + else > + return CMD_RET_USAGE; > +} > + > +U_BOOT_CMD( > + sound, 4, 1, do_sound, > + "sound sub-system", > + "init - initialise the sound driver\n" > + "sound play [len] [freq] - play a sound for len ms at freq hz\n" > +); > -- > 1.7.4.4 >
diff --git a/common/Makefile b/common/Makefile index 5442fbb..c0aa4a3 100644 --- a/common/Makefile +++ b/common/Makefile @@ -74,6 +74,7 @@ COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o COBJS-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o COBJS-$(CONFIG_CMD_DATE) += cmd_date.o +COBJS-$(CONFIG_CMD_SOUND) += cmd_sound.o ifdef CONFIG_4xx COBJS-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o endif diff --git a/common/cmd_sound.c b/common/cmd_sound.c new file mode 100644 index 0000000..459d1eb --- /dev/null +++ b/common/cmd_sound.c @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * Rajeshwari Shinde <rajeshwari.s@samsung.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <command.h> +#include <fdtdec.h> +#include <sound.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* Initilaise sound subsystem */ +static int do_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + int ret; + + ret = sound_init(); + if (ret) { + printf("Initialise Audio driver failed\n"); + return CMD_RET_FAILURE; + } + + return 0; +} + +/* play sound from buffer */ +static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + int ret = 0; + int msec = 1000; + int freq = 400; + + if (argc > 1) + msec = simple_strtoul(argv[1], NULL, 10); + if (argc > 2) + freq = simple_strtoul(argv[2], NULL, 10); + + ret = sound_play(msec, freq); + if (ret) { + printf("play failed"); + return CMD_RET_FAILURE; + } + + return 0; +} + +static cmd_tbl_t cmd_sound_sub[] = { + U_BOOT_CMD_MKENT(init, 0, 1, do_init, "", ""), + U_BOOT_CMD_MKENT(play, 2, 1, do_play, "", ""), +}; + +/* process sound command */ +static int do_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + cmd_tbl_t *c; + + if (argc < 1) + return CMD_RET_USAGE; + + /* Strip off leading 'sound' command argument */ + argc--; + argv++; + + c = find_cmd_tbl(argv[0], &cmd_sound_sub[0], ARRAY_SIZE(cmd_sound_sub)); + + if (c) + return c->cmd(cmdtp, flag, argc, argv); + else + return CMD_RET_USAGE; +} + +U_BOOT_CMD( + sound, 4, 1, do_sound, + "sound sub-system", + "init - initialise the sound driver\n" + "sound play [len] [freq] - play a sound for len ms at freq hz\n" +);
This patch adds command to test audio playback. sound init - Initialises the audio subsystem (i2s and wm8994 codec) sound play - Plays predefined the audio data when specified length and frequency. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- Changes in V2: - None Changes in V3: - Incorporated comments from Simon Glass. common/Makefile | 1 + common/cmd_sound.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) create mode 100644 common/cmd_sound.c