summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch/arm/src')
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_power.c2
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_spi.c2
-rw-r--r--nuttx/arch/arm/src/imx/imx_cspi.h4
-rw-r--r--nuttx/arch/arm/src/imx/imx_spi.c2
-rw-r--r--nuttx/arch/arm/src/kinetis/kinetis_internal.h2
-rwxr-xr-xnuttx/arch/arm/src/kl/kl_spi.c2
-rw-r--r--nuttx/arch/arm/src/kl/kl_spi.h2
-rw-r--r--nuttx/arch/arm/src/lm/lm_ssi.c2
-rw-r--r--nuttx/arch/arm/src/lm/lm_ssi.h2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_spi.c2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_spi.h6
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h6
-rw-r--r--nuttx/arch/arm/src/lpc31xx/lpc31_internal.h2
-rw-r--r--nuttx/arch/arm/src/lpc31xx/lpc31_spi.c2
-rw-r--r--nuttx/arch/arm/src/lpc43xx/lpc43_spi.c2
-rw-r--r--nuttx/arch/arm/src/lpc43xx/lpc43_spi.h4
-rw-r--r--nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c2
-rw-r--r--nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h4
-rw-r--r--nuttx/arch/arm/src/sam34/sam_spi.c4
-rw-r--r--nuttx/arch/arm/src/sam34/sam_spi.h4
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_spi.c4
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_spi.h2
23 files changed, 33 insertions, 33 deletions
diff --git a/nuttx/arch/arm/src/calypso/calypso_power.c b/nuttx/arch/arm/src/calypso/calypso_power.c
index f85d6890e..03db7def7 100644
--- a/nuttx/arch/arm/src/calypso/calypso_power.c
+++ b/nuttx/arch/arm/src/calypso/calypso_power.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
int board_power_off(void)
{
diff --git a/nuttx/arch/arm/src/calypso/calypso_spi.c b/nuttx/arch/arm/src/calypso/calypso_spi.c
index 8c7db775d..fda4415c2 100644
--- a/nuttx/arch/arm/src/calypso/calypso_spi.c
+++ b/nuttx/arch/arm/src/calypso/calypso_spi.c
@@ -38,7 +38,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <unistd.h>
#include <debug.h>
diff --git a/nuttx/arch/arm/src/imx/imx_cspi.h b/nuttx/arch/arm/src/imx/imx_cspi.h
index 1a60730d5..0c8c0f9d9 100644
--- a/nuttx/arch/arm/src/imx/imx_cspi.h
+++ b/nuttx/arch/arm/src/imx/imx_cspi.h
@@ -43,7 +43,7 @@
#ifndef __ASSEMBLY__
# include <stdint.h>
# include <stdbool.h>
-# include <nuttx/spi.h>
+# include <nuttx/spi/spi.h>
#endif
/************************************************************************************
@@ -179,7 +179,7 @@ extern "C" {
/* The external functions, imx_spiselect, imx_spistatus, and imx_cmddaa must be
* provided by board-specific logic. These are implementations of the select and
* status methods of the SPI interface defined by struct spi_ops_s (see
- * include/nuttx/spi.h). All other methods (including up_spiinitialize()) are
+ * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize()) are
* provided by common logic. To use this common SPI logic on your board:
*
* 1. Provide imx_spiselect() and imx_spistatus() functions in your board-specific
diff --git a/nuttx/arch/arm/src/imx/imx_spi.c b/nuttx/arch/arm/src/imx/imx_spi.c
index 4d846af3c..0243b67df 100644
--- a/nuttx/arch/arm/src/imx/imx_spi.c
+++ b/nuttx/arch/arm/src/imx/imx_spi.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <arch/irq.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_internal.h b/nuttx/arch/arm/src/kinetis/kinetis_internal.h
index 3b1525355..3932d72b3 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_internal.h
+++ b/nuttx/arch/arm/src/kinetis/kinetis_internal.h
@@ -589,7 +589,7 @@ void kinetis_clrpend(int irq);
* Description:
* These external functions must be provided by board-specific logic. They are
* implementations of the select, status, and cmddata methods of the SPI interface
- * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* including up_spiinitialize()) are provided by common Kinetis logic. To use
* this common SPI logic on your board:
*
diff --git a/nuttx/arch/arm/src/kl/kl_spi.c b/nuttx/arch/arm/src/kl/kl_spi.c
index 26e914ab9..3d50af859 100755
--- a/nuttx/arch/arm/src/kl/kl_spi.c
+++ b/nuttx/arch/arm/src/kl/kl_spi.c
@@ -45,7 +45,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <arch/irq.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/arm/src/kl/kl_spi.h b/nuttx/arch/arm/src/kl/kl_spi.h
index 7b5e56d4b..acc32083d 100644
--- a/nuttx/arch/arm/src/kl/kl_spi.h
+++ b/nuttx/arch/arm/src/kl/kl_spi.h
@@ -89,7 +89,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port);
* Description:
* These external functions must be provided by board-specific logic. They are
* implementations of the select, status, and cmddata methods of the SPI interface
- * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* including up_spiinitialize()) are provided by common Kinetis logic. To use
* this common SPI logic on your board:
*
diff --git a/nuttx/arch/arm/src/lm/lm_ssi.c b/nuttx/arch/arm/src/lm/lm_ssi.c
index dae08e092..d6769e2da 100644
--- a/nuttx/arch/arm/src/lm/lm_ssi.c
+++ b/nuttx/arch/arm/src/lm/lm_ssi.c
@@ -47,7 +47,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <arch/irq.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/arm/src/lm/lm_ssi.h b/nuttx/arch/arm/src/lm/lm_ssi.h
index 07cd2ce77..f1c7be155 100644
--- a/nuttx/arch/arm/src/lm/lm_ssi.h
+++ b/nuttx/arch/arm/src/lm/lm_ssi.h
@@ -76,7 +76,7 @@ extern "C"
* The external functions, lm_spiselect, lm_spistatus, and
* lm_spicmddata must be provided by board-specific logic. These are
* implementations of the select, status, and cmddata methods of the SPI
- * interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
* All other methods (including up_spiinitialize()) are provided by common
* logic. To use this common SPI logic on your board:
*
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c
index 4eccb290b..5184e11c9 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -48,7 +48,7 @@
#include <arch/board/board.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h
index 3d4620b52..8345f46de 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_spi.h
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "chip/lpc17_spi.h"
@@ -92,7 +92,7 @@ FAR struct spi_dev_s *lpc17_spiinitialize(int port);
* Description:
* These external functions must be provided by board-specific logic. They are
* implementations of the select, status, and cmddata methods of the SPI interface
- * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* including lpc17_spiinitialize()) are provided by common LPC17xx logic. To use
* this common SPI logic on your board:
*
@@ -144,7 +144,7 @@ void spi_flush(FAR struct spi_dev_s *dev);
* MMC/SD drvier when an SD card is inserted or removed, then
* CONFIG_SPI_CALLBACK should be defined and the following function must
* must be implemented. These functions implements the registercallback
- * method of the SPI interface (see include/nuttx/spi.h for details)
+ * method of the SPI interface (see include/nuttx/spi/spi.h for details)
*
* Input Parameters:
* dev - Device-specific state data
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
index 11f8da38b..08599e68e 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -48,7 +48,7 @@
#include <arch/board/board.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h
index add469661..31e82096b 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.h
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "chip/lpc17_ssp.h"
@@ -92,7 +92,7 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port);
* Description:
* These external functions must be provided by board-specific logic. They are
* implementations of the select, status, and cmddata methods of the SPI interface
- * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* including lpc17_sspinitialize()) are provided by common LPC17xx logic. To use
* this common SPI logic on your board:
*
@@ -156,7 +156,7 @@ void ssp_flush(FAR struct spi_dev_s *dev);
* MMC/SD drvier when an SD card is inserted or removed, then
* CONFIG_SPI_CALLBACK should be defined and the following function(s) must
* must be implemented. These functiosn implements the registercallback
- * method of the SPI interface (see include/nuttx/spi.h for details)
+ * method of the SPI interface (see include/nuttx/spi/spi.h for details)
*
* Input Parameters:
* dev - Device-specific state data
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h b/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h
index f68384b7e..e7d0e0e35 100644
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_internal.h
@@ -176,7 +176,7 @@ EXTERN void lpc31_clockconfig(void);
* The external functions, lpc31_spiselect, lpc31_spistatus, and
* lpc31_spicmddata must be provided by board-specific logic. These are
* implementations of the select, status, and cmddata methods of the SPI interface
- * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* (including up_spiinitialize()) are provided by common LPC31XX logic. To use
* this common SPI logic on your board:
*
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c
index 6f04af303..19e3e3592 100644
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_spi.c
@@ -48,7 +48,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c
index 52910a4a1..1058c85c9 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -48,7 +48,7 @@
#include <arch/board/board.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h
index 28c833826..821c59988 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_spi.h
@@ -41,7 +41,7 @@
************************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "chip/lpc43_spi.h"
#ifdef CONFIG_LPC43_SPI
@@ -153,7 +153,7 @@ EXTERN void spi_flush(FAR struct spi_dev_s *dev);
* MMC/SD drvier when an SD card is inserted or removed, then
* CONFIG_SPI_CALLBACK should be defined and the following function(s) must
* must be implemented. These functiosn implements the registercallback
- * method of the SPI interface (see include/nuttx/spi.h for details)
+ * method of the SPI interface (see include/nuttx/spi/spi.h for details)
*
* Input Parameters:
* dev - Device-specific state data
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c
index 4a749825a..a7efe8471 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -48,7 +48,7 @@
#include <arch/board/board.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h
index cec08e5d0..b8404d1bd 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_ssp.h
@@ -41,7 +41,7 @@
************************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "chip/lpc43_ssp.h"
#if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
@@ -163,7 +163,7 @@ EXTERN void ssp_flush(FAR struct spi_dev_s *dev);
* MMC/SD drvier when an SD card is inserted or removed, then
* CONFIG_SPI_CALLBACK should be defined and the following function(s) must
* must be implemented. These functiosn implements the registercallback
- * method of the SPI interface (see include/nuttx/spi.h for details)
+ * method of the SPI interface (see include/nuttx/spi/spi.h for details)
*
* Input Parameters:
* dev - Device-specific state data
diff --git a/nuttx/arch/arm/src/sam34/sam_spi.c b/nuttx/arch/arm/src/sam34/sam_spi.c
index 4c8832aef..d440a2a34 100644
--- a/nuttx/arch/arm/src/sam34/sam_spi.c
+++ b/nuttx/arch/arm/src/sam34/sam_spi.c
@@ -50,7 +50,7 @@
#include <arch/board/board.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include "up_internal.h"
#include "up_arch.h"
@@ -193,7 +193,7 @@ static const struct spi_ops_s g_spiops =
};
#ifdef CONFIG_SPI_OWNBUS
-/* Single chip select device structure structure */
+/* Single chip select device structure */
static struct sam_spidev_s g_spidev;
diff --git a/nuttx/arch/arm/src/sam34/sam_spi.h b/nuttx/arch/arm/src/sam34/sam_spi.h
index a3150fffd..0c0d0d41d 100644
--- a/nuttx/arch/arm/src/sam34/sam_spi.h
+++ b/nuttx/arch/arm/src/sam34/sam_spi.h
@@ -88,7 +88,7 @@ extern "C"
* o sam_spiselect is a functions tomanage the board-specific chip selects
* o sam_spistatus and sam_spicmddata: Implementations of the status
* and cmddata methods of the SPI interface defined by struct spi_ops_
- * (see include/nuttx/spi.h). All other methods including
+ * (see include/nuttx/spi/spi.h). All other methods including
* up_spiinitialize()) are provided by common SAM3/4 logic.
*
* To use this common SPI logic on your board:
@@ -154,7 +154,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected);
* devid - Identifies the (logical) device
*
* Returned Values:
- * Bit-encoded SPI status (see include/nuttx/spi.h.
+ * Bit-encoded SPI status (see include/nuttx/spi/spi.h.
*
****************************************************************************/
diff --git a/nuttx/arch/arm/src/stm32/stm32_spi.c b/nuttx/arch/arm/src/stm32/stm32_spi.c
index 929dcef36..9bb072419 100644
--- a/nuttx/arch/arm/src/stm32/stm32_spi.c
+++ b/nuttx/arch/arm/src/stm32/stm32_spi.c
@@ -37,7 +37,7 @@
* The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
* provided by board-specific logic. They are implementations of the select
* and status methods of the SPI interface defined by struct spi_ops_s (see
- * include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
* are provided by common STM32 logic. To use this common SPI logic on your
* board:
*
@@ -69,7 +69,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/arm/src/stm32/stm32_spi.h b/nuttx/arch/arm/src/stm32/stm32_spi.h
index 58c3f0da7..e40db48dd 100644
--- a/nuttx/arch/arm/src/stm32/stm32_spi.h
+++ b/nuttx/arch/arm/src/stm32/stm32_spi.h
@@ -77,7 +77,7 @@ enum spi_dev_e;
* The external functions, stm32_spi1/2/...select, stm32_spi1/2/...status, and
* stm32_spi1/2/...cmddata must be provided by board-specific logic. These are
* implementations of the select, status, and cmddata methods of the SPI interface
- * defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* (including up_spiinitialize()) are provided by common STM32 logic. To use this
* common SPI logic on your board:
*