diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-23 08:54:03 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-23 08:54:03 -0600 |
| commit | 15ef6af520b78a3f4e01287c4ee47a5eb3ce36a7 (patch) | |
| tree | e677c7ef4d540a653df0a9252087ee4ef26dd136 | |
| parent | 5047f3270ca1fee1dda4fe422a20ac2f938f5f5a (diff) | |
| download | px4-nuttx-15ef6af520b78a3f4e01287c4ee47a5eb3ce36a7.tar.gz px4-nuttx-15ef6af520b78a3f4e01287c4ee47a5eb3ce36a7.tar.bz2 px4-nuttx-15ef6af520b78a3f4e01287c4ee47a5eb3ce36a7.zip | |
zkit-arm-1769 ADC and SPI/USB MSC updates from MKannan
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_ssp.c | 16 | ||||
| -rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_usbmsc.c | 8 |
3 files changed, 22 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a4722d2e1..d18ab3f68 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4592,3 +4592,5 @@ * arch/arm/src/lpc17xx/lpc17_adc.c: Only one ADC pin was configured. Need to configure all that are in the ADC0 set. From MKannan (2014-4-23). + * configs/zkit-arm-1769/src: ADC and SPI/USB MSC updates from + MKannan (2014-4-23). diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c index 6f637643f..8aa0828a3 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c +++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c @@ -160,6 +160,22 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) sspdbg("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } + +/****************************************************************************** + * Name: lpc17_ssp1cmddata + * + * Description: Dummy Function + * + ******************************************************************************/ + +#ifdef CONFIG_SPI_CMDDATA +int weak_function lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, + enum spi_dev_e devid, bool cmd) +{ + return OK; +} + +#endif /* CONFIG_SPI_CMDDATA */ #endif /* CONFIG_LPC17_SSP1 */ #ifdef CONFIG_LPC17_SSP0 diff --git a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c index a6c473efc..8873c39f4 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c +++ b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c @@ -79,7 +79,7 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG -# define message(...) lib_lowprintf(__VA_ARGS__) +# define message(...) lowsyslog(__VA_ARGS__) # define msgflush() # else # define message(...) printf(__VA_ARGS__) @@ -87,7 +87,7 @@ # endif #else # ifdef CONFIG_DEBUG -# define message lib_lowprintf +# define message lowsyslog # define msgflush() # else # define message printf @@ -116,8 +116,8 @@ int usbmsc_archinitialize(void) message("usbmsc_archinitialize: Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO); - - spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO); + zkit_spiinitialize(); + spi = lpc17_spiinitialize(LPC17XX_MMCSDSPIPORTNO); if (!spi) { message("usbmsc_archinitialize: Failed to initialize SPI port %d\n", |