From 55f91130376b9580a9720a641e80d4049a19d639 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 1 Jul 2013 08:11:54 -0600 Subject: Created new directories to hold SPI-related files --- apps/system/ramtron/ramtron.c | 2 +- nuttx/ChangeLog | 4 + nuttx/Documentation/NuttxPortingGuide.html | 2 +- nuttx/arch/arm/src/calypso/calypso_power.c | 2 +- nuttx/arch/arm/src/calypso/calypso_spi.c | 2 +- nuttx/arch/arm/src/imx/imx_cspi.h | 4 +- nuttx/arch/arm/src/imx/imx_spi.c | 2 +- nuttx/arch/arm/src/kinetis/kinetis_internal.h | 2 +- nuttx/arch/arm/src/kl/kl_spi.c | 2 +- nuttx/arch/arm/src/kl/kl_spi.h | 2 +- nuttx/arch/arm/src/lm/lm_ssi.c | 2 +- nuttx/arch/arm/src/lm/lm_ssi.h | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_spi.c | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_spi.h | 6 +- nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h | 6 +- nuttx/arch/arm/src/lpc31xx/lpc31_internal.h | 2 +- nuttx/arch/arm/src/lpc31xx/lpc31_spi.c | 2 +- nuttx/arch/arm/src/lpc43xx/lpc43_spi.c | 2 +- nuttx/arch/arm/src/lpc43xx/lpc43_spi.h | 4 +- nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c | 2 +- nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h | 4 +- nuttx/arch/arm/src/sam34/sam_spi.c | 4 +- nuttx/arch/arm/src/sam34/sam_spi.h | 4 +- nuttx/arch/arm/src/stm32/stm32_spi.c | 4 +- nuttx/arch/arm/src/stm32/stm32_spi.h | 2 +- nuttx/arch/avr/src/avr/avr_internal.h | 2 +- nuttx/arch/avr/src/avr/up_spi.c | 2 +- nuttx/arch/hc/src/m9s12/m9s12_internal.h | 4 +- nuttx/arch/mips/src/pic32mx/pic32mx-internal.h | 4 +- nuttx/arch/mips/src/pic32mx/pic32mx-spi.c | 2 +- nuttx/arch/x86/src/qemu/qemu_internal.h | 4 +- nuttx/arch/z80/src/ez80/ez80_spi.c | 2 +- nuttx/arch/z80/src/ez80/ez80f91_spi.h | 4 +- nuttx/configs/arduino-due/README.txt | 73 ++++ nuttx/configs/cloudctrl/src/up_spi.c | 4 +- nuttx/configs/cloudctrl/src/up_w25.c | 2 +- nuttx/configs/demo9s12ne64/src/up_spi.c | 4 +- nuttx/configs/ea3131/src/up_fillpage.c | 2 +- nuttx/configs/ea3131/src/up_spi.c | 4 +- nuttx/configs/ea3152/src/up_fillpage.c | 2 +- nuttx/configs/ea3152/src/up_spi.c | 4 +- nuttx/configs/eagle100/src/up_nsh.c | 2 +- nuttx/configs/eagle100/src/up_ssi.c | 4 +- nuttx/configs/ekk-lm3s9b96/src/up_ssi.c | 4 +- nuttx/configs/fire-stm32v2/src/up_enc28j60.c | 2 +- nuttx/configs/fire-stm32v2/src/up_spi.c | 4 +- nuttx/configs/fire-stm32v2/src/up_w25.c | 2 +- nuttx/configs/freedom-kl25z/src/kl_spi.c | 8 +- nuttx/configs/hymini-stm32v/src/up_boot.c | 2 +- nuttx/configs/hymini-stm32v/src/up_nsh.c | 2 +- nuttx/configs/hymini-stm32v/src/up_r61505u.c | 2 +- nuttx/configs/hymini-stm32v/src/up_spi.c | 4 +- nuttx/configs/hymini-stm32v/src/up_ts.c | 2 +- nuttx/configs/kwikstik-k40/src/up_spi.c | 4 +- nuttx/configs/lincoln60/src/up_nsh.c | 2 +- nuttx/configs/lm3s6432-s2e/src/up_nsh.c | 2 +- nuttx/configs/lm3s6432-s2e/src/up_ssi.c | 4 +- nuttx/configs/lm3s6965-ek/src/up_nsh.c | 2 +- nuttx/configs/lm3s6965-ek/src/up_oled.c | 4 +- nuttx/configs/lm3s6965-ek/src/up_ssi.c | 4 +- nuttx/configs/lm3s8962-ek/src/up_nsh.c | 2 +- nuttx/configs/lm3s8962-ek/src/up_oled.c | 4 +- nuttx/configs/lm3s8962-ek/src/up_ssi.c | 4 +- nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c | 2 +- nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c | 4 +- nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c | 2 +- nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c | 4 +- nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c | 4 +- nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c | 2 +- nuttx/configs/mbed/src/up_nsh.c | 2 +- nuttx/configs/mcu123-lpc214x/src/up_composite.c | 2 +- nuttx/configs/mcu123-lpc214x/src/up_nsh.c | 2 +- nuttx/configs/mcu123-lpc214x/src/up_spi1.c | 2 +- nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c | 2 +- nuttx/configs/mikroe-stm32f4/src/up_spi.c | 6 +- nuttx/configs/mikroe-stm32f4/src/up_vs1053.c | 2 +- nuttx/configs/mirtoo/README.txt | 2 +- nuttx/configs/mirtoo/src/up_nsh.c | 2 +- nuttx/configs/mirtoo/src/up_spi2.c | 4 +- nuttx/configs/ne64badge/src/up_spi.c | 4 +- nuttx/configs/nucleus2g/src/up_nsh.c | 2 +- nuttx/configs/nucleus2g/src/up_ssp.c | 4 +- nuttx/configs/nucleus2g/src/up_usbmsc.c | 2 +- nuttx/configs/olimex-lpc1766stk/src/up_lcd.c | 2 +- nuttx/configs/olimex-lpc1766stk/src/up_nsh.c | 2 +- nuttx/configs/olimex-lpc1766stk/src/up_ssp.c | 6 +- nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c | 2 +- nuttx/configs/olimex-lpc2378/src/up_nsh.c | 2 +- nuttx/configs/olimex-strp711/src/up_enc28j60.c | 2 +- nuttx/configs/olimex-strp711/src/up_nsh.c | 2 +- nuttx/configs/olimex-strp711/src/up_spi.c | 5 +- nuttx/configs/open1788/src/lpc17_ssp.c | 4 +- nuttx/configs/open1788/src/lpc17_touchscreen.c | 2 +- nuttx/configs/pic32-starterkit/src/up_nsh.c | 2 +- nuttx/configs/pic32-starterkit/src/up_spi.c | 4 +- nuttx/configs/pic32mx7mmb/src/up_nsh.c | 2 +- nuttx/configs/pic32mx7mmb/src/up_spi.c | 4 +- nuttx/configs/sam3u-ek/src/up_spi.c | 6 +- nuttx/configs/sam3u-ek/src/up_touchscreen.c | 2 +- nuttx/configs/sam4l-xplained/src/sam_mmcsd.c | 2 +- nuttx/configs/sam4l-xplained/src/sam_spi.c | 6 +- .../configs/sam4l-xplained/src/sam_ug2832hsweg04.c | 2 +- nuttx/configs/shenzhou/src/up_ili93xx.c | 2 +- nuttx/configs/shenzhou/src/up_mmcsd.c | 2 +- nuttx/configs/shenzhou/src/up_spi.c | 4 +- nuttx/configs/shenzhou/src/up_ssd1289.c | 2 +- nuttx/configs/shenzhou/src/up_touchscreen.c | 2 +- nuttx/configs/shenzhou/src/up_w25.c | 2 +- nuttx/configs/stm3210e-eval/src/up_lcd.c | 2 +- nuttx/configs/stm3210e-eval/src/up_nsh.c | 2 +- nuttx/configs/stm3210e-eval/src/up_spi.c | 4 +- nuttx/configs/stm3220g-eval/src/up_lcd.c | 2 +- nuttx/configs/stm3220g-eval/src/up_nsh.c | 2 +- nuttx/configs/stm3220g-eval/src/up_spi.c | 4 +- nuttx/configs/stm3240g-eval/src/up_lcd.c | 2 +- nuttx/configs/stm3240g-eval/src/up_nsh.c | 2 +- nuttx/configs/stm3240g-eval/src/up_spi.c | 4 +- nuttx/configs/stm32_tiny/src/up_boot.c | 193 +++++---- nuttx/configs/stm32_tiny/src/up_spi.c | 4 +- nuttx/configs/stm32_tiny/src/up_wireless.c | 2 +- nuttx/configs/stm32f3discovery/src/up_spi.c | 6 +- nuttx/configs/stm32f4discovery/src/up_spi.c | 6 +- nuttx/configs/stm32f4discovery/src/up_ssd1289.c | 2 +- .../stm32f4discovery/src/up_ug2864ambag01.c | 2 +- .../stm32f4discovery/src/up_ug2864hsweg01.c | 2 +- nuttx/configs/stm32ldiscovery/src/stm32_spi.c | 6 +- nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c | 2 +- nuttx/configs/sure-pic32mx/src/pic32mx_spi.c | 4 +- nuttx/configs/teensy/src/up_spi.c | 4 +- nuttx/configs/teensy/src/up_usbmsc.c | 2 +- nuttx/configs/twr-k60n512/src/up_spi.c | 4 +- nuttx/configs/vsn/src/sif.c | 2 +- nuttx/configs/vsn/src/spi.c | 4 +- nuttx/configs/zkit-arm-1769/src/up_lcd.c | 4 +- nuttx/configs/zkit-arm-1769/src/up_nsh.c | 2 +- nuttx/configs/zkit-arm-1769/src/up_spi.c | 4 +- nuttx/configs/zkit-arm-1769/src/up_ssp.c | 4 +- nuttx/configs/zkit-arm-1769/src/up_usbmsc.c | 2 +- nuttx/configs/zp214xpa/src/up_spi1.c | 2 +- nuttx/configs/zp214xpa/src/up_ug2864ambag01.c | 2 +- nuttx/drivers/Kconfig | 27 +- nuttx/drivers/analog/ad5410.c | 2 +- nuttx/drivers/analog/ads1255.c | 2 +- nuttx/drivers/input/ads7843e.c | 2 +- nuttx/drivers/input/ads7843e.h | 2 +- nuttx/drivers/input/max11802.c | 2 +- nuttx/drivers/input/max11802.h | 2 +- nuttx/drivers/lcd/mio283qt2.c | 2 +- nuttx/drivers/lcd/nokia6100.c | 2 +- nuttx/drivers/lcd/p14201.c | 2 +- nuttx/drivers/lcd/skeleton.c | 2 +- nuttx/drivers/lcd/ssd1289.c | 2 +- nuttx/drivers/lcd/ssd1306.c | 2 +- nuttx/drivers/lcd/st7567.c | 2 +- nuttx/drivers/lcd/ug-2864ambag01.c | 2 +- nuttx/drivers/lcd/ug-9664hswag01.c | 2 +- nuttx/drivers/mmcsd/mmcsd_spi.c | 2 +- nuttx/drivers/mtd/at25.c | 2 +- nuttx/drivers/mtd/at45db.c | 2 +- nuttx/drivers/mtd/m25px.c | 2 +- nuttx/drivers/mtd/ramtron.c | 2 +- nuttx/drivers/mtd/sst25.c | 2 +- nuttx/drivers/mtd/w25.c | 2 +- nuttx/drivers/net/enc28j60.c | 2 +- nuttx/drivers/spi/Kconfig | 40 ++ nuttx/drivers/wireless/nrf24l01.h | 2 +- nuttx/include/nuttx/analog/adc.h | 2 +- nuttx/include/nuttx/analog/dac.h | 2 +- nuttx/include/nuttx/analog/pga11x.h | 2 +- nuttx/include/nuttx/audio/audio.h | 2 +- nuttx/include/nuttx/audio/vs1053.h | 2 +- nuttx/include/nuttx/input/max11802.h | 2 +- nuttx/include/nuttx/input/stmpe811.h | 2 +- nuttx/include/nuttx/lcd/nokia6100.h | 2 +- nuttx/include/nuttx/lcd/p14201.h | 2 +- nuttx/include/nuttx/lcd/ssd1306.h | 2 +- nuttx/include/nuttx/lcd/st7567.h | 2 +- nuttx/include/nuttx/lcd/ug-2864ambag01.h | 2 +- nuttx/include/nuttx/lcd/ug-9664hswag01.h | 2 +- nuttx/include/nuttx/mmcsd.h | 2 +- nuttx/include/nuttx/net/enc28j60.h | 2 +- nuttx/include/nuttx/spi.h | 469 --------------------- nuttx/include/nuttx/spi/spi.h | 469 +++++++++++++++++++++ nuttx/include/nuttx/wireless/cc1101.h | 2 +- nuttx/include/nuttx/wireless/nrf24l01.h | 2 +- 186 files changed, 930 insertions(+), 838 deletions(-) create mode 100644 nuttx/drivers/spi/Kconfig delete mode 100644 nuttx/include/nuttx/spi.h create mode 100644 nuttx/include/nuttx/spi/spi.h diff --git a/apps/system/ramtron/ramtron.c b/apps/system/ramtron/ramtron.c index 78773649c..46915db46 100644 --- a/apps/system/ramtron/ramtron.c +++ b/apps/system/ramtron/ramtron.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev); diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 63265a205..d19bb86c8 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5092,4 +5092,8 @@ problem (2013-6-28). * confgis/sam3u_ek/nxwm: Created a configuration for the NxWM window manager for the SAM3U-EK board. + * drivers/spi and include/nuttx/spi: New sub-directories to hold + SPI-related files. includes/nuttx/spi.h moved to include/nuttx/spi/.; + SPI-related Kconfig info moved from drivers/Kconfig to drivers/spi/kconfig + (2013-7-1). diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 236215fff..fc6a4c82b 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -2939,7 +2939,7 @@ extern void up_ledoff(int led);

  • - include/nuttx/spi.h. + include/nuttx/spi/spi.h. All structures and APIs needed to work with SPI drivers are provided in this header file.

    • diff --git a/nuttx/arch/arm/src/calypso/calypso_power.c b/nuttx/arch/arm/src/calypso/calypso_power.c index f85d6890e..03db7def7 100644 --- a/nuttx/arch/arm/src/calypso/calypso_power.c +++ b/nuttx/arch/arm/src/calypso/calypso_power.c @@ -1,5 +1,5 @@ #include -#include +#include int board_power_off(void) { diff --git a/nuttx/arch/arm/src/calypso/calypso_spi.c b/nuttx/arch/arm/src/calypso/calypso_spi.c index 8c7db775d..fda4415c2 100644 --- a/nuttx/arch/arm/src/calypso/calypso_spi.c +++ b/nuttx/arch/arm/src/calypso/calypso_spi.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/nuttx/arch/arm/src/imx/imx_cspi.h b/nuttx/arch/arm/src/imx/imx_cspi.h index 1a60730d5..0c8c0f9d9 100644 --- a/nuttx/arch/arm/src/imx/imx_cspi.h +++ b/nuttx/arch/arm/src/imx/imx_cspi.h @@ -43,7 +43,7 @@ #ifndef __ASSEMBLY__ # include # include -# include +# include #endif /************************************************************************************ @@ -179,7 +179,7 @@ extern "C" { /* The external functions, imx_spiselect, imx_spistatus, and imx_cmddaa must be * provided by board-specific logic. These are implementations of the select and * status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) are + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) are * provided by common logic. To use this common SPI logic on your board: * * 1. Provide imx_spiselect() and imx_spistatus() functions in your board-specific diff --git a/nuttx/arch/arm/src/imx/imx_spi.c b/nuttx/arch/arm/src/imx/imx_spi.c index 4d846af3c..0243b67df 100644 --- a/nuttx/arch/arm/src/imx/imx_spi.c +++ b/nuttx/arch/arm/src/imx/imx_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/arch/arm/src/kinetis/kinetis_internal.h b/nuttx/arch/arm/src/kinetis/kinetis_internal.h index 3b1525355..3932d72b3 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_internal.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_internal.h @@ -589,7 +589,7 @@ void kinetis_clrpend(int irq); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common Kinetis logic. To use * this common SPI logic on your board: * diff --git a/nuttx/arch/arm/src/kl/kl_spi.c b/nuttx/arch/arm/src/kl/kl_spi.c index 26e914ab9..3d50af859 100755 --- a/nuttx/arch/arm/src/kl/kl_spi.c +++ b/nuttx/arch/arm/src/kl/kl_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/arch/arm/src/kl/kl_spi.h b/nuttx/arch/arm/src/kl/kl_spi.h index 7b5e56d4b..acc32083d 100644 --- a/nuttx/arch/arm/src/kl/kl_spi.h +++ b/nuttx/arch/arm/src/kl/kl_spi.h @@ -89,7 +89,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common Kinetis logic. To use * this common SPI logic on your board: * diff --git a/nuttx/arch/arm/src/lm/lm_ssi.c b/nuttx/arch/arm/src/lm/lm_ssi.c index dae08e092..d6769e2da 100644 --- a/nuttx/arch/arm/src/lm/lm_ssi.c +++ b/nuttx/arch/arm/src/lm/lm_ssi.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/arch/arm/src/lm/lm_ssi.h b/nuttx/arch/arm/src/lm/lm_ssi.h index 07cd2ce77..f1c7be155 100644 --- a/nuttx/arch/arm/src/lm/lm_ssi.h +++ b/nuttx/arch/arm/src/lm/lm_ssi.h @@ -76,7 +76,7 @@ extern "C" * The external functions, lm_spiselect, lm_spistatus, and * lm_spicmddata must be provided by board-specific logic. These are * implementations of the select, status, and cmddata methods of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All other methods (including up_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c index 4eccb290b..5184e11c9 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h index 3d4620b52..8345f46de 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h @@ -42,7 +42,7 @@ #include -#include +#include #include "chip/lpc17_spi.h" @@ -92,7 +92,7 @@ FAR struct spi_dev_s *lpc17_spiinitialize(int port); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including lpc17_spiinitialize()) are provided by common LPC17xx logic. To use * this common SPI logic on your board: * @@ -144,7 +144,7 @@ void spi_flush(FAR struct spi_dev_s *dev); * MMC/SD drvier when an SD card is inserted or removed, then * CONFIG_SPI_CALLBACK should be defined and the following function must * must be implemented. These functions implements the registercallback - * method of the SPI interface (see include/nuttx/spi.h for details) + * method of the SPI interface (see include/nuttx/spi/spi.h for details) * * Input Parameters: * dev - Device-specific state data diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c index 11f8da38b..08599e68e 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h index add469661..31e82096b 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h @@ -42,7 +42,7 @@ #include -#include +#include #include "chip/lpc17_ssp.h" @@ -92,7 +92,7 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including lpc17_sspinitialize()) are provided by common LPC17xx logic. To use * this common SPI logic on your board: * @@ -156,7 +156,7 @@ void ssp_flush(FAR struct spi_dev_s *dev); * MMC/SD drvier when an SD card is inserted or removed, then * CONFIG_SPI_CALLBACK should be defined and the following function(s) must * must be implemented. These functiosn implements the registercallback - * method of the SPI interface (see include/nuttx/spi.h for details) + * method of the SPI interface (see include/nuttx/spi/spi.h for details) * * Input Parameters: * dev - Device-specific state data diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h b/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h index f68384b7e..e7d0e0e35 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h @@ -176,7 +176,7 @@ EXTERN void lpc31_clockconfig(void); * The external functions, lpc31_spiselect, lpc31_spistatus, and * lpc31_spicmddata must be provided by board-specific logic. These are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * (including up_spiinitialize()) are provided by common LPC31XX logic. To use * this common SPI logic on your board: * diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c index 6f04af303..19e3e3592 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c index 52910a4a1..1058c85c9 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h index 28c833826..821c59988 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include +#include #include "chip/lpc43_spi.h" #ifdef CONFIG_LPC43_SPI @@ -153,7 +153,7 @@ EXTERN void spi_flush(FAR struct spi_dev_s *dev); * MMC/SD drvier when an SD card is inserted or removed, then * CONFIG_SPI_CALLBACK should be defined and the following function(s) must * must be implemented. These functiosn implements the registercallback - * method of the SPI interface (see include/nuttx/spi.h for details) + * method of the SPI interface (see include/nuttx/spi/spi.h for details) * * Input Parameters: * dev - Device-specific state data diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c index 4a749825a..a7efe8471 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h index cec08e5d0..b8404d1bd 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h @@ -41,7 +41,7 @@ ************************************************************************************/ #include -#include +#include #include "chip/lpc43_ssp.h" #if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1) @@ -163,7 +163,7 @@ EXTERN void ssp_flush(FAR struct spi_dev_s *dev); * MMC/SD drvier when an SD card is inserted or removed, then * CONFIG_SPI_CALLBACK should be defined and the following function(s) must * must be implemented. These functiosn implements the registercallback - * method of the SPI interface (see include/nuttx/spi.h for details) + * method of the SPI interface (see include/nuttx/spi/spi.h for details) * * Input Parameters: * dev - Device-specific state data diff --git a/nuttx/arch/arm/src/sam34/sam_spi.c b/nuttx/arch/arm/src/sam34/sam_spi.c index 4c8832aef..d440a2a34 100644 --- a/nuttx/arch/arm/src/sam34/sam_spi.c +++ b/nuttx/arch/arm/src/sam34/sam_spi.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" @@ -193,7 +193,7 @@ static const struct spi_ops_s g_spiops = }; #ifdef CONFIG_SPI_OWNBUS -/* Single chip select device structure structure */ +/* Single chip select device structure */ static struct sam_spidev_s g_spidev; diff --git a/nuttx/arch/arm/src/sam34/sam_spi.h b/nuttx/arch/arm/src/sam34/sam_spi.h index a3150fffd..0c0d0d41d 100644 --- a/nuttx/arch/arm/src/sam34/sam_spi.h +++ b/nuttx/arch/arm/src/sam34/sam_spi.h @@ -88,7 +88,7 @@ extern "C" * o sam_spiselect is a functions tomanage the board-specific chip selects * o sam_spistatus and sam_spicmddata: Implementations of the status * and cmddata methods of the SPI interface defined by struct spi_ops_ - * (see include/nuttx/spi.h). All other methods including + * (see include/nuttx/spi/spi.h). All other methods including * up_spiinitialize()) are provided by common SAM3/4 logic. * * To use this common SPI logic on your board: @@ -154,7 +154,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected); * devid - Identifies the (logical) device * * Returned Values: - * Bit-encoded SPI status (see include/nuttx/spi.h. + * Bit-encoded SPI status (see include/nuttx/spi/spi.h. * ****************************************************************************/ diff --git a/nuttx/arch/arm/src/stm32/stm32_spi.c b/nuttx/arch/arm/src/stm32/stm32_spi.c index 929dcef36..9bb072419 100644 --- a/nuttx/arch/arm/src/stm32/stm32_spi.c +++ b/nuttx/arch/arm/src/stm32/stm32_spi.c @@ -37,7 +37,7 @@ * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * @@ -69,7 +69,7 @@ #include #include -#include +#include #include diff --git a/nuttx/arch/arm/src/stm32/stm32_spi.h b/nuttx/arch/arm/src/stm32/stm32_spi.h index 58c3f0da7..e40db48dd 100644 --- a/nuttx/arch/arm/src/stm32/stm32_spi.h +++ b/nuttx/arch/arm/src/stm32/stm32_spi.h @@ -77,7 +77,7 @@ enum spi_dev_e; * The external functions, stm32_spi1/2/...select, stm32_spi1/2/...status, and * stm32_spi1/2/...cmddata must be provided by board-specific logic. These are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * (including up_spiinitialize()) are provided by common STM32 logic. To use this * common SPI logic on your board: * diff --git a/nuttx/arch/avr/src/avr/avr_internal.h b/nuttx/arch/avr/src/avr/avr_internal.h index 2c78791e4..1c0038e44 100644 --- a/nuttx/arch/avr/src/avr/avr_internal.h +++ b/nuttx/arch/avr/src/avr/avr_internal.h @@ -142,7 +142,7 @@ extern uint8_t *up_doirq(uint8_t irq, uint8_t *regs); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common LPC17xx logic. To use * this common SPI logic on your board: * diff --git a/nuttx/arch/avr/src/avr/up_spi.c b/nuttx/arch/avr/src/avr/up_spi.c index c490eb02b..8a243c2d9 100644 --- a/nuttx/arch/avr/src/avr/up_spi.c +++ b/nuttx/arch/avr/src/avr/up_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/arch/hc/src/m9s12/m9s12_internal.h b/nuttx/arch/hc/src/m9s12/m9s12_internal.h index 140aa0e5e..9076e490d 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_internal.h +++ b/nuttx/arch/hc/src/m9s12/m9s12_internal.h @@ -45,7 +45,7 @@ #ifndef __ASSEMBLY__ # include # include -# include +# include #endif #include "up_internal.h" @@ -329,7 +329,7 @@ EXTERN int hcs12_ethinitialize(int intf); * The external functions, hcs12_spiselect and hcs12_spistatus must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-internal.h b/nuttx/arch/mips/src/pic32mx/pic32mx-internal.h index 0af09a40c..fca5d5cac 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-internal.h +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-internal.h @@ -47,7 +47,7 @@ #include #include -#include +#include #include "up_internal.h" #include "chip.h" @@ -390,7 +390,7 @@ EXTERN void pic32mx_dumpgpio(uint32_t pinset, const char *msg); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-spi.c b/nuttx/arch/mips/src/pic32mx/pic32mx-spi.c index 7bc1eee3e..1a66326a4 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-spi.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/arch/x86/src/qemu/qemu_internal.h b/nuttx/arch/x86/src/qemu/qemu_internal.h index b63a7b68c..e324f9be8 100644 --- a/nuttx/arch/x86/src/qemu/qemu_internal.h +++ b/nuttx/arch/x86/src/qemu/qemu_internal.h @@ -199,7 +199,7 @@ EXTERN int i486_dumpgpio(uint16_t pinset, const char *msg); * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common LPC17xx logic. To use * this common SPI logic on your board: * @@ -215,7 +215,7 @@ EXTERN int i486_dumpgpio(uint16_t pinset, const char *msg); * 3. Add a call to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/arch/z80/src/ez80/ez80_spi.c b/nuttx/arch/z80/src/ez80/ez80_spi.c index 14f8e05f3..1cbe873f0 100644 --- a/nuttx/arch/z80/src/ez80/ez80_spi.c +++ b/nuttx/arch/z80/src/ez80/ez80_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_internal.h" diff --git a/nuttx/arch/z80/src/ez80/ez80f91_spi.h b/nuttx/arch/z80/src/ez80/ez80f91_spi.h index 9fa42917b..1ef3a755d 100644 --- a/nuttx/arch/z80/src/ez80/ez80f91_spi.h +++ b/nuttx/arch/z80/src/ez80/ez80f91_spi.h @@ -44,7 +44,7 @@ #include #include #include -#include +#include /************************************************************************************ * Definitions @@ -102,7 +102,7 @@ extern "C" { /* The external functions, ez80_spiselect, ez80_spistatus, ans ez80_spicmddata must * be provided by board-specific logic. These are implementations of the select, * status, and cmddata methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) are + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) are * provided by common logic. To use this common SPI logic on your board: * * 1. Provide ez80_spiselect() and ez80_spistatus() functions in your board-specific diff --git a/nuttx/configs/arduino-due/README.txt b/nuttx/configs/arduino-due/README.txt index 6ecba490c..4e9a304d5 100644 --- a/nuttx/configs/arduino-due/README.txt +++ b/nuttx/configs/arduino-due/README.txt @@ -5,10 +5,15 @@ README Arduino DUE board featuring the Atmel ATSAM3X8E MCU running at 84 MHz. + Supported Shields + ----------------- + - ITEAD 2.4" TFT with Touch, Arduion Shield 1.0 + Contents ^^^^^^^^ - PIO Pin Usage + - ITEAD 2.4" TFT with Touch - Development Environment - GNU Toolchain Options - IDEs @@ -100,6 +105,74 @@ PIO Pin Usage PD31 N/A5 N/A PE31 N/A N/A PF31 N/A N/A ----- ---------- ---- -------- ----- ------------ ---- ------ ----- ----------- ---- --------- +ITEAD 2.4" TFT with Touch +^^^^^^^^^^^^^^^^^^^^^^^^^ + + The Arduino 2.4" TFT Touch Shield is designed for all the Arduino + compatible boards. It works in 3.3V voltage level. It can be directly + plugged on the Arduino and other compatible boards. It will offer + display, touch and storage functions for the Arduino board + + Features: + + 1. Compatible with 3.3/5V operation voltage level + 2. Compatible with UTFT library + 3. With SD Card Socket + + The Arduino 2.4" TFT Touch shield uses the S6D1121 controller , it + supports 8-bit data interface. The touch IC is TSC2046. + + Arduino ATSAM3X Due ITHEAD + Due PIN GPIO FUNCTION SIGNAL PIN SIGNAL NOTES + PWMH + 10 SCL1 PA18 TWCK0/A20/WKUP9 SCL1 --- --- SCL not available + 9 SDA1 PA17 TWD0SPCK0 SDA1 --- --- SDA not available + 8 Aref --- --- AREF Vref --- --- + 7 GND --- --- GND GND --- --- + 6 PWM13 PB27 SPI0_SPCK/A20/WKUP10 PWM13 D13 SD_SCK SCK, also LED "L" + 5 PWM12 PD8 A21/NANDALE/TIOB8 PWM12 D12 SD_MISO MISO not available + 4 PWM11 PD7 A17/BA1/TIOA8 PWM11 D11 SD_MOSI MOSI not available + 3 PWM10 ??? ??? SS0/PWM10 D10 SD_CS ??? + 2 PWM9 PC21 A0/NBS0/PWML4 PWM9 D9 Touch_IRQ --- + 1 PWM8 PC22 A1/PWML5 PWM8 D8 Touch_Dout --- + PWML + 8 PWM7 PC23 A2/PWML6 PWM7 D7 DB15 --- + 7 PWM6 PC24 A3/PWML7 PWM6 D6 DB14 --- + 6 PWM5 PC25 A4/TIOA6 PWM5 D5 DB13 --- + 5 PWM4 PC26 A5/TIOB6 SS1/PWM4 D4 DB12 --- + 4 PWM3 PC28 A7/TIOA7 PWM3 D3 DB11 --- + 3 PWM2 PB25 RTS0/TIOA0 PWM2 D2 DB10 --- + 2 PWM1 PA9 UTXD/PWMH3 TX D1 DB9 UART0 TX + 1 PWM0 PA8 URXD/PWMH0/WKUP4 RX D0 DB8 UART0 RX + + POWER + 1 --- --- --- --- --- --- --- + 2 IOref --- --- IOREF +3V3 --- --- --- + 3 RESET --- --- MASTER_RESET RST --- --- + 4 3.3V --- --- +3V3 5V --- --- + 5 5V --- --- +5V 3.3V --- --- + 6 GND --- --- GND GND --- --- + 7 GND --- --- GND GND --- --- + 8 Vin --- --- VIN Vin --- --- + ADCL + 1 A0 PA16 SPCK1/TD/AD7 AD0 A0 Touch_Din --- + 2 A1 PA24 MCDA3/PCK1/AD6 AD1 A1 Touch_CLK --- + 3 A2 PA23 MCDA2/TCLK4/AD5 AD2 A2 --- --- + 4 A3 PA22 MCDA1/TCLK3/AD4 AD3 A3 TFT_CS --- + 5 A4 PA6 TIOB2/NCS0/AD3 AD4 A4 TFT_WR --- + 6 A5 PA4 TCLK1/NWAIT/AD2 AD5 A5 TFT_RS --- + 7 A6 PA3 TIOB1/PWMFI1/AD1/WKUP1 AD6 --- --- --- + 8 A7 PA2 TIOA1/NANDRDY/AD0 AD7 --- --- --- + + NOTE: + + 1. It is not possible to use any of the SPI devices on the Shield unless + a bit-bang SPI interface is used. This includes the touch controller + and the SD card. + 2. UART0 cannot be used + 3. Parallel data is not contiguous in any PIO register + 4. 3.3V and 5V are reversed. + Development Environment ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/configs/cloudctrl/src/up_spi.c b/nuttx/configs/cloudctrl/src/up_spi.c index 84bf85595..f8bdef42d 100644 --- a/nuttx/configs/cloudctrl/src/up_spi.c +++ b/nuttx/configs/cloudctrl/src/up_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -121,7 +121,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/cloudctrl/src/up_w25.c b/nuttx/configs/cloudctrl/src/up_w25.c index 83ed67cc0..e4df22a17 100644 --- a/nuttx/configs/cloudctrl/src/up_w25.c +++ b/nuttx/configs/cloudctrl/src/up_w25.c @@ -49,7 +49,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include # include #endif diff --git a/nuttx/configs/demo9s12ne64/src/up_spi.c b/nuttx/configs/demo9s12ne64/src/up_spi.c index 8514b48ed..5cd73e2e9 100644 --- a/nuttx/configs/demo9s12ne64/src/up_spi.c +++ b/nuttx/configs/demo9s12ne64/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "demo9s12ne64.h" @@ -100,7 +100,7 @@ void weak_function hcs12_spiinitialize(void) * The external functions, hcs12_spiselect and hcs12_spistatus must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common HCS12 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c index 09cbf6171..f8ad374b1 100644 --- a/nuttx/configs/ea3131/src/up_fillpage.c +++ b/nuttx/configs/ea3131/src/up_fillpage.c @@ -65,7 +65,7 @@ #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB) # include # include -# include +# include # include #endif diff --git a/nuttx/configs/ea3131/src/up_spi.c b/nuttx/configs/ea3131/src/up_spi.c index 18000d6b4..dbf57f7e4 100644 --- a/nuttx/configs/ea3131/src/up_spi.c +++ b/nuttx/configs/ea3131/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -108,7 +108,7 @@ void weak_function lpc31_spiinitialize(void) * The external functions, lpc31_spiselect and lpc31_spistatus must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common LPC31XX logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c index a6b5f3590..ce0d5246b 100644 --- a/nuttx/configs/ea3152/src/up_fillpage.c +++ b/nuttx/configs/ea3152/src/up_fillpage.c @@ -65,7 +65,7 @@ #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB) # include # include -# include +# include # include #endif diff --git a/nuttx/configs/ea3152/src/up_spi.c b/nuttx/configs/ea3152/src/up_spi.c index 2dd7b1e23..d26a683d3 100644 --- a/nuttx/configs/ea3152/src/up_spi.c +++ b/nuttx/configs/ea3152/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -108,7 +108,7 @@ void weak_function lpc31_spiinitialize(void) * The external functions, lpc31_spiselect and lpc31_spistatus must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common LPC31XX logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c index b1df8cde6..4b8163182 100644 --- a/nuttx/configs/eagle100/src/up_nsh.c +++ b/nuttx/configs/eagle100/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/eagle100/src/up_ssi.c b/nuttx/configs/eagle100/src/up_ssi.c index c18cf52a5..3df62a3c0 100644 --- a/nuttx/configs/eagle100/src/up_ssi.c +++ b/nuttx/configs/eagle100/src/up_ssi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -114,7 +114,7 @@ void weak_function lm_ssiinitialize(void) /**************************************************************************** * The external functions, lm_spiselect and lm_spistatus must be provided * by board-specific logic. The are implementations of the select and status - * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All othermethods (including up_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c index d7ee0ef16..b737f2a0a 100644 --- a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c +++ b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -116,7 +116,7 @@ void weak_function lm_ssiinitialize(void) /**************************************************************************** * The external functions, lm_spiselect and lm_spistatus must be provided * by board-specific logic. The are implementations of the select and status - * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All othermethods (including up_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/configs/fire-stm32v2/src/up_enc28j60.c b/nuttx/configs/fire-stm32v2/src/up_enc28j60.c index d930d0112..7033b2fcf 100644 --- a/nuttx/configs/fire-stm32v2/src/up_enc28j60.c +++ b/nuttx/configs/fire-stm32v2/src/up_enc28j60.c @@ -55,7 +55,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/fire-stm32v2/src/up_spi.c b/nuttx/configs/fire-stm32v2/src/up_spi.c index 78a3bc255..494fe0f98 100644 --- a/nuttx/configs/fire-stm32v2/src/up_spi.c +++ b/nuttx/configs/fire-stm32v2/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -139,7 +139,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/fire-stm32v2/src/up_w25.c b/nuttx/configs/fire-stm32v2/src/up_w25.c index e78b50ed2..56bbde634 100644 --- a/nuttx/configs/fire-stm32v2/src/up_w25.c +++ b/nuttx/configs/fire-stm32v2/src/up_w25.c @@ -48,7 +48,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include # include #endif diff --git a/nuttx/configs/freedom-kl25z/src/kl_spi.c b/nuttx/configs/freedom-kl25z/src/kl_spi.c index 4d927d89b..f3215ff0e 100644 --- a/nuttx/configs/freedom-kl25z/src/kl_spi.c +++ b/nuttx/configs/freedom-kl25z/src/kl_spi.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "kl_gpio.h" #include "kl_spi.h" @@ -108,7 +108,7 @@ void weak_function kl_spiinitialize(void) * Description: * These external functions must be provided by board-specific logic. They * are implementations of the select, status, and cmddata methods of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). All + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All * other methods including up_spiinitialize()) are provided by common * Kinetis logic. To use this common SPI logic on your board: * @@ -183,7 +183,7 @@ void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, * devid - Identifies the (logical) device * * Returned Values: - * Bit-encoded SPI status (see include/nuttx/spi.h. + * Bit-encoded SPI status (see include/nuttx/spi/spi.h. * ****************************************************************************/ @@ -214,7 +214,7 @@ uint8_t kl_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * cmd - Determines where command or data should be selected. * * Returned Values: - * Bit-encoded SPI status (see include/nuttx/spi.h. + * Bit-encoded SPI status (see include/nuttx/spi/spi.h. * ****************************************************************************/ diff --git a/nuttx/configs/hymini-stm32v/src/up_boot.c b/nuttx/configs/hymini-stm32v/src/up_boot.c index eb958e3c9..db4ad0c81 100644 --- a/nuttx/configs/hymini-stm32v/src/up_boot.c +++ b/nuttx/configs/hymini-stm32v/src/up_boot.c @@ -40,7 +40,7 @@ ************************************************************************************/ #include -#include +#include #include #include diff --git a/nuttx/configs/hymini-stm32v/src/up_nsh.c b/nuttx/configs/hymini-stm32v/src/up_nsh.c index 780b2171b..e8019ae08 100644 --- a/nuttx/configs/hymini-stm32v/src/up_nsh.c +++ b/nuttx/configs/hymini-stm32v/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/nuttx/configs/hymini-stm32v/src/up_r61505u.c b/nuttx/configs/hymini-stm32v/src/up_r61505u.c index 625d5693f..e05c75691 100755 --- a/nuttx/configs/hymini-stm32v/src/up_r61505u.c +++ b/nuttx/configs/hymini-stm32v/src/up_r61505u.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/hymini-stm32v/src/up_spi.c b/nuttx/configs/hymini-stm32v/src/up_spi.c index db0bb61bc..8e21b96cf 100644 --- a/nuttx/configs/hymini-stm32v/src/up_spi.c +++ b/nuttx/configs/hymini-stm32v/src/up_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -115,7 +115,7 @@ void stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/hymini-stm32v/src/up_ts.c b/nuttx/configs/hymini-stm32v/src/up_ts.c index 46765e0aa..bc105124a 100644 --- a/nuttx/configs/hymini-stm32v/src/up_ts.c +++ b/nuttx/configs/hymini-stm32v/src/up_ts.c @@ -36,7 +36,7 @@ ************************************************************************************/ #include -#include +#include #include #include diff --git a/nuttx/configs/kwikstik-k40/src/up_spi.c b/nuttx/configs/kwikstik-k40/src/up_spi.c index e88721dda..acb1ca1c9 100644 --- a/nuttx/configs/kwikstik-k40/src/up_spi.c +++ b/nuttx/configs/kwikstik-k40/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -101,7 +101,7 @@ void weak_function kinetis_spiinitialize(void) * The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common Kinetis logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/lincoln60/src/up_nsh.c b/nuttx/configs/lincoln60/src/up_nsh.c index a4a679415..0dda48bb2 100644 --- a/nuttx/configs/lincoln60/src/up_nsh.c +++ b/nuttx/configs/lincoln60/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/lm3s6432-s2e/src/up_nsh.c b/nuttx/configs/lm3s6432-s2e/src/up_nsh.c index 75107be22..a480ade46 100644 --- a/nuttx/configs/lm3s6432-s2e/src/up_nsh.c +++ b/nuttx/configs/lm3s6432-s2e/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/lm3s6432-s2e/src/up_ssi.c b/nuttx/configs/lm3s6432-s2e/src/up_ssi.c index 5468e2b4d..986e79d31 100644 --- a/nuttx/configs/lm3s6432-s2e/src/up_ssi.c +++ b/nuttx/configs/lm3s6432-s2e/src/up_ssi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -112,7 +112,7 @@ void weak_function lm_ssiinitialize(void) /**************************************************************************** * The external functions, lm_spiselect and lm_spistatus must be provided * by board-specific logic. The are implementations of the select and status - * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All othermethods (including up_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/configs/lm3s6965-ek/src/up_nsh.c b/nuttx/configs/lm3s6965-ek/src/up_nsh.c index 24b8b0206..92a19e500 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_nsh.c +++ b/nuttx/configs/lm3s6965-ek/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c index 07e7859b4..5760a6974 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_oled.c +++ b/nuttx/configs/lm3s6965-ek/src/up_oled.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -143,7 +143,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) * Set or clear the SD1329 D/Cn bit to select data (true) or command * (false). This function must be provided by platform-specific logic. * This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c index 92138f3a6..934e01afa 100644 --- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c +++ b/nuttx/configs/lm3s6965-ek/src/up_ssi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -117,7 +117,7 @@ void weak_function lm_ssiinitialize(void) /**************************************************************************** * The external functions, lm_spiselect and lm_spistatus must be provided * by board-specific logic. The are implementations of the select and status - * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All othermethods (including up_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/configs/lm3s8962-ek/src/up_nsh.c b/nuttx/configs/lm3s8962-ek/src/up_nsh.c index f12c48988..13985a25c 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_nsh.c +++ b/nuttx/configs/lm3s8962-ek/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/lm3s8962-ek/src/up_oled.c b/nuttx/configs/lm3s8962-ek/src/up_oled.c index 05934e8bd..958333359 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_oled.c +++ b/nuttx/configs/lm3s8962-ek/src/up_oled.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -143,7 +143,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) * Set or clear the SD1329 D/Cn bit to select data (true) or command * (false). This function must be provided by platform-specific logic. * This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/lm3s8962-ek/src/up_ssi.c b/nuttx/configs/lm3s8962-ek/src/up_ssi.c index 50344857a..14af5eac9 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_ssi.c +++ b/nuttx/configs/lm3s8962-ek/src/up_ssi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -117,7 +117,7 @@ void weak_function lm_ssiinitialize(void) /**************************************************************************** * The external functions, lm_spiselect and lm_spistatus must be provided * by board-specific logic. The are implementations of the select and status - * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All othermethods (including up_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c index ed1547e04..22a9103d8 100644 --- a/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c +++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c index 29c31409e..34a6cba9b 100644 --- a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -101,7 +101,7 @@ void weak_function lm4f_ssiinitialize(void) /**************************************************************************** * The external functions, lm_spiselect and lm_spistatus must be provided * by board-specific logic. The are implementations of the select and status - * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * All othermethods (including lm_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c index 644ac4d17..47c4dc0bb 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c index 709eadcab..89812fdee 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -159,7 +159,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) * Set or clear the SD1329 D/Cn bit to select data (true) or command * (false). This function must be provided by platform-specific logic. * This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c index 014da6f1e..f5655e301 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -134,7 +134,7 @@ void weak_function lpcxpresso_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c index 542a49a20..8266952a2 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c +++ b/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/mbed/src/up_nsh.c b/nuttx/configs/mbed/src/up_nsh.c index 883a0da15..ab865033a 100644 --- a/nuttx/configs/mbed/src/up_nsh.c +++ b/nuttx/configs/mbed/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/mcu123-lpc214x/src/up_composite.c b/nuttx/configs/mcu123-lpc214x/src/up_composite.c index 8feacc971..b62519d52 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_composite.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_composite.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c index c4a56784f..989dc2952 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/mcu123-lpc214x/src/up_spi1.c b/nuttx/configs/mcu123-lpc214x/src/up_spi1.c index c10144d88..0a19a0483 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_spi1.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_spi1.c @@ -71,7 +71,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c b/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c index f003d4c3c..38f29bc1e 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/mikroe-stm32f4/src/up_spi.c b/nuttx/configs/mikroe-stm32f4/src/up_spi.c index 448ed966a..d13b94623 100644 --- a/nuttx/configs/mikroe-stm32f4/src/up_spi.c +++ b/nuttx/configs/mikroe-stm32f4/src/up_spi.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -134,7 +134,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * @@ -245,7 +245,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true) * or command (false). This function must be provided by platform-specific * logic. This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c b/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c index cc7e0f96d..b4a55c45a 100644 --- a/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c +++ b/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/mirtoo/README.txt b/nuttx/configs/mirtoo/README.txt index e5b33a9b5..c2727c5b5 100644 --- a/nuttx/configs/mirtoo/README.txt +++ b/nuttx/configs/mirtoo/README.txt @@ -588,7 +588,7 @@ Analog Input To intialize and use the PGA117, you to add logic something like the following in your application code: - #include + #include #include FAR struct spi_dev_s *spi; diff --git a/nuttx/configs/mirtoo/src/up_nsh.c b/nuttx/configs/mirtoo/src/up_nsh.c index 33e0692e6..482e91445 100644 --- a/nuttx/configs/mirtoo/src/up_nsh.c +++ b/nuttx/configs/mirtoo/src/up_nsh.c @@ -48,7 +48,7 @@ #include #ifdef CONFIG_PIC32MX_SPI2 -# include +# include # include # include #endif diff --git a/nuttx/configs/mirtoo/src/up_spi2.c b/nuttx/configs/mirtoo/src/up_spi2.c index 056570710..3add97c03 100644 --- a/nuttx/configs/mirtoo/src/up_spi2.c +++ b/nuttx/configs/mirtoo/src/up_spi2.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -149,7 +149,7 @@ void weak_function pic32mx_spi2initialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * diff --git a/nuttx/configs/ne64badge/src/up_spi.c b/nuttx/configs/ne64badge/src/up_spi.c index 8d52b7570..eea74916a 100644 --- a/nuttx/configs/ne64badge/src/up_spi.c +++ b/nuttx/configs/ne64badge/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "ne64badge_internal.h" @@ -100,7 +100,7 @@ void weak_function hcs12_spiinitialize(void) * The external functions, hcs12_spiselect and hcs12_spistatus must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common HCS12 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/nucleus2g/src/up_nsh.c b/nuttx/configs/nucleus2g/src/up_nsh.c index c19937bdc..8dbdf9134 100644 --- a/nuttx/configs/nucleus2g/src/up_nsh.c +++ b/nuttx/configs/nucleus2g/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/nucleus2g/src/up_ssp.c b/nuttx/configs/nucleus2g/src/up_ssp.c index 7a3d16a46..0847a2189 100644 --- a/nuttx/configs/nucleus2g/src/up_ssp.c +++ b/nuttx/configs/nucleus2g/src/up_ssp.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -137,7 +137,7 @@ void weak_function nucleus2g_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/nucleus2g/src/up_usbmsc.c b/nuttx/configs/nucleus2g/src/up_usbmsc.c index 5da9f948d..3031106a0 100644 --- a/nuttx/configs/nucleus2g/src/up_usbmsc.c +++ b/nuttx/configs/nucleus2g/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c index 1f4b7a813..78a2c5717 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c index 2174856e5..07fe78204 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c index 2fd75c665..76d56f735 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c @@ -44,7 +44,7 @@ #include #include -#include +#include #ifdef CONFIG_SPI_CALLBACK #include #endif @@ -258,7 +258,7 @@ void weak_function lpc1766stk_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -326,7 +326,7 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * MMC/SD drvier when an SD card is inserted or removed, then * CONFIG_SPI_CALLBACK should be defined and the following function(s) must * must be implemented. These functiosn implements the registercallback - * method of the SPI interface (see include/nuttx/spi.h for details) + * method of the SPI interface (see include/nuttx/spi/spi.h for details) * * Input Parameters: * dev - Device-specific state data diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c b/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c index e86353a7e..c14420394 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "lpc17_gpio.h" diff --git a/nuttx/configs/olimex-lpc2378/src/up_nsh.c b/nuttx/configs/olimex-lpc2378/src/up_nsh.c index f5ec1fed8..6ff285bfa 100644 --- a/nuttx/configs/olimex-lpc2378/src/up_nsh.c +++ b/nuttx/configs/olimex-lpc2378/src/up_nsh.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/olimex-strp711/src/up_enc28j60.c b/nuttx/configs/olimex-strp711/src/up_enc28j60.c index 68ab0e785..9b1860ea8 100644 --- a/nuttx/configs/olimex-strp711/src/up_enc28j60.c +++ b/nuttx/configs/olimex-strp711/src/up_enc28j60.c @@ -85,7 +85,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c index 7499a8d8f..e10372310 100644 --- a/nuttx/configs/olimex-strp711/src/up_nsh.c +++ b/nuttx/configs/olimex-strp711/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c index 452a43fb7..298f7140e 100644 --- a/nuttx/configs/olimex-strp711/src/up_spi.c +++ b/nuttx/configs/olimex-strp711/src/up_spi.c @@ -44,11 +44,10 @@ #include #include -#include +#include +#include #include -#include -#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/configs/open1788/src/lpc17_ssp.c b/nuttx/configs/open1788/src/lpc17_ssp.c index 4f3995243..c27e3c85f 100644 --- a/nuttx/configs/open1788/src/lpc17_ssp.c +++ b/nuttx/configs/open1788/src/lpc17_ssp.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include @@ -137,7 +137,7 @@ void weak_function open1788_sspinitialize(void) * The external functions, lpc17_ssp0/1/2select and lpc17_ssp0/1/2status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/open1788/src/lpc17_touchscreen.c b/nuttx/configs/open1788/src/lpc17_touchscreen.c index 099e4a9fe..09dcb0a33 100644 --- a/nuttx/configs/open1788/src/lpc17_touchscreen.c +++ b/nuttx/configs/open1788/src/lpc17_touchscreen.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/pic32-starterkit/src/up_nsh.c b/nuttx/configs/pic32-starterkit/src/up_nsh.c index 02e6a9376..71909f92e 100644 --- a/nuttx/configs/pic32-starterkit/src/up_nsh.c +++ b/nuttx/configs/pic32-starterkit/src/up_nsh.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/pic32-starterkit/src/up_spi.c b/nuttx/configs/pic32-starterkit/src/up_spi.c index 42e7c4b9c..ca14501cc 100644 --- a/nuttx/configs/pic32-starterkit/src/up_spi.c +++ b/nuttx/configs/pic32-starterkit/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -107,7 +107,7 @@ void weak_function pic32mx_sspinitialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * diff --git a/nuttx/configs/pic32mx7mmb/src/up_nsh.c b/nuttx/configs/pic32mx7mmb/src/up_nsh.c index 6feb7a2e1..37ecc3095 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_nsh.c +++ b/nuttx/configs/pic32mx7mmb/src/up_nsh.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/pic32mx7mmb/src/up_spi.c b/nuttx/configs/pic32mx7mmb/src/up_spi.c index add2b2d65..c3e90729a 100644 --- a/nuttx/configs/pic32mx7mmb/src/up_spi.c +++ b/nuttx/configs/pic32mx7mmb/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -123,7 +123,7 @@ void weak_function pic32mx_spiinitialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * diff --git a/nuttx/configs/sam3u-ek/src/up_spi.c b/nuttx/configs/sam3u-ek/src/up_spi.c index b42959a9b..f06c37747 100644 --- a/nuttx/configs/sam3u-ek/src/up_spi.c +++ b/nuttx/configs/sam3u-ek/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -116,7 +116,7 @@ void weak_function sam_spiinitialize(void) * o sam_spiselect is a functions tomanage the board-specific chip selects * o sam_spistatus and sam_spicmddata: Implementations of the status * and cmddata methods of the SPI interface defined by struct spi_ops_ - * (see include/nuttx/spi.h). All other methods including + * (see include/nuttx/spi/spi.h). All other methods including * up_spiinitialize()) are provided by common SAM3/4 logic. * * To use this common SPI logic on your board: @@ -192,7 +192,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected) * devid - Identifies the (logical) device * * Returned Values: - * Bit-encoded SPI status (see include/nuttx/spi.h. + * Bit-encoded SPI status (see include/nuttx/spi/spi.h. * ****************************************************************************/ diff --git a/nuttx/configs/sam3u-ek/src/up_touchscreen.c b/nuttx/configs/sam3u-ek/src/up_touchscreen.c index d70ad52fb..c3db19d04 100644 --- a/nuttx/configs/sam3u-ek/src/up_touchscreen.c +++ b/nuttx/configs/sam3u-ek/src/up_touchscreen.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c b/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c index d432c56a9..55c244a8a 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c +++ b/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include "sam4l-xplained.h" diff --git a/nuttx/configs/sam4l-xplained/src/sam_spi.c b/nuttx/configs/sam4l-xplained/src/sam_spi.c index 49ae7b57c..7fe719320 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_spi.c +++ b/nuttx/configs/sam4l-xplained/src/sam_spi.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "sam_gpio.h" #include "sam_spi.h" @@ -124,7 +124,7 @@ void weak_function sam_spiinitialize(void) * o sam_spiselect is a functions tomanage the board-specific chip selects * o sam_spistatus and sam_spicmddata: Implementations of the status * and cmddata methods of the SPI interface defined by struct spi_ops_ - * (see include/nuttx/spi.h). All other methods including + * (see include/nuttx/spi/spi.h). All other methods including * up_spiinitialize()) are provided by common SAM3/4 logic. * * To use this common SPI logic on your board: @@ -211,7 +211,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected) * devid - Identifies the (logical) device * * Returned Values: - * Bit-encoded SPI status (see include/nuttx/spi.h. + * Bit-encoded SPI status (see include/nuttx/spi/spi.h. * ****************************************************************************/ diff --git a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c index b845b5084..e3900071e 100644 --- a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c +++ b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c @@ -80,7 +80,7 @@ #include -#include +#include #include #include diff --git a/nuttx/configs/shenzhou/src/up_ili93xx.c b/nuttx/configs/shenzhou/src/up_ili93xx.c index f090ced62..3a37b4f40 100644 --- a/nuttx/configs/shenzhou/src/up_ili93xx.c +++ b/nuttx/configs/shenzhou/src/up_ili93xx.c @@ -121,7 +121,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/shenzhou/src/up_mmcsd.c b/nuttx/configs/shenzhou/src/up_mmcsd.c index adf695cd5..a4416af56 100644 --- a/nuttx/configs/shenzhou/src/up_mmcsd.c +++ b/nuttx/configs/shenzhou/src/up_mmcsd.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/nuttx/configs/shenzhou/src/up_spi.c b/nuttx/configs/shenzhou/src/up_spi.c index 08c796948..2a633cebd 100644 --- a/nuttx/configs/shenzhou/src/up_spi.c +++ b/nuttx/configs/shenzhou/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -125,7 +125,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/up_ssd1289.c index 8320a6c4e..0443d970e 100644 --- a/nuttx/configs/shenzhou/src/up_ssd1289.c +++ b/nuttx/configs/shenzhou/src/up_ssd1289.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/up_touchscreen.c index 63602f134..832b48515 100644 --- a/nuttx/configs/shenzhou/src/up_touchscreen.c +++ b/nuttx/configs/shenzhou/src/up_touchscreen.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/shenzhou/src/up_w25.c b/nuttx/configs/shenzhou/src/up_w25.c index 01936997f..dfbb18ef9 100644 --- a/nuttx/configs/shenzhou/src/up_w25.c +++ b/nuttx/configs/shenzhou/src/up_w25.c @@ -48,7 +48,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include # include #endif diff --git a/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c index 33eef2b30..9320a7789 100644 --- a/nuttx/configs/stm3210e-eval/src/up_lcd.c +++ b/nuttx/configs/stm3210e-eval/src/up_lcd.c @@ -68,7 +68,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c index 28996d2fd..95f919fac 100644 --- a/nuttx/configs/stm3210e-eval/src/up_nsh.c +++ b/nuttx/configs/stm3210e-eval/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/nuttx/configs/stm3210e-eval/src/up_spi.c b/nuttx/configs/stm3210e-eval/src/up_spi.c index 03fb715c9..b34494a09 100644 --- a/nuttx/configs/stm3210e-eval/src/up_spi.c +++ b/nuttx/configs/stm3210e-eval/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -114,7 +114,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/stm3220g-eval/src/up_lcd.c b/nuttx/configs/stm3220g-eval/src/up_lcd.c index ce406ce3d..e03c89b03 100644 --- a/nuttx/configs/stm3220g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3220g-eval/src/up_lcd.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/stm3220g-eval/src/up_nsh.c b/nuttx/configs/stm3220g-eval/src/up_nsh.c index 2387348ae..afdd01798 100644 --- a/nuttx/configs/stm3220g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3220g-eval/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/nuttx/configs/stm3220g-eval/src/up_spi.c b/nuttx/configs/stm3220g-eval/src/up_spi.c index eb4ba6bc6..8d44ce0fd 100644 --- a/nuttx/configs/stm3220g-eval/src/up_spi.c +++ b/nuttx/configs/stm3220g-eval/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -104,7 +104,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/stm3240g-eval/src/up_lcd.c b/nuttx/configs/stm3240g-eval/src/up_lcd.c index ff8c174df..a12c18d3a 100644 --- a/nuttx/configs/stm3240g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_lcd.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/stm3240g-eval/src/up_nsh.c b/nuttx/configs/stm3240g-eval/src/up_nsh.c index 49d833297..3b1038747 100644 --- a/nuttx/configs/stm3240g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3240g-eval/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/nuttx/configs/stm3240g-eval/src/up_spi.c b/nuttx/configs/stm3240g-eval/src/up_spi.c index e7e8684c1..227850626 100644 --- a/nuttx/configs/stm3240g-eval/src/up_spi.c +++ b/nuttx/configs/stm3240g-eval/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -104,7 +104,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/stm32_tiny/src/up_boot.c b/nuttx/configs/stm32_tiny/src/up_boot.c index a4f302339..525cae8fa 100644 --- a/nuttx/configs/stm32_tiny/src/up_boot.c +++ b/nuttx/configs/stm32_tiny/src/up_boot.c @@ -1,97 +1,96 @@ -/************************************************************************************ - * configs/stm32_tiny/src/up_boot.c - * - * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * Laurent Latil - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ************************************************************************************/ - -/************************************************************************************ - * Included Files - ************************************************************************************/ - -#include -#include -#include - -#include - -#include "up_arch.h" -#include "stm32_tiny-internal.h" - -/************************************************************************************ - * Definitions - ************************************************************************************/ - -/************************************************************************************ - * Private Data - ************************************************************************************/ - -/************************************************************************************ - * Public Functions - ************************************************************************************/ - -/************************************************************************************ - * Name: stm32_boardinitialize - * - * Description: - * All STM32 architectures must provide the following entry point. This entry point - * is called early in the initialization -- after all memory has been configured - * and mapped but before any devices have been initialized. - * - ************************************************************************************/ - -void stm32_boardinitialize(void) -{ - /* Configure on-board LEDs if LED support has been selected. */ - -#ifdef CONFIG_ARCH_LEDS - up_ledinit(); -#endif - - /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function - * stm32_spiinitialize() has been brought into the link. - */ - -#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) - stm32_spiinitialize(); -#endif - - /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not - * disabled, and 3) the weak function stm32_usbinitialize() has been brought - * into the build. - */ - -#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB) - stm32_usbinitialize(); -#endif - -} +/************************************************************************************ + * configs/stm32_tiny/src/up_boot.c + * + * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * Laurent Latil + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include +#include +#include + +#include + +#include "up_arch.h" +#include "stm32_tiny-internal.h" + +/************************************************************************************ + * Definitions + ************************************************************************************/ + +/************************************************************************************ + * Private Data + ************************************************************************************/ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: stm32_boardinitialize + * + * Description: + * All STM32 architectures must provide the following entry point. This entry point + * is called early in the initialization -- after all memory has been configured + * and mapped but before any devices have been initialized. + * + ************************************************************************************/ + +void stm32_boardinitialize(void) +{ + /* Configure on-board LEDs if LED support has been selected. */ + +#ifdef CONFIG_ARCH_LEDS + up_ledinit(); +#endif + + /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function + * stm32_spiinitialize() has been brought into the link. + */ + +#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) + stm32_spiinitialize(); +#endif + + /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not + * disabled, and 3) the weak function stm32_usbinitialize() has been brought + * into the build. + */ + +#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB) + stm32_usbinitialize(); +#endif +} diff --git a/nuttx/configs/stm32_tiny/src/up_spi.c b/nuttx/configs/stm32_tiny/src/up_spi.c index ce41670ae..e79361857 100644 --- a/nuttx/configs/stm32_tiny/src/up_spi.c +++ b/nuttx/configs/stm32_tiny/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -117,7 +117,7 @@ void stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/stm32_tiny/src/up_wireless.c b/nuttx/configs/stm32_tiny/src/up_wireless.c index 7e0c9f5bf..59ec00347 100644 --- a/nuttx/configs/stm32_tiny/src/up_wireless.c +++ b/nuttx/configs/stm32_tiny/src/up_wireless.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/stm32f3discovery/src/up_spi.c b/nuttx/configs/stm32f3discovery/src/up_spi.c index 1a7a07354..408b0df5d 100644 --- a/nuttx/configs/stm32f3discovery/src/up_spi.c +++ b/nuttx/configs/stm32f3discovery/src/up_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -109,7 +109,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * @@ -172,7 +172,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true) * or command (false). This function must be provided by platform-specific * logic. This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/stm32f4discovery/src/up_spi.c b/nuttx/configs/stm32f4discovery/src/up_spi.c index d51a6d3d4..599220a1a 100644 --- a/nuttx/configs/stm32f4discovery/src/up_spi.c +++ b/nuttx/configs/stm32f4discovery/src/up_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -116,7 +116,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * @@ -188,7 +188,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true) * or command (false). This function must be provided by platform-specific * logic. This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c index 6eab054d3..532603ba5 100644 --- a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c +++ b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c b/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c index 42ad0c2a5..d8e7c3a5e 100644 --- a/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c +++ b/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c b/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c index fbf414276..edd788133 100644 --- a/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c +++ b/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_spi.c b/nuttx/configs/stm32ldiscovery/src/stm32_spi.c index a419d804d..f560c1fa8 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32_spi.c +++ b/nuttx/configs/stm32ldiscovery/src/stm32_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -109,7 +109,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * @@ -172,7 +172,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true) * or command (false). This function must be provided by platform-specific * logic. This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c b/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c index 1145ff6d5..294afcb79 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c b/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c index 95c3440a4..40871648f 100644 --- a/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c +++ b/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -183,7 +183,7 @@ void weak_function pic32mx_spiinitialize(void) * The external functions, pic32mx_spi2select and pic32mx_spi2status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common PIC32MX logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/teensy/src/up_spi.c b/nuttx/configs/teensy/src/up_spi.c index a4eed9836..828e30dbe 100644 --- a/nuttx/configs/teensy/src/up_spi.c +++ b/nuttx/configs/teensy/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -144,7 +144,7 @@ void weak_function at90usb_spiinitialize(void) * Description: * The external functions, avr_spiselect and avr_spistatus must be provided by * board-specific logic. They are implementations of the select and status methods - * of the SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). All + * of the SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All * other methods (including up_spiinitialize()) are provided by common AVR logic. * To use this common SPI logic on your board: * diff --git a/nuttx/configs/teensy/src/up_usbmsc.c b/nuttx/configs/teensy/src/up_usbmsc.c index 0b944eda3..2743dfbfb 100644 --- a/nuttx/configs/teensy/src/up_usbmsc.c +++ b/nuttx/configs/teensy/src/up_usbmsc.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include "at90usb_internal.h" diff --git a/nuttx/configs/twr-k60n512/src/up_spi.c b/nuttx/configs/twr-k60n512/src/up_spi.c index 074dc5cd7..afdc48f00 100644 --- a/nuttx/configs/twr-k60n512/src/up_spi.c +++ b/nuttx/configs/twr-k60n512/src/up_spi.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -101,7 +101,7 @@ void weak_function kinetis_spiinitialize(void) * The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common Kinetis logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/vsn/src/sif.c b/nuttx/configs/vsn/src/sif.c index 0269ebcab..2dacc6f69 100644 --- a/nuttx/configs/vsn/src/sif.c +++ b/nuttx/configs/vsn/src/sif.c @@ -79,7 +79,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/configs/vsn/src/spi.c b/nuttx/configs/vsn/src/spi.c index 7c028a920..c0363063f 100644 --- a/nuttx/configs/vsn/src/spi.c +++ b/nuttx/configs/vsn/src/spi.c @@ -44,7 +44,7 @@ #include -#include +#include #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) @@ -114,7 +114,7 @@ void weak_function stm32_spiinitialize(void) * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be * provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common STM32 logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c index e29996b31..d459e1dc4 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c +++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include #include @@ -167,7 +167,7 @@ void up_lcduninitialize(void) * Set or clear the SD1329 D/Cn bit to select data (true) or command * (false). This function must be provided by platform-specific logic. * This is an implementation of the cmddata method of the SPI - * interface defined by struct spi_ops_s (see include/nuttx/spi.h). + * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * * Input Parameters: * diff --git a/nuttx/configs/zkit-arm-1769/src/up_nsh.c b/nuttx/configs/zkit-arm-1769/src/up_nsh.c index 63553e532..8d33478fa 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_nsh.c +++ b/nuttx/configs/zkit-arm-1769/src/up_nsh.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include "lpc17_spi.h" diff --git a/nuttx/configs/zkit-arm-1769/src/up_spi.c b/nuttx/configs/zkit-arm-1769/src/up_spi.c index 080f1efea..d1bdb11d8 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_spi.c +++ b/nuttx/configs/zkit-arm-1769/src/up_spi.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -124,7 +124,7 @@ void weak_function zkit_spiinitialize(void) * The external functions, lpc17_spiselect and lpc17_spistatus * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c index 8aa0828a3..4f640fe9d 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c +++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include "up_arch.h" @@ -126,7 +126,7 @@ void weak_function zkit_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including lpc17_sspinitialize()) + * include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * diff --git a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c index 60f3e2dc2..d6a9430da 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c +++ b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include "lpc17_spi.h" diff --git a/nuttx/configs/zp214xpa/src/up_spi1.c b/nuttx/configs/zp214xpa/src/up_spi1.c index 1ee1cac32..35a56a426 100644 --- a/nuttx/configs/zp214xpa/src/up_spi1.c +++ b/nuttx/configs/zp214xpa/src/up_spi1.c @@ -72,7 +72,7 @@ #include #include -#include +#include #include "up_internal.h" #include "up_arch.h" diff --git a/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c b/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c index 236f9fa41..2c2ae847a 100644 --- a/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c +++ b/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig index efcf9bc55..16a9e2d32 100644 --- a/nuttx/drivers/Kconfig +++ b/nuttx/drivers/Kconfig @@ -150,33 +150,10 @@ menuconfig SPI ---help--- This selection enables selection of common SPI options. This option should be enabled by all platforms that support SPI interfaces. - See include/nuttx/spi.h for further SPI driver information. + See include/nuttx/spi/spi.h for further SPI driver information. if SPI -config SPI_OWNBUS - bool "SPI single device" - default n - ---help--- - Set if there is only one active device on the SPI bus. No locking or - SPI configuration will be performed. It is not necessary for clients to - lock, re-configure, etc.. - -config SPI_EXCHANGE - bool "SPI exchange" - default y - ---help--- - Driver supports a single exchange method (vs a recvblock() and - sndblock() methods). - -config SPI_CMDDATA - bool "SPI CMD/DATA" - default n - ---help--- - Devices on the SPI bus require out-of-band support to distinguish - command transfers from data transfers. Such devices will often support - either 9-bit SPI (yech) or 8-bit SPI and a GPIO output that selects - between command and data. - +source drivers/spi/Kconfig endif menuconfig RTC diff --git a/nuttx/drivers/analog/ad5410.c b/nuttx/drivers/analog/ad5410.c index 3e925a3a9..0c7746e19 100644 --- a/nuttx/drivers/analog/ad5410.c +++ b/nuttx/drivers/analog/ad5410.c @@ -51,7 +51,7 @@ #include #include #include -#include +#include #if defined(CONFIG_DAC_AD5410) diff --git a/nuttx/drivers/analog/ads1255.c b/nuttx/drivers/analog/ads1255.c index 374decc54..525e3cb7f 100644 --- a/nuttx/drivers/analog/ads1255.c +++ b/nuttx/drivers/analog/ads1255.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #if defined(CONFIG_ADC_ADS1255) diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c index 567e332b6..b8f4f16e6 100644 --- a/nuttx/drivers/input/ads7843e.c +++ b/nuttx/drivers/input/ads7843e.c @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include diff --git a/nuttx/drivers/input/ads7843e.h b/nuttx/drivers/input/ads7843e.h index bb3db5630..5fe38d34c 100644 --- a/nuttx/drivers/input/ads7843e.h +++ b/nuttx/drivers/input/ads7843e.h @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/input/max11802.c b/nuttx/drivers/input/max11802.c index 9cb8dee0e..493a2a99b 100644 --- a/nuttx/drivers/input/max11802.c +++ b/nuttx/drivers/input/max11802.c @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include diff --git a/nuttx/drivers/input/max11802.h b/nuttx/drivers/input/max11802.h index b6beec045..075631799 100644 --- a/nuttx/drivers/input/max11802.h +++ b/nuttx/drivers/input/max11802.h @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/mio283qt2.c b/nuttx/drivers/lcd/mio283qt2.c index 3a1087c20..4f737eb7f 100644 --- a/nuttx/drivers/lcd/mio283qt2.c +++ b/nuttx/drivers/lcd/mio283qt2.c @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/nokia6100.c b/nuttx/drivers/lcd/nokia6100.c index 7354b8a91..402cf8438 100644 --- a/nuttx/drivers/lcd/nokia6100.c +++ b/nuttx/drivers/lcd/nokia6100.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/p14201.c b/nuttx/drivers/lcd/p14201.c index c45292fed..6c74a6f7c 100644 --- a/nuttx/drivers/lcd/p14201.c +++ b/nuttx/drivers/lcd/p14201.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/skeleton.c b/nuttx/drivers/lcd/skeleton.c index 83aa92018..44a45f26b 100644 --- a/nuttx/drivers/lcd/skeleton.c +++ b/nuttx/drivers/lcd/skeleton.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include "up_arch.h" diff --git a/nuttx/drivers/lcd/ssd1289.c b/nuttx/drivers/lcd/ssd1289.c index ef0ede25a..75abdb1ac 100644 --- a/nuttx/drivers/lcd/ssd1289.c +++ b/nuttx/drivers/lcd/ssd1289.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/ssd1306.c b/nuttx/drivers/lcd/ssd1306.c index 3fa7a34f6..d92075610 100644 --- a/nuttx/drivers/lcd/ssd1306.c +++ b/nuttx/drivers/lcd/ssd1306.c @@ -129,7 +129,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/st7567.c b/nuttx/drivers/lcd/st7567.c index ffc845da1..f08897710 100644 --- a/nuttx/drivers/lcd/st7567.c +++ b/nuttx/drivers/lcd/st7567.c @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/ug-2864ambag01.c b/nuttx/drivers/lcd/ug-2864ambag01.c index 993303b93..4879c027f 100644 --- a/nuttx/drivers/lcd/ug-2864ambag01.c +++ b/nuttx/drivers/lcd/ug-2864ambag01.c @@ -127,7 +127,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/lcd/ug-9664hswag01.c b/nuttx/drivers/lcd/ug-9664hswag01.c index 1d1e9194f..1ad2e1150 100644 --- a/nuttx/drivers/lcd/ug-9664hswag01.c +++ b/nuttx/drivers/lcd/ug-9664hswag01.c @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/mmcsd/mmcsd_spi.c b/nuttx/drivers/mmcsd/mmcsd_spi.c index be4ebdcdc..ee9935f7e 100644 --- a/nuttx/drivers/mmcsd/mmcsd_spi.c +++ b/nuttx/drivers/mmcsd/mmcsd_spi.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/nuttx/drivers/mtd/at25.c b/nuttx/drivers/mtd/at25.c index 6c4e183eb..465ea4425 100644 --- a/nuttx/drivers/mtd/at25.c +++ b/nuttx/drivers/mtd/at25.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include /************************************************************************************ diff --git a/nuttx/drivers/mtd/at45db.c b/nuttx/drivers/mtd/at45db.c index fbdc9090a..9b9f9ead7 100644 --- a/nuttx/drivers/mtd/at45db.c +++ b/nuttx/drivers/mtd/at45db.c @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include /************************************************************************************ diff --git a/nuttx/drivers/mtd/m25px.c b/nuttx/drivers/mtd/m25px.c index d799ee0cb..02aad5e7c 100644 --- a/nuttx/drivers/mtd/m25px.c +++ b/nuttx/drivers/mtd/m25px.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include /************************************************************************************ diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c index 44bc46c2e..d2180c91a 100644 --- a/nuttx/drivers/mtd/ramtron.c +++ b/nuttx/drivers/mtd/ramtron.c @@ -68,7 +68,7 @@ #include #include -#include +#include #include /************************************************************************************ diff --git a/nuttx/drivers/mtd/sst25.c b/nuttx/drivers/mtd/sst25.c index 0f58c4ae2..fc4e5b36d 100644 --- a/nuttx/drivers/mtd/sst25.c +++ b/nuttx/drivers/mtd/sst25.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include /************************************************************************************ diff --git a/nuttx/drivers/mtd/w25.c b/nuttx/drivers/mtd/w25.c index 065e04528..861e19ab5 100644 --- a/nuttx/drivers/mtd/w25.c +++ b/nuttx/drivers/mtd/w25.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include /************************************************************************************ diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index b6e265bc2..9ebdb06ed 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include diff --git a/nuttx/drivers/spi/Kconfig b/nuttx/drivers/spi/Kconfig new file mode 100644 index 000000000..645f4017b --- /dev/null +++ b/nuttx/drivers/spi/Kconfig @@ -0,0 +1,40 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +config SPI + bool "SPI Driver Support" + default n + ---help--- + This selection enables selection of common SPI options. This option + should be enabled by all platforms that support SPI interfaces. + See include/nuttx/spi/spi.h for further SPI driver information. + +if SPI +config SPI_OWNBUS + bool "SPI single device" + default n + ---help--- + Set if there is only one active device on the SPI bus. No locking or + SPI configuration will be performed. It is not necessary for clients to + lock, re-configure, etc.. + +config SPI_EXCHANGE + bool "SPI exchange" + default y + ---help--- + Driver supports a single exchange method (vs a recvblock() and + sndblock() methods). + +config SPI_CMDDATA + bool "SPI CMD/DATA" + default n + ---help--- + Devices on the SPI bus require out-of-band support to distinguish + command transfers from data transfers. Such devices will often support + either 9-bit SPI (yech) or 8-bit SPI and a GPIO output that selects + between command and data. + +endif + diff --git a/nuttx/drivers/wireless/nrf24l01.h b/nuttx/drivers/wireless/nrf24l01.h index c5bddf0b8..caaf67f56 100644 --- a/nuttx/drivers/wireless/nrf24l01.h +++ b/nuttx/drivers/wireless/nrf24l01.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/nuttx/include/nuttx/analog/adc.h b/nuttx/include/nuttx/analog/adc.h index f654bff05..fe5eb9809 100644 --- a/nuttx/include/nuttx/analog/adc.h +++ b/nuttx/include/nuttx/analog/adc.h @@ -54,7 +54,7 @@ #include #include #include -#include +#include /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/include/nuttx/analog/dac.h b/nuttx/include/nuttx/analog/dac.h index 655fdbfcf..ab410399e 100644 --- a/nuttx/include/nuttx/analog/dac.h +++ b/nuttx/include/nuttx/analog/dac.h @@ -53,7 +53,7 @@ #include #include #include -#include +#include /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/include/nuttx/analog/pga11x.h b/nuttx/include/nuttx/analog/pga11x.h index 8b04dee19..231c67fa9 100644 --- a/nuttx/include/nuttx/analog/pga11x.h +++ b/nuttx/include/nuttx/analog/pga11x.h @@ -46,7 +46,7 @@ ****************************************************************************/ #include -#include +#include #if defined(CONFIG_ADC) && defined(CONFIG_ADC_PGA11X) diff --git a/nuttx/include/nuttx/audio/audio.h b/nuttx/include/nuttx/audio/audio.h index 72b8cb573..6234ac0db 100644 --- a/nuttx/include/nuttx/audio/audio.h +++ b/nuttx/include/nuttx/audio/audio.h @@ -56,7 +56,7 @@ #include #include -#include +#include #ifdef CONFIG_AUDIO diff --git a/nuttx/include/nuttx/audio/vs1053.h b/nuttx/include/nuttx/audio/vs1053.h index 5b791c023..1d99e44f6 100644 --- a/nuttx/include/nuttx/audio/vs1053.h +++ b/nuttx/include/nuttx/audio/vs1053.h @@ -108,7 +108,7 @@ extern "C" { * ****************************************************************************/ -struct spi_dev_s; /* see nuttx/spi.h */ +struct spi_dev_s; /* see nuttx/spi/spi.h */ struct audio_lowerhalf_s; /* see nutt/audio.h */ EXTERN FAR struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi, FAR const struct vs1053_lower_s *lower, diff --git a/nuttx/include/nuttx/input/max11802.h b/nuttx/include/nuttx/input/max11802.h index 3d03bdd11..318ddce5d 100644 --- a/nuttx/include/nuttx/input/max11802.h +++ b/nuttx/include/nuttx/input/max11802.h @@ -46,7 +46,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/nuttx/include/nuttx/input/stmpe811.h b/nuttx/include/nuttx/input/stmpe811.h index fc311f7c4..7a6fdd57a 100644 --- a/nuttx/include/nuttx/input/stmpe811.h +++ b/nuttx/include/nuttx/input/stmpe811.h @@ -47,7 +47,7 @@ #include #include -#include +#include #include diff --git a/nuttx/include/nuttx/lcd/nokia6100.h b/nuttx/include/nuttx/lcd/nokia6100.h index 0fb52a40d..2d7184ead 100644 --- a/nuttx/include/nuttx/lcd/nokia6100.h +++ b/nuttx/include/nuttx/lcd/nokia6100.h @@ -117,7 +117,7 @@ extern "C" { **************************************************************************************/ struct lcd_dev_s; /* see nuttx/lcd.h */ -struct spi_dev_s; /* see nuttx/spi.h */ +struct spi_dev_s; /* see nuttx/spi/spi.h */ EXTERN FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned int devno); /************************************************************************************** diff --git a/nuttx/include/nuttx/lcd/p14201.h b/nuttx/include/nuttx/lcd/p14201.h index 741d4f3de..68abf5b8f 100644 --- a/nuttx/include/nuttx/lcd/p14201.h +++ b/nuttx/include/nuttx/lcd/p14201.h @@ -118,7 +118,7 @@ extern "C" { **************************************************************************************/ struct lcd_dev_s; /* see nuttx/lcd.h */ -struct spi_dev_s; /* see nuttx/spi.h */ +struct spi_dev_s; /* see nuttx/spi/spi.h */ EXTERN FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int devno); #undef EXTERN diff --git a/nuttx/include/nuttx/lcd/ssd1306.h b/nuttx/include/nuttx/lcd/ssd1306.h index 26fd0430c..3a76a64c9 100644 --- a/nuttx/include/nuttx/lcd/ssd1306.h +++ b/nuttx/include/nuttx/lcd/ssd1306.h @@ -219,7 +219,7 @@ extern "C" **************************************************************************************/ struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */ -struct spi_dev_s; /* See include/nuttx/spi.h */ +struct spi_dev_s; /* See include/nuttx/spi/spi.h */ FAR struct lcd_dev_s *ssd1306_initialize(FAR struct spi_dev_s *spi, unsigned int devno); /************************************************************************************************ diff --git a/nuttx/include/nuttx/lcd/st7567.h b/nuttx/include/nuttx/lcd/st7567.h index 22119bc6c..c68f80e53 100644 --- a/nuttx/include/nuttx/lcd/st7567.h +++ b/nuttx/include/nuttx/lcd/st7567.h @@ -123,7 +123,7 @@ extern "C" ****************************************************************************/ struct lcd_dev_s; /* see nuttx/lcd.h */ -struct spi_dev_s; /* see nuttx/spi.h */ +struct spi_dev_s; /* see nuttx/spi/spi.h */ FAR struct lcd_dev_s *st7567_initialize(FAR struct spi_dev_s *spi, unsigned int devno); /**************************************************************************** diff --git a/nuttx/include/nuttx/lcd/ug-2864ambag01.h b/nuttx/include/nuttx/lcd/ug-2864ambag01.h index 86362d773..83ac20655 100644 --- a/nuttx/include/nuttx/lcd/ug-2864ambag01.h +++ b/nuttx/include/nuttx/lcd/ug-2864ambag01.h @@ -217,7 +217,7 @@ extern "C" **************************************************************************************/ struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */ -struct spi_dev_s; /* See include/nuttx/spi.h */ +struct spi_dev_s; /* See include/nuttx/spi/spi.h */ FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi, unsigned int devno); diff --git a/nuttx/include/nuttx/lcd/ug-9664hswag01.h b/nuttx/include/nuttx/lcd/ug-9664hswag01.h index a60b5ed67..b781919d8 100644 --- a/nuttx/include/nuttx/lcd/ug-9664hswag01.h +++ b/nuttx/include/nuttx/lcd/ug-9664hswag01.h @@ -119,7 +119,7 @@ extern "C" ****************************************************************************/ struct lcd_dev_s; /* see nuttx/lcd.h */ -struct spi_dev_s; /* see nuttx/spi.h */ +struct spi_dev_s; /* see nuttx/spi/spi.h */ FAR struct lcd_dev_s *ug_initialize(FAR struct spi_dev_s *spi, unsigned int devno); /**************************************************************************** diff --git a/nuttx/include/nuttx/mmcsd.h b/nuttx/include/nuttx/mmcsd.h index 819613ede..03b7dafd8 100644 --- a/nuttx/include/nuttx/mmcsd.h +++ b/nuttx/include/nuttx/mmcsd.h @@ -96,7 +96,7 @@ EXTERN int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev); * ****************************************************************************/ -struct spi_dev_s; /* See nuttx/spi.h */ +struct spi_dev_s; /* See nuttx/spi/spi.h */ EXTERN int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi); #undef EXTERN diff --git a/nuttx/include/nuttx/net/enc28j60.h b/nuttx/include/nuttx/net/enc28j60.h index 7d0d7c3e5..ea5601c31 100644 --- a/nuttx/include/nuttx/net/enc28j60.h +++ b/nuttx/include/nuttx/net/enc28j60.h @@ -146,7 +146,7 @@ extern "C" { * ****************************************************************************/ -struct spi_dev_s; /* see nuttx/spi.h */ +struct spi_dev_s; /* see nuttx/spi/spi.h */ EXTERN int enc_initialize(FAR struct spi_dev_s *spi, FAR const struct enc_lower_s *lower, unsigned int devno); diff --git a/nuttx/include/nuttx/spi.h b/nuttx/include/nuttx/spi.h deleted file mode 100644 index 4816e7d8b..000000000 --- a/nuttx/include/nuttx/spi.h +++ /dev/null @@ -1,469 +0,0 @@ -/**************************************************************************** - * include/nuttx/spi.h - * - * Copyright(C) 2008-2013 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __INCLUDE_NUTTX_SPI_H -#define __INCLUDE_NUTTX_SPI_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ -/* Configuration ************************************************************/ -/* CONFIG_SPI_OWNBUS - Set if there is only one active device on the SPI bus. - * No locking or SPI configuration will be performed. It is not necessary - * for clients to lock, re-configure, etc.. - * CONFIG_SPI_EXCHANGE - Driver supports a single exchange method - * (vs a recvblock() and sndblock ()methods). - * CONFIG_SPI_CMDDATA - Devices on the SPI bus require out-of-band support - * to distinguish command transfers from data transfers. Such devices - * will often support either 9-bit SPI (yech) or 8-bit SPI and a GPIO - * output that selects between command and data. - */ - -/* Access macros ************************************************************/ - -/**************************************************************************** - * Name: SPI_LOCK - * - * Description: - * On SPI busses where there are multiple devices, it will be necessary to - * lock SPI to have exclusive access to the busses for a sequence of - * transfers. The bus should be locked before the chip is selected. After - * locking the SPI bus, the caller should then also call the setfrequency, - * setbits, and setmode methods to make sure that the SPI is properly - * configured for the device. If the SPI buss is being shared, then it - * may have been left in an incompatible state. - * - * Input Parameters: - * dev - Device-specific state data - * lock - true: Lock spi bus, false: unlock SPI bus - * - * Returned Value: - * None - * - ****************************************************************************/ - -#ifndef CONFIG_SPI_OWNBUS -# define SPI_LOCK(d,l) (d)->ops->lock(d,l) -#else -# define SPI_LOCK(d,l) 0 -#endif - -/**************************************************************************** - * Name: SPI_SELECT - * - * Description: - * Enable/disable the SPI chip select. The implementation of this method - * must include handshaking: If a device is selected, it must hold off - * all other attempts to select the device until the device is deselected. - * Required. - * - * Input Parameters: - * dev - Device-specific state data - * devid - Identifies the device to select - * selected - true: slave selected, false: slave de-selected - * - * Returned Value: - * None - * - ****************************************************************************/ - -#define SPI_SELECT(d,id,s) ((d)->ops->select(d,id,s)) - -/**************************************************************************** - * Name: SPI_SETFREQUENCY - * - * Description: - * Set the SPI frequency. Required. - * - * Input Parameters: - * dev - Device-specific state data - * frequency - The SPI frequency requested - * - * Returned Value: - * Returns the actual frequency selected - * - ****************************************************************************/ - -#define SPI_SETFREQUENCY(d,f) ((d)->ops->setfrequency(d,f)) - -/**************************************************************************** - * Name: SPI_SETMODE - * - * Description: - * Set the SPI mode. Optional. See enum spi_mode_e for mode definitions. - * - * Input Parameters: - * dev - Device-specific state data - * mode - The SPI mode requested - * - * Returned Value: - * none - * - ****************************************************************************/ - -#define SPI_SETMODE(d,m) \ - do { if ((d)->ops->setmode) (d)->ops->setmode(d,m); } while (0) - -/**************************************************************************** - * Name: SPI_SETBITS - * - * Description: - * Set the number if bits per word. - * - * Input Parameters: - * dev - Device-specific state data - * nbits - The number of bits requests. - * If value is greater > 0 then it implies MSB first - * If value is below < 0, then it implies LSB first with -nbits - * - * Returned Value: - * none - * - ****************************************************************************/ - -#define SPI_SETBITS(d,b) \ - do { if ((d)->ops->setbits) (d)->ops->setbits(d,b); } while (0) - -/**************************************************************************** - * Name: SPI_STATUS - * - * Description: - * Get SPI/MMC status. Optional. - * - * Input Parameters: - * dev - Device-specific state data - * devid - Identifies the device to report status on - * - * Returned Value: - * Returns a bitset of status values (see SPI_STATUS_* defines) - * - ****************************************************************************/ - -#define SPI_STATUS(d,id) \ - ((d)->ops->status ? (d)->ops->status(d, id) : SPI_STATUS_PRESENT) - -/* SPI status bits -- Some dedicated for SPI MMC/SD support and may have no - * relationship to SPI other than needed by the SPI MMC/SD interface - */ - -#define SPI_STATUS_PRESENT 0x01 /* Bit 0=1: MMC/SD card present */ -#define SPI_STATUS_WRPROTECTED 0x02 /* Bit 1=1: MMC/SD card write protected */ - -/**************************************************************************** - * Name: SPI_CMDDATA - * - * Description: - * Some devices require and additional out-of-band bit to specify if the - * next word sent to the device is a command or data. This is typical, for - * example, in "9-bit" displays where the 9th bit is the CMD/DATA bit. - * This function provides selection of command or data. - * - * This "latches" the CMD/DATA state. It does not have to be called before - * every word is transferred; only when the CMD/DATA state changes. This - * method is required if CONFIG_SPI_CMDDATA is selected in the NuttX - * configuration - * - * Input Parameters: - * dev - Device-specific state data - * cmd - TRUE: The following word is a command; FALSE: the following words - * are data. - * - * Returned Value: - * OK unless an error occurs. Then a negated errno value is returned - * - ****************************************************************************/ - -#ifdef CONFIG_SPI_CMDDATA -# define SPI_CMDDATA(d,id,cmd) ((d)->ops->cmddata(d,id,cmd)) -#endif - -/**************************************************************************** - * Name: SPI_SEND - * - * Description: - * Exchange one word on SPI. Required. - * - * Input Parameters: - * dev - Device-specific state data - * wd - The word to send. the size of the data is determined by the - * number of bits selected for the SPI interface. - * - * Returned Value: - * Received value - * - ****************************************************************************/ - -#define SPI_SEND(d,wd) ((d)->ops->send(d,(uint16_t)wd)) - -/**************************************************************************** - * Name: SPI_SNDBLOCK - * - * Description: - * Send a block of data on SPI. Required. - * - * Input Parameters: - * dev - Device-specific state data - * buffer - A pointer to the buffer of data to be sent - * nwords - the length of data to send from the buffer in number of words. - * The wordsize is determined by the number of bits-per-word - * selected for the SPI interface. If nbits <= 8, the data is - * packed into uint8_t's; if nbits >8, the data is packed into - * uint16_t's - * - * Returned Value: - * None - * - ****************************************************************************/ - -#ifdef CONFIG_SPI_EXCHANGE -# define SPI_SNDBLOCK(d,b,l) ((d)->ops->exchange(d,b,0,l)) -#else -# define SPI_SNDBLOCK(d,b,l) ((d)->ops->sndblock(d,b,l)) -#endif - -/**************************************************************************** - * Name: SPI_RECVBLOCK - * - * Description: - * Receive a block of data from SPI. Required. - * - * Input Parameters: - * dev - Device-specific state data - * buffer - A pointer to the buffer in which to recieve data - * nwords - the length of data that can be received in the buffer in number - * of words. The wordsize is determined by the number of bits- - * per-word selected for the SPI interface. If nbits <= 8, the - * data is packed into uint8_t's; if nbits >8, the data is packed - * into uint16_t's - * - * Returned Value: - * None - * - ****************************************************************************/ - -#ifdef CONFIG_SPI_EXCHANGE -# define SPI_RECVBLOCK(d,b,l) ((d)->ops->exchange(d,0,b,l)) -#else -# define SPI_RECVBLOCK(d,b,l) ((d)->ops->recvblock(d,b,l)) -#endif - -/**************************************************************************** - * Name: SPI_EXCHANGE - * - * Description: - * Exahange a block of data from SPI. Required. - * - * Input Parameters: - * dev - Device-specific state data - * txbuffer - A pointer to the buffer of data to be sent - * rxbuffer - A pointer to the buffer in which to recieve data - * nwords - the length of data that to be exchanged in units of words. - * The wordsize is determined by the number of bits-per-word - * selected for the SPI interface. If nbits <= 8, the data is - * packed into uint8_t's; if nbits >8, the data is packed into - * uint16_t's - * - * Returned Value: - * None - * - ****************************************************************************/ - -#ifdef CONFIG_SPI_EXCHANGE -# define SPI_EXCHANGE(d,t,r,l) ((d)->ops->exchange(d,t,r,l)) -#endif - -/**************************************************************************** - * Name: SPI_REGISTERCALLBACK - * - * Description: - * Register a callback that that will be invoked on any media status - * change (i.e, anything that would be reported differently by SPI_STATUS). - * Optional - * - * Input Parameters: - * dev - Device-specific state data - * callback - The funtion to call on the media change - * arg - A caller provided value to return with the callback - * - * Returned Value: - * 0 on success; negated errno on failure. - * - ****************************************************************************/ - -#define SPI_REGISTERCALLBACK(d,c,a) \ - ((d)->ops->registercallback ? (d)->ops->registercallback(d,c,a) : -ENOSYS) - -/**************************************************************************** - * Public Types - ****************************************************************************/ - -/* The type of the media change callback function */ - -typedef void (*spi_mediachange_t)(FAR void *arg); - -/* If the board supports multiple SPI devices, this enumeration identifies - * which is selected or de-seleted. - */ - -enum spi_dev_e -{ - SPIDEV_NONE = 0, /* Not a valid value */ - SPIDEV_MMCSD, /* Select SPI MMC/SD device */ - SPIDEV_FLASH, /* Select SPI FLASH device */ - SPIDEV_ETHERNET, /* Select SPI ethernet device */ - SPIDEV_DISPLAY, /* Select SPI LCD/OLED display device */ - SPIDEV_WIRELESS, /* Select SPI Wireless device */ - SPIDEV_TOUCHSCREEN, /* Select SPI touchscreen device */ - SPIDEV_EXPANDER, /* Select SPI I/O expander device */ - SPIDEV_MUX, /* Select SPI multiplexer device */ - SPIDEV_AUDIO_DATA, /* Select SPI audio codec device data port */ - SPIDEV_AUDIO_CTRL, /* Select SPI audio codec device control port */ -}; - -/* Certain SPI devices may required differnt clocking modes */ - -enum spi_mode_e -{ - SPIDEV_MODE0 = 0, /* CPOL=0 CHPHA=0 */ - SPIDEV_MODE1, /* CPOL=0 CHPHA=1 */ - SPIDEV_MODE2, /* CPOL=1 CHPHA=0 */ - SPIDEV_MODE3 /* CPOL=1 CHPHA=1 */ -}; - -/* The SPI vtable */ - -struct spi_dev_s; -struct spi_ops_s -{ -#ifndef CONFIG_SPI_OWNBUS - int (*lock)(FAR struct spi_dev_s *dev, bool lock); -#endif - void (*select)(FAR struct spi_dev_s *dev, enum spi_dev_e devid, - bool selected); - uint32_t (*setfrequency)(FAR struct spi_dev_s *dev, uint32_t frequency); - void (*setmode)(FAR struct spi_dev_s *dev, enum spi_mode_e mode); - void (*setbits)(FAR struct spi_dev_s *dev, int nbits); - uint8_t (*status)(FAR struct spi_dev_s *dev, enum spi_dev_e devid); -#ifdef CONFIG_SPI_CMDDATA - int (*cmddata)(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); -#endif - uint16_t (*send)(FAR struct spi_dev_s *dev, uint16_t wd); -#ifdef CONFIG_SPI_EXCHANGE - void (*exchange)(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords); -#else - void (*sndblock)(FAR struct spi_dev_s *dev, FAR const void *buffer, - size_t nwords); - void (*recvblock)(FAR struct spi_dev_s *dev, FAR void *buffer, - size_t nwords); -#endif - int (*registercallback)(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - void *arg); -}; - -/* SPI private data. This structure only defines the initial fields of the - * structure visible to the SPI client. The specific implementation may - * add additional, device specific fields - */ - -struct spi_dev_s -{ - const struct spi_ops_s *ops; -}; - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -#undef EXTERN -#if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" -{ -#else -#define EXTERN extern -#endif - -/**************************************************************************** - * Name: up_spiinitialize - * - * Description: - * Initialize the selected SPI port. - * - * This is a generic prototype for the SPI initialize logic. Specific - * architectures may support different SPI initialization functions if, - * for example, those architectures support multiple, incompatible SPI - * implementations. In any event, the prototype of those architecture- - * specific initialization functions should be the same as - * up_spiinitialize() - * - * As an example, the LPC17xx family supports an SPI block and several SSP - * blocks that may be programmed to support the SPI function. In this - * case, the LPC17xx architecture supports these two initialization - * functions: - * - * FAR struct spi_dev_s *lpc17_spiinitialize(int port); - * FAR struct spi_dev_s *lpc17_sspinitialize(int port); - * - * Another example would be the STM32 families that support both SPI - * blocks as well as USARTs that can be configured to perform the SPI - * function as well (the STM32 USARTs do not suppor SPI as of this - * writing). - * - * Input Parameter: - * Port number (for hardware that has mutiple SPI interfaces) - * - * Returned Value: - * Valid SPI device structure reference on succcess; a NULL on failure - * - ****************************************************************************/ - -FAR struct spi_dev_s *up_spiinitialize(int port); - -#undef EXTERN -#if defined(__cplusplus) -} -#endif -#endif /* __INCLUDE_NUTTX_SPI_H */ diff --git a/nuttx/include/nuttx/spi/spi.h b/nuttx/include/nuttx/spi/spi.h new file mode 100644 index 000000000..2cfe7644c --- /dev/null +++ b/nuttx/include/nuttx/spi/spi.h @@ -0,0 +1,469 @@ +/**************************************************************************** + * include/nuttx/spi/spi.h + * + * Copyright(C) 2008-2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __INCLUDE_NUTTX_SPI_SPI_H +#define __INCLUDE_NUTTX_SPI_SPI_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Configuration ************************************************************/ +/* CONFIG_SPI_OWNBUS - Set if there is only one active device on the SPI bus. + * No locking or SPI configuration will be performed. It is not necessary + * for clients to lock, re-configure, etc.. + * CONFIG_SPI_EXCHANGE - Driver supports a single exchange method + * (vs a recvblock() and sndblock ()methods). + * CONFIG_SPI_CMDDATA - Devices on the SPI bus require out-of-band support + * to distinguish command transfers from data transfers. Such devices + * will often support either 9-bit SPI (yech) or 8-bit SPI and a GPIO + * output that selects between command and data. + */ + +/* Access macros ************************************************************/ + +/**************************************************************************** + * Name: SPI_LOCK + * + * Description: + * On SPI busses where there are multiple devices, it will be necessary to + * lock SPI to have exclusive access to the busses for a sequence of + * transfers. The bus should be locked before the chip is selected. After + * locking the SPI bus, the caller should then also call the setfrequency, + * setbits, and setmode methods to make sure that the SPI is properly + * configured for the device. If the SPI buss is being shared, then it + * may have been left in an incompatible state. + * + * Input Parameters: + * dev - Device-specific state data + * lock - true: Lock spi bus, false: unlock SPI bus + * + * Returned Value: + * None + * + ****************************************************************************/ + +#ifndef CONFIG_SPI_OWNBUS +# define SPI_LOCK(d,l) (d)->ops->lock(d,l) +#else +# define SPI_LOCK(d,l) 0 +#endif + +/**************************************************************************** + * Name: SPI_SELECT + * + * Description: + * Enable/disable the SPI chip select. The implementation of this method + * must include handshaking: If a device is selected, it must hold off + * all other attempts to select the device until the device is deselected. + * Required. + * + * Input Parameters: + * dev - Device-specific state data + * devid - Identifies the device to select + * selected - true: slave selected, false: slave de-selected + * + * Returned Value: + * None + * + ****************************************************************************/ + +#define SPI_SELECT(d,id,s) ((d)->ops->select(d,id,s)) + +/**************************************************************************** + * Name: SPI_SETFREQUENCY + * + * Description: + * Set the SPI frequency. Required. + * + * Input Parameters: + * dev - Device-specific state data + * frequency - The SPI frequency requested + * + * Returned Value: + * Returns the actual frequency selected + * + ****************************************************************************/ + +#define SPI_SETFREQUENCY(d,f) ((d)->ops->setfrequency(d,f)) + +/**************************************************************************** + * Name: SPI_SETMODE + * + * Description: + * Set the SPI mode. Optional. See enum spi_mode_e for mode definitions. + * + * Input Parameters: + * dev - Device-specific state data + * mode - The SPI mode requested + * + * Returned Value: + * none + * + ****************************************************************************/ + +#define SPI_SETMODE(d,m) \ + do { if ((d)->ops->setmode) (d)->ops->setmode(d,m); } while (0) + +/**************************************************************************** + * Name: SPI_SETBITS + * + * Description: + * Set the number if bits per word. + * + * Input Parameters: + * dev - Device-specific state data + * nbits - The number of bits requests. + * If value is greater > 0 then it implies MSB first + * If value is below < 0, then it implies LSB first with -nbits + * + * Returned Value: + * none + * + ****************************************************************************/ + +#define SPI_SETBITS(d,b) \ + do { if ((d)->ops->setbits) (d)->ops->setbits(d,b); } while (0) + +/**************************************************************************** + * Name: SPI_STATUS + * + * Description: + * Get SPI/MMC status. Optional. + * + * Input Parameters: + * dev - Device-specific state data + * devid - Identifies the device to report status on + * + * Returned Value: + * Returns a bitset of status values (see SPI_STATUS_* defines) + * + ****************************************************************************/ + +#define SPI_STATUS(d,id) \ + ((d)->ops->status ? (d)->ops->status(d, id) : SPI_STATUS_PRESENT) + +/* SPI status bits -- Some dedicated for SPI MMC/SD support and may have no + * relationship to SPI other than needed by the SPI MMC/SD interface + */ + +#define SPI_STATUS_PRESENT 0x01 /* Bit 0=1: MMC/SD card present */ +#define SPI_STATUS_WRPROTECTED 0x02 /* Bit 1=1: MMC/SD card write protected */ + +/**************************************************************************** + * Name: SPI_CMDDATA + * + * Description: + * Some devices require and additional out-of-band bit to specify if the + * next word sent to the device is a command or data. This is typical, for + * example, in "9-bit" displays where the 9th bit is the CMD/DATA bit. + * This function provides selection of command or data. + * + * This "latches" the CMD/DATA state. It does not have to be called before + * every word is transferred; only when the CMD/DATA state changes. This + * method is required if CONFIG_SPI_CMDDATA is selected in the NuttX + * configuration + * + * Input Parameters: + * dev - Device-specific state data + * cmd - TRUE: The following word is a command; FALSE: the following words + * are data. + * + * Returned Value: + * OK unless an error occurs. Then a negated errno value is returned + * + ****************************************************************************/ + +#ifdef CONFIG_SPI_CMDDATA +# define SPI_CMDDATA(d,id,cmd) ((d)->ops->cmddata(d,id,cmd)) +#endif + +/**************************************************************************** + * Name: SPI_SEND + * + * Description: + * Exchange one word on SPI. Required. + * + * Input Parameters: + * dev - Device-specific state data + * wd - The word to send. the size of the data is determined by the + * number of bits selected for the SPI interface. + * + * Returned Value: + * Received value + * + ****************************************************************************/ + +#define SPI_SEND(d,wd) ((d)->ops->send(d,(uint16_t)wd)) + +/**************************************************************************** + * Name: SPI_SNDBLOCK + * + * Description: + * Send a block of data on SPI. Required. + * + * Input Parameters: + * dev - Device-specific state data + * buffer - A pointer to the buffer of data to be sent + * nwords - the length of data to send from the buffer in number of words. + * The wordsize is determined by the number of bits-per-word + * selected for the SPI interface. If nbits <= 8, the data is + * packed into uint8_t's; if nbits >8, the data is packed into + * uint16_t's + * + * Returned Value: + * None + * + ****************************************************************************/ + +#ifdef CONFIG_SPI_EXCHANGE +# define SPI_SNDBLOCK(d,b,l) ((d)->ops->exchange(d,b,0,l)) +#else +# define SPI_SNDBLOCK(d,b,l) ((d)->ops->sndblock(d,b,l)) +#endif + +/**************************************************************************** + * Name: SPI_RECVBLOCK + * + * Description: + * Receive a block of data from SPI. Required. + * + * Input Parameters: + * dev - Device-specific state data + * buffer - A pointer to the buffer in which to recieve data + * nwords - the length of data that can be received in the buffer in number + * of words. The wordsize is determined by the number of bits- + * per-word selected for the SPI interface. If nbits <= 8, the + * data is packed into uint8_t's; if nbits >8, the data is packed + * into uint16_t's + * + * Returned Value: + * None + * + ****************************************************************************/ + +#ifdef CONFIG_SPI_EXCHANGE +# define SPI_RECVBLOCK(d,b,l) ((d)->ops->exchange(d,0,b,l)) +#else +# define SPI_RECVBLOCK(d,b,l) ((d)->ops->recvblock(d,b,l)) +#endif + +/**************************************************************************** + * Name: SPI_EXCHANGE + * + * Description: + * Exahange a block of data from SPI. Required. + * + * Input Parameters: + * dev - Device-specific state data + * txbuffer - A pointer to the buffer of data to be sent + * rxbuffer - A pointer to the buffer in which to recieve data + * nwords - the length of data that to be exchanged in units of words. + * The wordsize is determined by the number of bits-per-word + * selected for the SPI interface. If nbits <= 8, the data is + * packed into uint8_t's; if nbits >8, the data is packed into + * uint16_t's + * + * Returned Value: + * None + * + ****************************************************************************/ + +#ifdef CONFIG_SPI_EXCHANGE +# define SPI_EXCHANGE(d,t,r,l) ((d)->ops->exchange(d,t,r,l)) +#endif + +/**************************************************************************** + * Name: SPI_REGISTERCALLBACK + * + * Description: + * Register a callback that that will be invoked on any media status + * change (i.e, anything that would be reported differently by SPI_STATUS). + * Optional + * + * Input Parameters: + * dev - Device-specific state data + * callback - The funtion to call on the media change + * arg - A caller provided value to return with the callback + * + * Returned Value: + * 0 on success; negated errno on failure. + * + ****************************************************************************/ + +#define SPI_REGISTERCALLBACK(d,c,a) \ + ((d)->ops->registercallback ? (d)->ops->registercallback(d,c,a) : -ENOSYS) + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +/* The type of the media change callback function */ + +typedef void (*spi_mediachange_t)(FAR void *arg); + +/* If the board supports multiple SPI devices, this enumeration identifies + * which is selected or de-seleted. + */ + +enum spi_dev_e +{ + SPIDEV_NONE = 0, /* Not a valid value */ + SPIDEV_MMCSD, /* Select SPI MMC/SD device */ + SPIDEV_FLASH, /* Select SPI FLASH device */ + SPIDEV_ETHERNET, /* Select SPI ethernet device */ + SPIDEV_DISPLAY, /* Select SPI LCD/OLED display device */ + SPIDEV_WIRELESS, /* Select SPI Wireless device */ + SPIDEV_TOUCHSCREEN, /* Select SPI touchscreen device */ + SPIDEV_EXPANDER, /* Select SPI I/O expander device */ + SPIDEV_MUX, /* Select SPI multiplexer device */ + SPIDEV_AUDIO_DATA, /* Select SPI audio codec device data port */ + SPIDEV_AUDIO_CTRL, /* Select SPI audio codec device control port */ +}; + +/* Certain SPI devices may required differnt clocking modes */ + +enum spi_mode_e +{ + SPIDEV_MODE0 = 0, /* CPOL=0 CHPHA=0 */ + SPIDEV_MODE1, /* CPOL=0 CHPHA=1 */ + SPIDEV_MODE2, /* CPOL=1 CHPHA=0 */ + SPIDEV_MODE3 /* CPOL=1 CHPHA=1 */ +}; + +/* The SPI vtable */ + +struct spi_dev_s; +struct spi_ops_s +{ +#ifndef CONFIG_SPI_OWNBUS + int (*lock)(FAR struct spi_dev_s *dev, bool lock); +#endif + void (*select)(FAR struct spi_dev_s *dev, enum spi_dev_e devid, + bool selected); + uint32_t (*setfrequency)(FAR struct spi_dev_s *dev, uint32_t frequency); + void (*setmode)(FAR struct spi_dev_s *dev, enum spi_mode_e mode); + void (*setbits)(FAR struct spi_dev_s *dev, int nbits); + uint8_t (*status)(FAR struct spi_dev_s *dev, enum spi_dev_e devid); +#ifdef CONFIG_SPI_CMDDATA + int (*cmddata)(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); +#endif + uint16_t (*send)(FAR struct spi_dev_s *dev, uint16_t wd); +#ifdef CONFIG_SPI_EXCHANGE + void (*exchange)(FAR struct spi_dev_s *dev, FAR const void *txbuffer, + FAR void *rxbuffer, size_t nwords); +#else + void (*sndblock)(FAR struct spi_dev_s *dev, FAR const void *buffer, + size_t nwords); + void (*recvblock)(FAR struct spi_dev_s *dev, FAR void *buffer, + size_t nwords); +#endif + int (*registercallback)(FAR struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); +}; + +/* SPI private data. This structure only defines the initial fields of the + * structure visible to the SPI client. The specific implementation may + * add additional, device specific fields + */ + +struct spi_dev_s +{ + FAR const struct spi_ops_s *ops; +}; + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Name: up_spiinitialize + * + * Description: + * Initialize the selected SPI port. + * + * This is a generic prototype for the SPI initialize logic. Specific + * architectures may support different SPI initialization functions if, + * for example, those architectures support multiple, incompatible SPI + * implementations. In any event, the prototype of those architecture- + * specific initialization functions should be the same as + * up_spiinitialize() + * + * As an example, the LPC17xx family supports an SPI block and several SSP + * blocks that may be programmed to support the SPI function. In this + * case, the LPC17xx architecture supports these two initialization + * functions: + * + * FAR struct spi_dev_s *lpc17_spiinitialize(int port); + * FAR struct spi_dev_s *lpc17_sspinitialize(int port); + * + * Another example would be the STM32 families that support both SPI + * blocks as well as USARTs that can be configured to perform the SPI + * function as well (the STM32 USARTs do not suppor SPI as of this + * writing). + * + * Input Parameter: + * Port number (for hardware that has mutiple SPI interfaces) + * + * Returned Value: + * Valid SPI device structure reference on succcess; a NULL on failure + * + ****************************************************************************/ + +FAR struct spi_dev_s *up_spiinitialize(int port); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif +#endif /* __INCLUDE_NUTTX_SPI_SPI_H */ diff --git a/nuttx/include/nuttx/wireless/cc1101.h b/nuttx/include/nuttx/wireless/cc1101.h index 80d3dbec3..032a4abf3 100644 --- a/nuttx/include/nuttx/wireless/cc1101.h +++ b/nuttx/include/nuttx/wireless/cc1101.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/nuttx/include/nuttx/wireless/nrf24l01.h b/nuttx/include/nuttx/wireless/nrf24l01.h index d23aa3650..3e2a41ac1 100644 --- a/nuttx/include/nuttx/wireless/nrf24l01.h +++ b/nuttx/include/nuttx/wireless/nrf24l01.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include +#include #include #include -- cgit v1.2.3