From 17810f3e6f756aea304621a7ee8c0d6d83d071c7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 1 Jul 2013 08:11:54 -0600 Subject: [PATCH] Created new directories to hold SPI-related files --- configs/arduino-due/README.txt | 73 +++++++ configs/cloudctrl/src/up_spi.c | 4 +- configs/cloudctrl/src/up_w25.c | 2 +- configs/demo9s12ne64/src/up_spi.c | 4 +- configs/ea3131/src/up_fillpage.c | 2 +- configs/ea3131/src/up_spi.c | 4 +- configs/ea3152/src/up_fillpage.c | 2 +- configs/ea3152/src/up_spi.c | 4 +- configs/eagle100/src/up_nsh.c | 2 +- configs/eagle100/src/up_ssi.c | 4 +- configs/ekk-lm3s9b96/src/up_ssi.c | 4 +- configs/fire-stm32v2/src/up_enc28j60.c | 2 +- configs/fire-stm32v2/src/up_spi.c | 4 +- configs/fire-stm32v2/src/up_w25.c | 2 +- configs/freedom-kl25z/src/kl_spi.c | 8 +- configs/hymini-stm32v/src/up_boot.c | 2 +- configs/hymini-stm32v/src/up_nsh.c | 2 +- configs/hymini-stm32v/src/up_r61505u.c | 2 +- configs/hymini-stm32v/src/up_spi.c | 4 +- configs/hymini-stm32v/src/up_ts.c | 2 +- configs/kwikstik-k40/src/up_spi.c | 4 +- configs/lincoln60/src/up_nsh.c | 2 +- configs/lm3s6432-s2e/src/up_nsh.c | 2 +- configs/lm3s6432-s2e/src/up_ssi.c | 4 +- configs/lm3s6965-ek/src/up_nsh.c | 2 +- configs/lm3s6965-ek/src/up_oled.c | 4 +- configs/lm3s6965-ek/src/up_ssi.c | 4 +- configs/lm3s8962-ek/src/up_nsh.c | 2 +- configs/lm3s8962-ek/src/up_oled.c | 4 +- configs/lm3s8962-ek/src/up_ssi.c | 4 +- configs/lm4f120-launchpad/src/lm4f_nsh.c | 2 +- configs/lm4f120-launchpad/src/lm4f_ssi.c | 4 +- configs/lpcxpresso-lpc1768/src/up_nsh.c | 2 +- configs/lpcxpresso-lpc1768/src/up_oled.c | 4 +- configs/lpcxpresso-lpc1768/src/up_ssp.c | 4 +- configs/lpcxpresso-lpc1768/src/up_usbmsc.c | 2 +- configs/mbed/src/up_nsh.c | 2 +- configs/mcu123-lpc214x/src/up_composite.c | 2 +- configs/mcu123-lpc214x/src/up_nsh.c | 2 +- configs/mcu123-lpc214x/src/up_spi1.c | 2 +- configs/mcu123-lpc214x/src/up_usbmsc.c | 2 +- configs/mikroe-stm32f4/src/up_spi.c | 6 +- configs/mikroe-stm32f4/src/up_vs1053.c | 2 +- configs/mirtoo/README.txt | 2 +- configs/mirtoo/src/up_nsh.c | 2 +- configs/mirtoo/src/up_spi2.c | 4 +- configs/ne64badge/src/up_spi.c | 4 +- configs/nucleus2g/src/up_nsh.c | 2 +- configs/nucleus2g/src/up_ssp.c | 4 +- configs/nucleus2g/src/up_usbmsc.c | 2 +- configs/olimex-lpc1766stk/src/up_lcd.c | 2 +- configs/olimex-lpc1766stk/src/up_nsh.c | 2 +- configs/olimex-lpc1766stk/src/up_ssp.c | 6 +- configs/olimex-lpc1766stk/src/up_usbmsc.c | 2 +- configs/olimex-lpc2378/src/up_nsh.c | 2 +- configs/olimex-strp711/src/up_enc28j60.c | 2 +- configs/olimex-strp711/src/up_nsh.c | 2 +- configs/olimex-strp711/src/up_spi.c | 5 +- configs/open1788/src/lpc17_ssp.c | 4 +- configs/open1788/src/lpc17_touchscreen.c | 2 +- configs/pic32-starterkit/src/up_nsh.c | 2 +- configs/pic32-starterkit/src/up_spi.c | 4 +- configs/pic32mx7mmb/src/up_nsh.c | 2 +- configs/pic32mx7mmb/src/up_spi.c | 4 +- configs/sam3u-ek/src/up_spi.c | 6 +- configs/sam3u-ek/src/up_touchscreen.c | 2 +- configs/sam4l-xplained/src/sam_mmcsd.c | 2 +- configs/sam4l-xplained/src/sam_spi.c | 6 +- .../sam4l-xplained/src/sam_ug2832hsweg04.c | 2 +- configs/shenzhou/src/up_ili93xx.c | 2 +- configs/shenzhou/src/up_mmcsd.c | 2 +- configs/shenzhou/src/up_spi.c | 4 +- configs/shenzhou/src/up_ssd1289.c | 2 +- configs/shenzhou/src/up_touchscreen.c | 2 +- configs/shenzhou/src/up_w25.c | 2 +- configs/stm3210e-eval/src/up_lcd.c | 2 +- configs/stm3210e-eval/src/up_nsh.c | 2 +- configs/stm3210e-eval/src/up_spi.c | 4 +- configs/stm3220g-eval/src/up_lcd.c | 2 +- configs/stm3220g-eval/src/up_nsh.c | 2 +- configs/stm3220g-eval/src/up_spi.c | 4 +- configs/stm3240g-eval/src/up_lcd.c | 2 +- configs/stm3240g-eval/src/up_nsh.c | 2 +- configs/stm3240g-eval/src/up_spi.c | 4 +- configs/stm32_tiny/src/up_boot.c | 193 +++++++++--------- configs/stm32_tiny/src/up_spi.c | 4 +- configs/stm32_tiny/src/up_wireless.c | 2 +- configs/stm32f3discovery/src/up_spi.c | 6 +- configs/stm32f4discovery/src/up_spi.c | 6 +- configs/stm32f4discovery/src/up_ssd1289.c | 2 +- .../stm32f4discovery/src/up_ug2864ambag01.c | 2 +- .../stm32f4discovery/src/up_ug2864hsweg01.c | 2 +- configs/stm32ldiscovery/src/stm32_spi.c | 6 +- configs/sure-pic32mx/src/pic32mx_nsh.c | 2 +- configs/sure-pic32mx/src/pic32mx_spi.c | 4 +- configs/teensy/src/up_spi.c | 4 +- configs/teensy/src/up_usbmsc.c | 2 +- configs/twr-k60n512/src/up_spi.c | 4 +- configs/vsn/src/sif.c | 2 +- configs/vsn/src/spi.c | 4 +- configs/zkit-arm-1769/src/up_lcd.c | 4 +- configs/zkit-arm-1769/src/up_nsh.c | 2 +- configs/zkit-arm-1769/src/up_spi.c | 4 +- configs/zkit-arm-1769/src/up_ssp.c | 4 +- configs/zkit-arm-1769/src/up_usbmsc.c | 2 +- configs/zp214xpa/src/up_spi1.c | 2 +- configs/zp214xpa/src/up_ug2864ambag01.c | 2 +- 107 files changed, 327 insertions(+), 256 deletions(-) diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index 6ecba490cb..4e9a304d51 100644 --- a/configs/arduino-due/README.txt +++ b/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/configs/cloudctrl/src/up_spi.c b/configs/cloudctrl/src/up_spi.c index 84bf855958..f8bdef42dd 100644 --- a/configs/cloudctrl/src/up_spi.c +++ b/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/configs/cloudctrl/src/up_w25.c b/configs/cloudctrl/src/up_w25.c index 83ed67cc04..e4df22a173 100644 --- a/configs/cloudctrl/src/up_w25.c +++ b/configs/cloudctrl/src/up_w25.c @@ -49,7 +49,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include # include #endif diff --git a/configs/demo9s12ne64/src/up_spi.c b/configs/demo9s12ne64/src/up_spi.c index 8514b48ed1..5cd73e2e9a 100644 --- a/configs/demo9s12ne64/src/up_spi.c +++ b/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/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c index 09cbf6171d..f8ad374b15 100644 --- a/configs/ea3131/src/up_fillpage.c +++ b/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/configs/ea3131/src/up_spi.c b/configs/ea3131/src/up_spi.c index 18000d6b4e..dbf57f7e48 100644 --- a/configs/ea3131/src/up_spi.c +++ b/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/configs/ea3152/src/up_fillpage.c b/configs/ea3152/src/up_fillpage.c index a6b5f3590a..ce0d5246b9 100644 --- a/configs/ea3152/src/up_fillpage.c +++ b/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/configs/ea3152/src/up_spi.c b/configs/ea3152/src/up_spi.c index 2dd7b1e23d..d26a683d30 100644 --- a/configs/ea3152/src/up_spi.c +++ b/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/configs/eagle100/src/up_nsh.c b/configs/eagle100/src/up_nsh.c index b1df8cde6e..4b81631824 100644 --- a/configs/eagle100/src/up_nsh.c +++ b/configs/eagle100/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/eagle100/src/up_ssi.c b/configs/eagle100/src/up_ssi.c index c18cf52a52..3df62a3c07 100644 --- a/configs/eagle100/src/up_ssi.c +++ b/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/configs/ekk-lm3s9b96/src/up_ssi.c b/configs/ekk-lm3s9b96/src/up_ssi.c index d7ee0ef16c..b737f2a0a5 100644 --- a/configs/ekk-lm3s9b96/src/up_ssi.c +++ b/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/configs/fire-stm32v2/src/up_enc28j60.c b/configs/fire-stm32v2/src/up_enc28j60.c index d930d01129..7033b2fcf0 100644 --- a/configs/fire-stm32v2/src/up_enc28j60.c +++ b/configs/fire-stm32v2/src/up_enc28j60.c @@ -55,7 +55,7 @@ #include #include -#include +#include #include #include diff --git a/configs/fire-stm32v2/src/up_spi.c b/configs/fire-stm32v2/src/up_spi.c index 78a3bc2550..494fe0f980 100644 --- a/configs/fire-stm32v2/src/up_spi.c +++ b/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/configs/fire-stm32v2/src/up_w25.c b/configs/fire-stm32v2/src/up_w25.c index e78b50ed23..56bbde6344 100644 --- a/configs/fire-stm32v2/src/up_w25.c +++ b/configs/fire-stm32v2/src/up_w25.c @@ -48,7 +48,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include # include #endif diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c index 4d927d89b7..f3215ff0ef 100644 --- a/configs/freedom-kl25z/src/kl_spi.c +++ b/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/configs/hymini-stm32v/src/up_boot.c b/configs/hymini-stm32v/src/up_boot.c index eb958e3c90..db4ad0c81f 100644 --- a/configs/hymini-stm32v/src/up_boot.c +++ b/configs/hymini-stm32v/src/up_boot.c @@ -40,7 +40,7 @@ ************************************************************************************/ #include -#include +#include #include #include diff --git a/configs/hymini-stm32v/src/up_nsh.c b/configs/hymini-stm32v/src/up_nsh.c index 780b2171b2..e8019ae087 100644 --- a/configs/hymini-stm32v/src/up_nsh.c +++ b/configs/hymini-stm32v/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/configs/hymini-stm32v/src/up_r61505u.c b/configs/hymini-stm32v/src/up_r61505u.c index 625d5693f7..e05c756910 100755 --- a/configs/hymini-stm32v/src/up_r61505u.c +++ b/configs/hymini-stm32v/src/up_r61505u.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/configs/hymini-stm32v/src/up_spi.c b/configs/hymini-stm32v/src/up_spi.c index db0bb61bc5..8e21b96cf0 100644 --- a/configs/hymini-stm32v/src/up_spi.c +++ b/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/configs/hymini-stm32v/src/up_ts.c b/configs/hymini-stm32v/src/up_ts.c index 46765e0aad..bc105124a3 100644 --- a/configs/hymini-stm32v/src/up_ts.c +++ b/configs/hymini-stm32v/src/up_ts.c @@ -36,7 +36,7 @@ ************************************************************************************/ #include -#include +#include #include #include diff --git a/configs/kwikstik-k40/src/up_spi.c b/configs/kwikstik-k40/src/up_spi.c index e88721dda5..acb1ca1c9d 100644 --- a/configs/kwikstik-k40/src/up_spi.c +++ b/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/configs/lincoln60/src/up_nsh.c b/configs/lincoln60/src/up_nsh.c index a4a6794150..0dda48bb2f 100644 --- a/configs/lincoln60/src/up_nsh.c +++ b/configs/lincoln60/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/lm3s6432-s2e/src/up_nsh.c b/configs/lm3s6432-s2e/src/up_nsh.c index 75107be228..a480ade46e 100644 --- a/configs/lm3s6432-s2e/src/up_nsh.c +++ b/configs/lm3s6432-s2e/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/lm3s6432-s2e/src/up_ssi.c b/configs/lm3s6432-s2e/src/up_ssi.c index 5468e2b4d8..986e79d311 100644 --- a/configs/lm3s6432-s2e/src/up_ssi.c +++ b/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/configs/lm3s6965-ek/src/up_nsh.c b/configs/lm3s6965-ek/src/up_nsh.c index 24b8b0206a..92a19e5007 100644 --- a/configs/lm3s6965-ek/src/up_nsh.c +++ b/configs/lm3s6965-ek/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/lm3s6965-ek/src/up_oled.c b/configs/lm3s6965-ek/src/up_oled.c index 07e7859b4a..5760a6974a 100644 --- a/configs/lm3s6965-ek/src/up_oled.c +++ b/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/configs/lm3s6965-ek/src/up_ssi.c b/configs/lm3s6965-ek/src/up_ssi.c index 92138f3a69..934e01afa0 100644 --- a/configs/lm3s6965-ek/src/up_ssi.c +++ b/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/configs/lm3s8962-ek/src/up_nsh.c b/configs/lm3s8962-ek/src/up_nsh.c index f12c48988e..13985a25c9 100644 --- a/configs/lm3s8962-ek/src/up_nsh.c +++ b/configs/lm3s8962-ek/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/lm3s8962-ek/src/up_oled.c b/configs/lm3s8962-ek/src/up_oled.c index 05934e8bd7..958333359f 100644 --- a/configs/lm3s8962-ek/src/up_oled.c +++ b/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/configs/lm3s8962-ek/src/up_ssi.c b/configs/lm3s8962-ek/src/up_ssi.c index 50344857a1..14af5eac93 100644 --- a/configs/lm3s8962-ek/src/up_ssi.c +++ b/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/configs/lm4f120-launchpad/src/lm4f_nsh.c b/configs/lm4f120-launchpad/src/lm4f_nsh.c index ed1547e04c..22a9103d83 100644 --- a/configs/lm4f120-launchpad/src/lm4f_nsh.c +++ b/configs/lm4f120-launchpad/src/lm4f_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c index 29c31409e3..34a6cba9be 100644 --- a/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/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/configs/lpcxpresso-lpc1768/src/up_nsh.c b/configs/lpcxpresso-lpc1768/src/up_nsh.c index 644ac4d171..47c4dc0bb7 100644 --- a/configs/lpcxpresso-lpc1768/src/up_nsh.c +++ b/configs/lpcxpresso-lpc1768/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/lpcxpresso-lpc1768/src/up_oled.c b/configs/lpcxpresso-lpc1768/src/up_oled.c index 709eadcab7..89812fdee0 100644 --- a/configs/lpcxpresso-lpc1768/src/up_oled.c +++ b/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/configs/lpcxpresso-lpc1768/src/up_ssp.c b/configs/lpcxpresso-lpc1768/src/up_ssp.c index 014da6f1e7..f5655e3015 100644 --- a/configs/lpcxpresso-lpc1768/src/up_ssp.c +++ b/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/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/configs/lpcxpresso-lpc1768/src/up_usbmsc.c index 542a49a201..8266952a27 100644 --- a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c +++ b/configs/lpcxpresso-lpc1768/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/mbed/src/up_nsh.c b/configs/mbed/src/up_nsh.c index 883a0da158..ab865033ad 100644 --- a/configs/mbed/src/up_nsh.c +++ b/configs/mbed/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/mcu123-lpc214x/src/up_composite.c b/configs/mcu123-lpc214x/src/up_composite.c index 8feacc9712..b62519d52b 100644 --- a/configs/mcu123-lpc214x/src/up_composite.c +++ b/configs/mcu123-lpc214x/src/up_composite.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/configs/mcu123-lpc214x/src/up_nsh.c b/configs/mcu123-lpc214x/src/up_nsh.c index c4a56784fe..989dc2952c 100644 --- a/configs/mcu123-lpc214x/src/up_nsh.c +++ b/configs/mcu123-lpc214x/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/mcu123-lpc214x/src/up_spi1.c b/configs/mcu123-lpc214x/src/up_spi1.c index c10144d888..0a19a04838 100644 --- a/configs/mcu123-lpc214x/src/up_spi1.c +++ b/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/configs/mcu123-lpc214x/src/up_usbmsc.c b/configs/mcu123-lpc214x/src/up_usbmsc.c index f003d4c3c1..38f29bc1e4 100644 --- a/configs/mcu123-lpc214x/src/up_usbmsc.c +++ b/configs/mcu123-lpc214x/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/mikroe-stm32f4/src/up_spi.c b/configs/mikroe-stm32f4/src/up_spi.c index 448ed966a1..d13b946230 100644 --- a/configs/mikroe-stm32f4/src/up_spi.c +++ b/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/configs/mikroe-stm32f4/src/up_vs1053.c b/configs/mikroe-stm32f4/src/up_vs1053.c index cc7e0f96d5..b4a55c45a1 100644 --- a/configs/mikroe-stm32f4/src/up_vs1053.c +++ b/configs/mikroe-stm32f4/src/up_vs1053.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/configs/mirtoo/README.txt b/configs/mirtoo/README.txt index e5b33a9b5c..c2727c5b59 100644 --- a/configs/mirtoo/README.txt +++ b/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/configs/mirtoo/src/up_nsh.c b/configs/mirtoo/src/up_nsh.c index 33e0692e66..482e91445c 100644 --- a/configs/mirtoo/src/up_nsh.c +++ b/configs/mirtoo/src/up_nsh.c @@ -48,7 +48,7 @@ #include #ifdef CONFIG_PIC32MX_SPI2 -# include +# include # include # include #endif diff --git a/configs/mirtoo/src/up_spi2.c b/configs/mirtoo/src/up_spi2.c index 0565707106..3add97c03b 100644 --- a/configs/mirtoo/src/up_spi2.c +++ b/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/configs/ne64badge/src/up_spi.c b/configs/ne64badge/src/up_spi.c index 8d52b75708..eea74916a1 100644 --- a/configs/ne64badge/src/up_spi.c +++ b/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/configs/nucleus2g/src/up_nsh.c b/configs/nucleus2g/src/up_nsh.c index c19937bdc8..8dbdf91348 100644 --- a/configs/nucleus2g/src/up_nsh.c +++ b/configs/nucleus2g/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/nucleus2g/src/up_ssp.c b/configs/nucleus2g/src/up_ssp.c index 7a3d16a46f..0847a2189b 100644 --- a/configs/nucleus2g/src/up_ssp.c +++ b/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/configs/nucleus2g/src/up_usbmsc.c b/configs/nucleus2g/src/up_usbmsc.c index 5da9f948d1..3031106a06 100644 --- a/configs/nucleus2g/src/up_usbmsc.c +++ b/configs/nucleus2g/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/olimex-lpc1766stk/src/up_lcd.c b/configs/olimex-lpc1766stk/src/up_lcd.c index 1f4b7a8134..78a2c5717b 100644 --- a/configs/olimex-lpc1766stk/src/up_lcd.c +++ b/configs/olimex-lpc1766stk/src/up_lcd.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c index 2174856e56..07fe782044 100644 --- a/configs/olimex-lpc1766stk/src/up_nsh.c +++ b/configs/olimex-lpc1766stk/src/up_nsh.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/configs/olimex-lpc1766stk/src/up_ssp.c b/configs/olimex-lpc1766stk/src/up_ssp.c index 2fd75c6651..76d56f7355 100644 --- a/configs/olimex-lpc1766stk/src/up_ssp.c +++ b/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/configs/olimex-lpc1766stk/src/up_usbmsc.c b/configs/olimex-lpc1766stk/src/up_usbmsc.c index e86353a7e3..c144203947 100644 --- a/configs/olimex-lpc1766stk/src/up_usbmsc.c +++ b/configs/olimex-lpc1766stk/src/up_usbmsc.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "lpc17_gpio.h" diff --git a/configs/olimex-lpc2378/src/up_nsh.c b/configs/olimex-lpc2378/src/up_nsh.c index f5ec1fed85..6ff285bfa6 100644 --- a/configs/olimex-lpc2378/src/up_nsh.c +++ b/configs/olimex-lpc2378/src/up_nsh.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/olimex-strp711/src/up_enc28j60.c b/configs/olimex-strp711/src/up_enc28j60.c index 68ab0e7856..9b1860ea81 100644 --- a/configs/olimex-strp711/src/up_enc28j60.c +++ b/configs/olimex-strp711/src/up_enc28j60.c @@ -85,7 +85,7 @@ #include #include -#include +#include #include #include diff --git a/configs/olimex-strp711/src/up_nsh.c b/configs/olimex-strp711/src/up_nsh.c index 7499a8d8f3..e103723105 100644 --- a/configs/olimex-strp711/src/up_nsh.c +++ b/configs/olimex-strp711/src/up_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/olimex-strp711/src/up_spi.c b/configs/olimex-strp711/src/up_spi.c index 452a43fb7d..298f7140ed 100644 --- a/configs/olimex-strp711/src/up_spi.c +++ b/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/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c index 4f3995243d..c27e3c85f0 100644 --- a/configs/open1788/src/lpc17_ssp.c +++ b/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/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c index 099e4a9fe2..09dcb0a338 100644 --- a/configs/open1788/src/lpc17_touchscreen.c +++ b/configs/open1788/src/lpc17_touchscreen.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/configs/pic32-starterkit/src/up_nsh.c b/configs/pic32-starterkit/src/up_nsh.c index 02e6a93760..71909f92e3 100644 --- a/configs/pic32-starterkit/src/up_nsh.c +++ b/configs/pic32-starterkit/src/up_nsh.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/configs/pic32-starterkit/src/up_spi.c b/configs/pic32-starterkit/src/up_spi.c index 42e7c4b9cf..ca14501ccb 100644 --- a/configs/pic32-starterkit/src/up_spi.c +++ b/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/configs/pic32mx7mmb/src/up_nsh.c b/configs/pic32mx7mmb/src/up_nsh.c index 6feb7a2e1d..37ecc30950 100644 --- a/configs/pic32mx7mmb/src/up_nsh.c +++ b/configs/pic32mx7mmb/src/up_nsh.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/configs/pic32mx7mmb/src/up_spi.c b/configs/pic32mx7mmb/src/up_spi.c index add2b2d653..c3e90729ab 100644 --- a/configs/pic32mx7mmb/src/up_spi.c +++ b/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/configs/sam3u-ek/src/up_spi.c b/configs/sam3u-ek/src/up_spi.c index b42959a9bf..f06c37747e 100644 --- a/configs/sam3u-ek/src/up_spi.c +++ b/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/configs/sam3u-ek/src/up_touchscreen.c b/configs/sam3u-ek/src/up_touchscreen.c index d70ad52fbd..c3db19d04a 100644 --- a/configs/sam3u-ek/src/up_touchscreen.c +++ b/configs/sam3u-ek/src/up_touchscreen.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/configs/sam4l-xplained/src/sam_mmcsd.c b/configs/sam4l-xplained/src/sam_mmcsd.c index d432c56a90..55c244a8a3 100644 --- a/configs/sam4l-xplained/src/sam_mmcsd.c +++ b/configs/sam4l-xplained/src/sam_mmcsd.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include "sam4l-xplained.h" diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c index 49ae7b57c9..7fe719320b 100644 --- a/configs/sam4l-xplained/src/sam_spi.c +++ b/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/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c index b845b50840..e3900071e7 100644 --- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c +++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c @@ -80,7 +80,7 @@ #include -#include +#include #include #include diff --git a/configs/shenzhou/src/up_ili93xx.c b/configs/shenzhou/src/up_ili93xx.c index f090ced62b..3a37b4f401 100644 --- a/configs/shenzhou/src/up_ili93xx.c +++ b/configs/shenzhou/src/up_ili93xx.c @@ -121,7 +121,7 @@ #include #include -#include +#include #include #include diff --git a/configs/shenzhou/src/up_mmcsd.c b/configs/shenzhou/src/up_mmcsd.c index adf695cd5e..a4416af56b 100644 --- a/configs/shenzhou/src/up_mmcsd.c +++ b/configs/shenzhou/src/up_mmcsd.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/configs/shenzhou/src/up_spi.c b/configs/shenzhou/src/up_spi.c index 08c7969485..2a633cebd1 100644 --- a/configs/shenzhou/src/up_spi.c +++ b/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/configs/shenzhou/src/up_ssd1289.c b/configs/shenzhou/src/up_ssd1289.c index 8320a6c4e2..0443d970ea 100644 --- a/configs/shenzhou/src/up_ssd1289.c +++ b/configs/shenzhou/src/up_ssd1289.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/configs/shenzhou/src/up_touchscreen.c b/configs/shenzhou/src/up_touchscreen.c index 63602f1345..832b48515d 100644 --- a/configs/shenzhou/src/up_touchscreen.c +++ b/configs/shenzhou/src/up_touchscreen.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/configs/shenzhou/src/up_w25.c b/configs/shenzhou/src/up_w25.c index 01936997f3..dfbb18ef99 100644 --- a/configs/shenzhou/src/up_w25.c +++ b/configs/shenzhou/src/up_w25.c @@ -48,7 +48,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include # include #endif diff --git a/configs/stm3210e-eval/src/up_lcd.c b/configs/stm3210e-eval/src/up_lcd.c index 33eef2b302..9320a77890 100644 --- a/configs/stm3210e-eval/src/up_lcd.c +++ b/configs/stm3210e-eval/src/up_lcd.c @@ -68,7 +68,7 @@ #include #include -#include +#include #include #include diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c index 28996d2fdc..95f919fac3 100644 --- a/configs/stm3210e-eval/src/up_nsh.c +++ b/configs/stm3210e-eval/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/configs/stm3210e-eval/src/up_spi.c b/configs/stm3210e-eval/src/up_spi.c index 03fb715c9e..b34494a091 100644 --- a/configs/stm3210e-eval/src/up_spi.c +++ b/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/configs/stm3220g-eval/src/up_lcd.c b/configs/stm3220g-eval/src/up_lcd.c index ce406ce3d8..e03c89b035 100644 --- a/configs/stm3220g-eval/src/up_lcd.c +++ b/configs/stm3220g-eval/src/up_lcd.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/configs/stm3220g-eval/src/up_nsh.c b/configs/stm3220g-eval/src/up_nsh.c index 2387348ae7..afdd017981 100644 --- a/configs/stm3220g-eval/src/up_nsh.c +++ b/configs/stm3220g-eval/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/configs/stm3220g-eval/src/up_spi.c b/configs/stm3220g-eval/src/up_spi.c index eb4ba6bc68..8d44ce0fd4 100644 --- a/configs/stm3220g-eval/src/up_spi.c +++ b/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/configs/stm3240g-eval/src/up_lcd.c b/configs/stm3240g-eval/src/up_lcd.c index ff8c174df8..a12c18d3af 100644 --- a/configs/stm3240g-eval/src/up_lcd.c +++ b/configs/stm3240g-eval/src/up_lcd.c @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/configs/stm3240g-eval/src/up_nsh.c b/configs/stm3240g-eval/src/up_nsh.c index 49d8332970..3b1038747d 100644 --- a/configs/stm3240g-eval/src/up_nsh.c +++ b/configs/stm3240g-eval/src/up_nsh.c @@ -46,7 +46,7 @@ #include #ifdef CONFIG_STM32_SPI1 -# include +# include # include #endif diff --git a/configs/stm3240g-eval/src/up_spi.c b/configs/stm3240g-eval/src/up_spi.c index e7e8684c18..2278506262 100644 --- a/configs/stm3240g-eval/src/up_spi.c +++ b/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/configs/stm32_tiny/src/up_boot.c b/configs/stm32_tiny/src/up_boot.c index a4f3023399..525cae8fa7 100644 --- a/configs/stm32_tiny/src/up_boot.c +++ b/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/configs/stm32_tiny/src/up_spi.c b/configs/stm32_tiny/src/up_spi.c index ce41670ae6..e79361857b 100644 --- a/configs/stm32_tiny/src/up_spi.c +++ b/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/configs/stm32_tiny/src/up_wireless.c b/configs/stm32_tiny/src/up_wireless.c index 7e0c9f5bfe..59ec003473 100644 --- a/configs/stm32_tiny/src/up_wireless.c +++ b/configs/stm32_tiny/src/up_wireless.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/configs/stm32f3discovery/src/up_spi.c b/configs/stm32f3discovery/src/up_spi.c index 1a7a07354b..408b0df5d5 100644 --- a/configs/stm32f3discovery/src/up_spi.c +++ b/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/configs/stm32f4discovery/src/up_spi.c b/configs/stm32f4discovery/src/up_spi.c index d51a6d3d4f..599220a1ab 100644 --- a/configs/stm32f4discovery/src/up_spi.c +++ b/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/configs/stm32f4discovery/src/up_ssd1289.c b/configs/stm32f4discovery/src/up_ssd1289.c index 6eab054d3f..532603ba58 100644 --- a/configs/stm32f4discovery/src/up_ssd1289.c +++ b/configs/stm32f4discovery/src/up_ssd1289.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include diff --git a/configs/stm32f4discovery/src/up_ug2864ambag01.c b/configs/stm32f4discovery/src/up_ug2864ambag01.c index 42ad0c2a5e..d8e7c3a5ec 100644 --- a/configs/stm32f4discovery/src/up_ug2864ambag01.c +++ b/configs/stm32f4discovery/src/up_ug2864ambag01.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/configs/stm32f4discovery/src/up_ug2864hsweg01.c b/configs/stm32f4discovery/src/up_ug2864hsweg01.c index fbf414276b..edd7881338 100644 --- a/configs/stm32f4discovery/src/up_ug2864hsweg01.c +++ b/configs/stm32f4discovery/src/up_ug2864hsweg01.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c index a419d804df..f560c1fa81 100644 --- a/configs/stm32ldiscovery/src/stm32_spi.c +++ b/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/configs/sure-pic32mx/src/pic32mx_nsh.c b/configs/sure-pic32mx/src/pic32mx_nsh.c index 1145ff6d58..294afcb798 100644 --- a/configs/sure-pic32mx/src/pic32mx_nsh.c +++ b/configs/sure-pic32mx/src/pic32mx_nsh.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c index 95c3440a4c..40871648fd 100644 --- a/configs/sure-pic32mx/src/pic32mx_spi.c +++ b/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/configs/teensy/src/up_spi.c b/configs/teensy/src/up_spi.c index a4eed98364..828e30dbe5 100644 --- a/configs/teensy/src/up_spi.c +++ b/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/configs/teensy/src/up_usbmsc.c b/configs/teensy/src/up_usbmsc.c index 0b944eda39..2743dfbfb4 100644 --- a/configs/teensy/src/up_usbmsc.c +++ b/configs/teensy/src/up_usbmsc.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include "at90usb_internal.h" diff --git a/configs/twr-k60n512/src/up_spi.c b/configs/twr-k60n512/src/up_spi.c index 074dc5cd7f..afdc48f00d 100644 --- a/configs/twr-k60n512/src/up_spi.c +++ b/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/configs/vsn/src/sif.c b/configs/vsn/src/sif.c index 0269ebcab2..2dacc6f69e 100644 --- a/configs/vsn/src/sif.c +++ b/configs/vsn/src/sif.c @@ -79,7 +79,7 @@ #include #include -#include +#include #include #include diff --git a/configs/vsn/src/spi.c b/configs/vsn/src/spi.c index 7c028a9209..c0363063f9 100644 --- a/configs/vsn/src/spi.c +++ b/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/configs/zkit-arm-1769/src/up_lcd.c b/configs/zkit-arm-1769/src/up_lcd.c index e29996b31f..d459e1dc41 100644 --- a/configs/zkit-arm-1769/src/up_lcd.c +++ b/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/configs/zkit-arm-1769/src/up_nsh.c b/configs/zkit-arm-1769/src/up_nsh.c index 63553e5329..8d33478fa3 100644 --- a/configs/zkit-arm-1769/src/up_nsh.c +++ b/configs/zkit-arm-1769/src/up_nsh.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include "lpc17_spi.h" diff --git a/configs/zkit-arm-1769/src/up_spi.c b/configs/zkit-arm-1769/src/up_spi.c index 080f1efea5..d1bdb11d82 100644 --- a/configs/zkit-arm-1769/src/up_spi.c +++ b/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/configs/zkit-arm-1769/src/up_ssp.c b/configs/zkit-arm-1769/src/up_ssp.c index 8aa0828a35..4f640fe9d7 100644 --- a/configs/zkit-arm-1769/src/up_ssp.c +++ b/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/configs/zkit-arm-1769/src/up_usbmsc.c b/configs/zkit-arm-1769/src/up_usbmsc.c index 60f3e2dc2b..d6a9430da0 100644 --- a/configs/zkit-arm-1769/src/up_usbmsc.c +++ b/configs/zkit-arm-1769/src/up_usbmsc.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include "lpc17_spi.h" diff --git a/configs/zp214xpa/src/up_spi1.c b/configs/zp214xpa/src/up_spi1.c index 1ee1cac326..35a56a426b 100644 --- a/configs/zp214xpa/src/up_spi1.c +++ b/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/configs/zp214xpa/src/up_ug2864ambag01.c b/configs/zp214xpa/src/up_ug2864ambag01.c index 236f9fa411..2c2ae847ad 100644 --- a/configs/zp214xpa/src/up_ug2864ambag01.c +++ b/configs/zp214xpa/src/up_ug2864ambag01.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include