sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zkit-arm-1769 ADC and SPI/USB MSC updates from MKannan

Browse Source
This commit is contained in:
Gregory Nutt 2013-04-23 08:54:03 -06:00
parent 25270695ee
commit e53e9501eb
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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).

16
configs/zkit-arm-1769/src/up_ssp.c
View File

@ -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

8
configs/zkit-arm-1769/src/up_usbmsc.c
View File

@ -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",