diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-21 13:13:05 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-21 13:13:05 -0600 |
| commit | 801977de7c84d03616329795e1c59929ab948906 (patch) | |
| tree | b9d9220000c01cf9aca8e010f43fc488ccc26f26 /nuttx/configs/mikroe-stm32f4/src/up_nsh.c | |
| parent | 3895e0ec4c2c3057935bbeb7558fa4b815385334 (diff) | |
| download | px4-nuttx-801977de7c84d03616329795e1c59929ab948906.tar.gz px4-nuttx-801977de7c84d03616329795e1c59929ab948906.tar.bz2 px4-nuttx-801977de7c84d03616329795e1c59929ab948906.zip | |
Audio subystem update from Ken Pettit. Plus moved some header files
Diffstat (limited to 'nuttx/configs/mikroe-stm32f4/src/up_nsh.c')
| -rw-r--r-- | nuttx/configs/mikroe-stm32f4/src/up_nsh.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_nsh.c b/nuttx/configs/mikroe-stm32f4/src/up_nsh.c index 648f69c64..366e4e8f6 100644 --- a/nuttx/configs/mikroe-stm32f4/src/up_nsh.c +++ b/nuttx/configs/mikroe-stm32f4/src/up_nsh.c @@ -64,7 +64,7 @@ #endif #ifdef CONFIG_AUDIO -# include "nuttx/audio.h" +# include "nuttx/audio/audio.h" #endif #include "stm32.h" @@ -182,9 +182,6 @@ int nsh_archinitialize(void) FAR struct spi_dev_s *spi; FAR struct mtd_dev_s *mtd; #endif -#ifdef CONFIG_AUDIO - FAR struct audio_lowerhalf_s *pVs1053; -#endif int ret; /* Configure SPI-based devices */ @@ -351,21 +348,13 @@ int nsh_archinitialize(void) #endif - /* Configure the Audio sub-system if enabled */ + /* Configure the Audio sub-system if enabled and bind it to SPI 3 */ #ifdef CONFIG_AUDIO - pVs1053 = vs1053_initialize(0); - if (pVs1053 == NULL) - { - message("nsh_archinitialize: Failed to initialize VS1053 Audio module\n"); - } - else - { - /* Bind the vs1053 to the audio upper-half driver */ - audio_register("mp30", pVs1053); - } + up_vs1053initialize(spi); + +#endif -#endif /* CONFIG_AUDIO */ return OK; } |