summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/analog/adc.h2
-rw-r--r--nuttx/include/nuttx/analog/dac.h2
-rw-r--r--nuttx/include/nuttx/analog/pga11x.h2
-rw-r--r--nuttx/include/nuttx/audio/audio.h2
-rw-r--r--nuttx/include/nuttx/audio/vs1053.h2
-rw-r--r--nuttx/include/nuttx/input/max11802.h2
-rw-r--r--nuttx/include/nuttx/input/stmpe811.h2
-rw-r--r--nuttx/include/nuttx/lcd/nokia6100.h2
-rw-r--r--nuttx/include/nuttx/lcd/p14201.h2
-rw-r--r--nuttx/include/nuttx/lcd/ssd1306.h2
-rw-r--r--nuttx/include/nuttx/lcd/st7567.h2
-rw-r--r--nuttx/include/nuttx/lcd/ug-2864ambag01.h2
-rw-r--r--nuttx/include/nuttx/lcd/ug-9664hswag01.h2
-rw-r--r--nuttx/include/nuttx/mmcsd.h2
-rw-r--r--nuttx/include/nuttx/net/enc28j60.h2
-rw-r--r--nuttx/include/nuttx/spi/spi.h (renamed from nuttx/include/nuttx/spi.h)10
-rw-r--r--nuttx/include/nuttx/wireless/cc1101.h2
-rw-r--r--nuttx/include/nuttx/wireless/nrf24l01.h2
18 files changed, 22 insertions, 22 deletions
diff --git a/nuttx/include/nuttx/analog/adc.h b/nuttx/include/nuttx/analog/adc.h
index f654bff05..fe5eb9809 100644
--- a/nuttx/include/nuttx/analog/adc.h
+++ b/nuttx/include/nuttx/analog/adc.h
@@ -54,7 +54,7 @@
#include <stdbool.h>
#include <semaphore.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
/************************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/include/nuttx/analog/dac.h b/nuttx/include/nuttx/analog/dac.h
index 655fdbfcf..ab410399e 100644
--- a/nuttx/include/nuttx/analog/dac.h
+++ b/nuttx/include/nuttx/analog/dac.h
@@ -53,7 +53,7 @@
#include <stdbool.h>
#include <semaphore.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
/************************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/include/nuttx/analog/pga11x.h b/nuttx/include/nuttx/analog/pga11x.h
index 8b04dee19..231c67fa9 100644
--- a/nuttx/include/nuttx/analog/pga11x.h
+++ b/nuttx/include/nuttx/analog/pga11x.h
@@ -46,7 +46,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#if defined(CONFIG_ADC) && defined(CONFIG_ADC_PGA11X)
diff --git a/nuttx/include/nuttx/audio/audio.h b/nuttx/include/nuttx/audio/audio.h
index 72b8cb573..6234ac0db 100644
--- a/nuttx/include/nuttx/audio/audio.h
+++ b/nuttx/include/nuttx/audio/audio.h
@@ -56,7 +56,7 @@
#include <nuttx/compiler.h>
#include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#ifdef CONFIG_AUDIO
diff --git a/nuttx/include/nuttx/audio/vs1053.h b/nuttx/include/nuttx/audio/vs1053.h
index 5b791c023..1d99e44f6 100644
--- a/nuttx/include/nuttx/audio/vs1053.h
+++ b/nuttx/include/nuttx/audio/vs1053.h
@@ -108,7 +108,7 @@ extern "C" {
*
****************************************************************************/
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
struct audio_lowerhalf_s; /* see nutt/audio.h */
EXTERN FAR struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi,
FAR const struct vs1053_lower_s *lower,
diff --git a/nuttx/include/nuttx/input/max11802.h b/nuttx/include/nuttx/input/max11802.h
index 3d03bdd11..318ddce5d 100644
--- a/nuttx/include/nuttx/input/max11802.h
+++ b/nuttx/include/nuttx/input/max11802.h
@@ -46,7 +46,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <stdbool.h>
#include <nuttx/irq.h>
diff --git a/nuttx/include/nuttx/input/stmpe811.h b/nuttx/include/nuttx/input/stmpe811.h
index fc311f7c4..7a6fdd57a 100644
--- a/nuttx/include/nuttx/input/stmpe811.h
+++ b/nuttx/include/nuttx/input/stmpe811.h
@@ -47,7 +47,7 @@
#include <nuttx/config.h>
#include <nuttx/i2c.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <nuttx/irq.h>
diff --git a/nuttx/include/nuttx/lcd/nokia6100.h b/nuttx/include/nuttx/lcd/nokia6100.h
index 0fb52a40d..2d7184ead 100644
--- a/nuttx/include/nuttx/lcd/nokia6100.h
+++ b/nuttx/include/nuttx/lcd/nokia6100.h
@@ -117,7 +117,7 @@ extern "C" {
**************************************************************************************/
struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
EXTERN FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned int devno);
/**************************************************************************************
diff --git a/nuttx/include/nuttx/lcd/p14201.h b/nuttx/include/nuttx/lcd/p14201.h
index 741d4f3de..68abf5b8f 100644
--- a/nuttx/include/nuttx/lcd/p14201.h
+++ b/nuttx/include/nuttx/lcd/p14201.h
@@ -118,7 +118,7 @@ extern "C" {
**************************************************************************************/
struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
EXTERN FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
#undef EXTERN
diff --git a/nuttx/include/nuttx/lcd/ssd1306.h b/nuttx/include/nuttx/lcd/ssd1306.h
index 26fd0430c..3a76a64c9 100644
--- a/nuttx/include/nuttx/lcd/ssd1306.h
+++ b/nuttx/include/nuttx/lcd/ssd1306.h
@@ -219,7 +219,7 @@ extern "C"
**************************************************************************************/
struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */
-struct spi_dev_s; /* See include/nuttx/spi.h */
+struct spi_dev_s; /* See include/nuttx/spi/spi.h */
FAR struct lcd_dev_s *ssd1306_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
/************************************************************************************************
diff --git a/nuttx/include/nuttx/lcd/st7567.h b/nuttx/include/nuttx/lcd/st7567.h
index 22119bc6c..c68f80e53 100644
--- a/nuttx/include/nuttx/lcd/st7567.h
+++ b/nuttx/include/nuttx/lcd/st7567.h
@@ -123,7 +123,7 @@ extern "C"
****************************************************************************/
struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
FAR struct lcd_dev_s *st7567_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
/****************************************************************************
diff --git a/nuttx/include/nuttx/lcd/ug-2864ambag01.h b/nuttx/include/nuttx/lcd/ug-2864ambag01.h
index 86362d773..83ac20655 100644
--- a/nuttx/include/nuttx/lcd/ug-2864ambag01.h
+++ b/nuttx/include/nuttx/lcd/ug-2864ambag01.h
@@ -217,7 +217,7 @@ extern "C"
**************************************************************************************/
struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */
-struct spi_dev_s; /* See include/nuttx/spi.h */
+struct spi_dev_s; /* See include/nuttx/spi/spi.h */
FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi,
unsigned int devno);
diff --git a/nuttx/include/nuttx/lcd/ug-9664hswag01.h b/nuttx/include/nuttx/lcd/ug-9664hswag01.h
index a60b5ed67..b781919d8 100644
--- a/nuttx/include/nuttx/lcd/ug-9664hswag01.h
+++ b/nuttx/include/nuttx/lcd/ug-9664hswag01.h
@@ -119,7 +119,7 @@ extern "C"
****************************************************************************/
struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
FAR struct lcd_dev_s *ug_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
/****************************************************************************
diff --git a/nuttx/include/nuttx/mmcsd.h b/nuttx/include/nuttx/mmcsd.h
index 819613ede..03b7dafd8 100644
--- a/nuttx/include/nuttx/mmcsd.h
+++ b/nuttx/include/nuttx/mmcsd.h
@@ -96,7 +96,7 @@ EXTERN int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev);
*
****************************************************************************/
-struct spi_dev_s; /* See nuttx/spi.h */
+struct spi_dev_s; /* See nuttx/spi/spi.h */
EXTERN int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi);
#undef EXTERN
diff --git a/nuttx/include/nuttx/net/enc28j60.h b/nuttx/include/nuttx/net/enc28j60.h
index 7d0d7c3e5..ea5601c31 100644
--- a/nuttx/include/nuttx/net/enc28j60.h
+++ b/nuttx/include/nuttx/net/enc28j60.h
@@ -146,7 +146,7 @@ extern "C" {
*
****************************************************************************/
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
EXTERN int enc_initialize(FAR struct spi_dev_s *spi,
FAR const struct enc_lower_s *lower,
unsigned int devno);
diff --git a/nuttx/include/nuttx/spi.h b/nuttx/include/nuttx/spi/spi.h
index 4816e7d8b..2cfe7644c 100644
--- a/nuttx/include/nuttx/spi.h
+++ b/nuttx/include/nuttx/spi/spi.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * include/nuttx/spi.h
+ * include/nuttx/spi/spi.h
*
* Copyright(C) 2008-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_SPI_H
-#define __INCLUDE_NUTTX_SPI_H
+#ifndef __INCLUDE_NUTTX_SPI_SPI_H
+#define __INCLUDE_NUTTX_SPI_SPI_H
/****************************************************************************
* Included Files
@@ -410,7 +410,7 @@ struct spi_ops_s
struct spi_dev_s
{
- const struct spi_ops_s *ops;
+ FAR const struct spi_ops_s *ops;
};
/****************************************************************************
@@ -466,4 +466,4 @@ FAR struct spi_dev_s *up_spiinitialize(int port);
#if defined(__cplusplus)
}
#endif
-#endif /* __INCLUDE_NUTTX_SPI_H */
+#endif /* __INCLUDE_NUTTX_SPI_SPI_H */
diff --git a/nuttx/include/nuttx/wireless/cc1101.h b/nuttx/include/nuttx/wireless/cc1101.h
index 80d3dbec3..032a4abf3 100644
--- a/nuttx/include/nuttx/wireless/cc1101.h
+++ b/nuttx/include/nuttx/wireless/cc1101.h
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <stdint.h>
#include <stdbool.h>
diff --git a/nuttx/include/nuttx/wireless/nrf24l01.h b/nuttx/include/nuttx/wireless/nrf24l01.h
index d23aa3650..3e2a41ac1 100644
--- a/nuttx/include/nuttx/wireless/nrf24l01.h
+++ b/nuttx/include/nuttx/wireless/nrf24l01.h
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
#include <nuttx/irq.h>
#include <nuttx/wireless/wireless.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-27 07:54:10 +0000