From a954eb76b21562aa0e77b361b0c7d89dc5db9fc8 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 --- arch/arm/src/calypso/calypso_power.c | 2 +- arch/arm/src/calypso/calypso_spi.c | 2 +- arch/arm/src/imx/imx_cspi.h | 4 ++-- arch/arm/src/imx/imx_spi.c | 2 +- arch/arm/src/kinetis/kinetis_internal.h | 2 +- arch/arm/src/kl/kl_spi.c | 2 +- arch/arm/src/kl/kl_spi.h | 2 +- arch/arm/src/lm/lm_ssi.c | 2 +- arch/arm/src/lm/lm_ssi.h | 2 +- arch/arm/src/lpc17xx/lpc17_spi.c | 2 +- arch/arm/src/lpc17xx/lpc17_spi.h | 6 +++--- arch/arm/src/lpc17xx/lpc17_ssp.c | 2 +- arch/arm/src/lpc17xx/lpc17_ssp.h | 6 +++--- arch/arm/src/lpc31xx/lpc31_internal.h | 2 +- arch/arm/src/lpc31xx/lpc31_spi.c | 2 +- arch/arm/src/lpc43xx/lpc43_spi.c | 2 +- arch/arm/src/lpc43xx/lpc43_spi.h | 4 ++-- arch/arm/src/lpc43xx/lpc43_ssp.c | 2 +- arch/arm/src/lpc43xx/lpc43_ssp.h | 4 ++-- arch/arm/src/sam34/sam_spi.c | 4 ++-- arch/arm/src/sam34/sam_spi.h | 4 ++-- arch/arm/src/stm32/stm32_spi.c | 4 ++-- arch/arm/src/stm32/stm32_spi.h | 2 +- arch/avr/src/avr/avr_internal.h | 2 +- arch/avr/src/avr/up_spi.c | 2 +- arch/hc/src/m9s12/m9s12_internal.h | 4 ++-- arch/mips/src/pic32mx/pic32mx-internal.h | 4 ++-- arch/mips/src/pic32mx/pic32mx-spi.c | 2 +- arch/x86/src/qemu/qemu_internal.h | 4 ++-- arch/z80/src/ez80/ez80_spi.c | 2 +- arch/z80/src/ez80/ez80f91_spi.h | 4 ++-- 31 files changed, 45 insertions(+), 45 deletions(-) diff --git a/arch/arm/src/calypso/calypso_power.c b/arch/arm/src/calypso/calypso_power.c index f85d6890ee5..03db7def7f9 100644 --- a/arch/arm/src/calypso/calypso_power.c +++ b/arch/arm/src/calypso/calypso_power.c @@ -1,5 +1,5 @@ #include -#include +#include int board_power_off(void) { diff --git a/arch/arm/src/calypso/calypso_spi.c b/arch/arm/src/calypso/calypso_spi.c index 8c7db775dee..fda4415c23c 100644 --- a/arch/arm/src/calypso/calypso_spi.c +++ b/arch/arm/src/calypso/calypso_spi.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/arch/arm/src/imx/imx_cspi.h b/arch/arm/src/imx/imx_cspi.h index 1a60730d573..0c8c0f9d95c 100644 --- a/arch/arm/src/imx/imx_cspi.h +++ b/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/arch/arm/src/imx/imx_spi.c b/arch/arm/src/imx/imx_spi.c index 4d846af3cef..0243b67dfe6 100644 --- a/arch/arm/src/imx/imx_spi.c +++ b/arch/arm/src/imx/imx_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/src/kinetis/kinetis_internal.h b/arch/arm/src/kinetis/kinetis_internal.h index 3b1525355d4..3932d72b3d9 100644 --- a/arch/arm/src/kinetis/kinetis_internal.h +++ b/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/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c index 26e914ab91b..3d50af85946 100755 --- a/arch/arm/src/kl/kl_spi.c +++ b/arch/arm/src/kl/kl_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/src/kl/kl_spi.h b/arch/arm/src/kl/kl_spi.h index 7b5e56d4be9..acc32083da3 100644 --- a/arch/arm/src/kl/kl_spi.h +++ b/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/arch/arm/src/lm/lm_ssi.c b/arch/arm/src/lm/lm_ssi.c index dae08e09272..d6769e2da55 100644 --- a/arch/arm/src/lm/lm_ssi.c +++ b/arch/arm/src/lm/lm_ssi.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/src/lm/lm_ssi.h b/arch/arm/src/lm/lm_ssi.h index 07cd2ce77ca..f1c7be15518 100644 --- a/arch/arm/src/lm/lm_ssi.h +++ b/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/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c index 4eccb290b15..5184e11c971 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.c +++ b/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/arch/arm/src/lpc17xx/lpc17_spi.h b/arch/arm/src/lpc17xx/lpc17_spi.h index 3d4620b5277..8345f46deb9 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.h +++ b/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/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c index 11f8da38b92..08599e68eb0 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/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/arch/arm/src/lpc17xx/lpc17_ssp.h b/arch/arm/src/lpc17xx/lpc17_ssp.h index add4696617b..31e82096b00 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.h +++ b/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/arch/arm/src/lpc31xx/lpc31_internal.h b/arch/arm/src/lpc31xx/lpc31_internal.h index f68384b7edd..e7d0e0e3540 100644 --- a/arch/arm/src/lpc31xx/lpc31_internal.h +++ b/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/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c index 6f04af303d4..19e3e359245 100644 --- a/arch/arm/src/lpc31xx/lpc31_spi.c +++ b/arch/arm/src/lpc31xx/lpc31_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 52910a4a186..1058c85c965 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/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/arch/arm/src/lpc43xx/lpc43_spi.h b/arch/arm/src/lpc43xx/lpc43_spi.h index 28c8338269c..821c59988e4 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.h +++ b/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/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c index 4a749825a04..a7efe84713a 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/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/arch/arm/src/lpc43xx/lpc43_ssp.h b/arch/arm/src/lpc43xx/lpc43_ssp.h index cec08e5d03d..b8404d1bd29 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.h +++ b/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/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 4c8832aefc2..d440a2a3469 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/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/arch/arm/src/sam34/sam_spi.h b/arch/arm/src/sam34/sam_spi.h index a3150fffd68..0c0d0d41d84 100644 --- a/arch/arm/src/sam34/sam_spi.h +++ b/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/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c index 929dcef36d6..9bb072419cd 100644 --- a/arch/arm/src/stm32/stm32_spi.c +++ b/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/arch/arm/src/stm32/stm32_spi.h b/arch/arm/src/stm32/stm32_spi.h index 58c3f0da753..e40db48ddd1 100644 --- a/arch/arm/src/stm32/stm32_spi.h +++ b/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/arch/avr/src/avr/avr_internal.h b/arch/avr/src/avr/avr_internal.h index 2c78791e404..1c0038e449e 100644 --- a/arch/avr/src/avr/avr_internal.h +++ b/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/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c index c490eb02b09..8a243c2d93e 100644 --- a/arch/avr/src/avr/up_spi.c +++ b/arch/avr/src/avr/up_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/arch/hc/src/m9s12/m9s12_internal.h b/arch/hc/src/m9s12/m9s12_internal.h index 140aa0e5e8d..9076e490ddd 100644 --- a/arch/hc/src/m9s12/m9s12_internal.h +++ b/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/arch/mips/src/pic32mx/pic32mx-internal.h b/arch/mips/src/pic32mx/pic32mx-internal.h index 0af09a40c42..fca5d5cac6f 100644 --- a/arch/mips/src/pic32mx/pic32mx-internal.h +++ b/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/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c index 7bc1eee3e85..1a66326a4d3 100644 --- a/arch/mips/src/pic32mx/pic32mx-spi.c +++ b/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/arch/x86/src/qemu/qemu_internal.h b/arch/x86/src/qemu/qemu_internal.h index b63a7b68cd6..e324f9be83f 100644 --- a/arch/x86/src/qemu/qemu_internal.h +++ b/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/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c index 14f8e05f3b5..1cbe873f072 100644 --- a/arch/z80/src/ez80/ez80_spi.c +++ b/arch/z80/src/ez80/ez80_spi.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "up_internal.h" diff --git a/arch/z80/src/ez80/ez80f91_spi.h b/arch/z80/src/ez80/ez80f91_spi.h index 9fa42917b22..1ef3a755d64 100644 --- a/arch/z80/src/ez80/ez80f91_spi.h +++ b/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