diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-04-01 22:00:37 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-04-01 22:00:37 +0000 |
commit | 87590afa9ca772243c261e6c1b8478565bd2771a (patch) | |
tree | d7a3161c5dea29510630f239e027dc32bac968fc /nuttx/configs/zkit-arm-1769 | |
parent | f7122813d51018e5d3460a30596d2320a08ef740 (diff) | |
download | px4-nuttx-87590afa9ca772243c261e6c1b8478565bd2771a.tar.gz px4-nuttx-87590afa9ca772243c261e6c1b8478565bd2771a.tar.bz2 px4-nuttx-87590afa9ca772243c261e6c1b8478565bd2771a.zip |
More naming changes associated with earlier renaming of LP17xx up_spiinitialize; LPC178x SSP support; Open1788 SSP and touchscreen support
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5811 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/zkit-arm-1769')
-rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_boot.c | 6 | ||||
-rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_lcd.c | 2 | ||||
-rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_ssp.c | 8 | ||||
-rw-r--r-- | nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/nuttx/configs/zkit-arm-1769/src/up_boot.c b/nuttx/configs/zkit-arm-1769/src/up_boot.c index de7863eb1..96f8af645 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_boot.c +++ b/nuttx/configs/zkit-arm-1769/src/up_boot.c @@ -79,13 +79,13 @@ void lpc17_boardinitialize(void) { /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function lpc17_sspinitialize() has been brought into the link. + * function zkit_sspinitialize() has been brought into the link. */ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) - if (lpc17_sspinitialize) + if (zkit_sspinitialize) { - lpc17_sspinitialize(); + zkit_sspinitialize(); } #endif diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c index c76566674..aa5859791 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c +++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c @@ -117,7 +117,7 @@ int up_lcdinitialize(void) spi = lpc17_sspinitialize(0); if (!spi) { - glldbg("Failed to initialize SSI port 0\n"); + glldbg("Failed to initialize SSP port 0\n"); return 0; } diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c index dda71690a..9ae175280 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c +++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c @@ -95,18 +95,18 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpc17_sspinitialize + * Name: zkit_sspinitialize * * Description: * Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit. * ************************************************************************************/ -void weak_function lpc17_sspinitialize(void) +void weak_function zkit_sspinitialize(void) { /* Configure the SPI-based microSD CS GPIO */ - ssp_dumpgpio("lpc17_sspinitialize() Entry)"); + ssp_dumpgpio("zkit_sspinitialize() Entry)"); /* Configure card detect and chip select for the SD slot. NOTE: Jumper J55 must * be set correctly for the SD slot chip select. @@ -125,7 +125,7 @@ void weak_function lpc17_sspinitialize(void) #endif #endif /* CONFIG_LPC17_SSP0 */ - ssp_dumpgpio("lpc17_sspinitialize() Exit"); + ssp_dumpgpio("zkit_sspinitialize() Exit"); } /************************************************************************************ diff --git a/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h b/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h index 613f99dc8..b666c8387 100644 --- a/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h +++ b/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h @@ -231,14 +231,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: lpc17_sspinitialize + * Name: zkit_sspinitialize * * Description: * Called to configure SPI chip select GPIO pins for the LPCXpresso board. * ************************************************************************************/ -void weak_function lpc17_sspinitialize(void); +void weak_function zkit_sspinitialize(void); #endif /* __ASSEMBLY__ */ #endif /* _CONFIGS_ZKITARM_LPC1768_SRC_ZKITARM_INTERNAL_H */ |