userspace: Exclude nuttx/arch.h

This patch fixed userspace headers conflict. Architecture-related definition and API should not be exposed to users. Signed-off-by: ouyangxiangzhen <[email protected]>
apache · Nov 1, 2024 · 17c51c0 · 17c51c0
1 parent b271507
commit 17c51c0
Show file tree

Hide file tree

Showing 98 changed files with 111 additions and 32 deletions.
diff --git a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/timers/oneshot.h>

diff --git a/arch/risc-v/src/bl602/bl602_os_hal.c b/arch/risc-v/src/bl602/bl602_os_hal.c
@@ -48,6 +48,7 @@
 #include <syslog.h>
 
 #include <nuttx/config.h>
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kthread.h>
 #include <nuttx/mqueue.h>

diff --git a/arch/risc-v/src/common/espressif/Make.defs b/arch/risc-v/src/common/espressif/Make.defs
@@ -136,7 +136,7 @@ endif
 
 ESP_HAL_3RDPARTY_REPO   = esp-hal-3rdparty
 ifndef ESP_HAL_3RDPARTY_VERSION
-	ESP_HAL_3RDPARTY_VERSION = ca869dd97ed2c01187b85b759c0d6edb27c12c21
+	ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92
 endif
 
 ifndef ESP_HAL_3RDPARTY_URL

diff --git a/arch/risc-v/src/common/riscv_mtimer.c b/arch/risc-v/src/common/riscv_mtimer.c
@@ -22,6 +22,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 

diff --git a/arch/risc-v/src/esp32c3-legacy/Make.defs b/arch/risc-v/src/esp32c3-legacy/Make.defs
@@ -239,7 +239,7 @@ endif
 
 ESP_HAL_3RDPARTY_REPO   = esp-hal-3rdparty
 ifndef ESP_HAL_3RDPARTY_VERSION
-	ESP_HAL_3RDPARTY_VERSION = 51afbfd1a17e806fa6fd8227a18395c1bbecbad3
+	ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92
 endif
 
 ifndef ESP_HAL_3RDPARTY_URL

diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <debug.h>
 #include <assert.h>
+
+#include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/efuse/efuse.h>
 

diff --git a/arch/x86_64/src/intel64/intel64_oneshot.h b/arch/x86_64/src/intel64/intel64_oneshot.h
@@ -28,6 +28,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/compiler.h>
+#include <nuttx/clock.h>
 
 #include <intel64_hpet.h>
 

diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs
@@ -216,7 +216,7 @@ endif
 
 ESP_HAL_3RDPARTY_REPO   = esp-hal-3rdparty
 ifndef ESP_HAL_3RDPARTY_VERSION
-	ESP_HAL_3RDPARTY_VERSION = b4c723a119344b4b71d69819019d55637fb570fd
+	ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92
 endif
 
 ifndef ESP_HAL_3RDPARTY_URL

diff --git a/arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c b/arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <debug.h>
 #include <assert.h>
+
+#include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/efuse/efuse.h>
 

diff --git a/arch/xtensa/src/esp32s2/Make.defs b/arch/xtensa/src/esp32s2/Make.defs
@@ -145,7 +145,7 @@ endif
 
 ESP_HAL_3RDPARTY_REPO   = esp-hal-3rdparty
 ifndef ESP_HAL_3RDPARTY_VERSION
-	ESP_HAL_3RDPARTY_VERSION = b4c723a119344b4b71d69819019d55637fb570fd
+	ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92
 endif
 
 ifndef ESP_HAL_3RDPARTY_URL

diff --git a/arch/xtensa/src/esp32s3/Make.defs b/arch/xtensa/src/esp32s3/Make.defs
@@ -218,7 +218,7 @@ endif
 
 ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
 ifndef ESP_HAL_3RDPARTY_VERSION
-	ESP_HAL_3RDPARTY_VERSION = b4c723a119344b4b71d69819019d55637fb570fd
+	ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92
 endif
 
 ifndef ESP_HAL_3RDPARTY_URL

diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c
@@ -32,6 +32,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/addrenv.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/binfmt/binfmt.h>

diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/mps/mps2-an500/kernel/mps_userspace.c b/boards/arm/mps/mps2-an500/kernel/mps_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c b/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <nuttx/userspace.h>
+#include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/mm.h>
 

diff --git a/crypto/cryptosoft.c b/crypto/cryptosoft.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <endian.h>
+#include <strings.h>
 #include <nuttx/kmalloc.h>
 #include <crypto/bn.h>
 #include <crypto/cryptodev.h>

diff --git a/drivers/audio/audio_dma.c b/drivers/audio/audio_dma.c
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/arch.h>
+#include <nuttx/irq.h>
 #include <nuttx/audio/audio_dma.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/queue.h>

diff --git a/drivers/input/goldfish_events.c b/drivers/input/goldfish_events.c
@@ -24,6 +24,7 @@
 
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/queue.h>
 #include <nuttx/kmalloc.h>

diff --git a/drivers/input/mouse_upper.c b/drivers/input/mouse_upper.c
@@ -29,6 +29,7 @@
 #include <poll.h>
 
 #include <nuttx/input/mouse.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/list.h>

diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/signal.h>

diff --git a/drivers/misc/goldfish_pipe.c b/drivers/misc/goldfish_pipe.c
@@ -43,6 +43,7 @@
 #include <fcntl.h>
 #include <poll.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>

diff --git a/drivers/misc/mkrd.c b/drivers/misc/mkrd.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 #include <debug.h>

diff --git a/drivers/misc/optee.c b/drivers/misc/optee.c
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <netpacket/rpmsg.h>
 #include <nuttx/drivers/optee.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/net/net.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <sys/mman.h>

diff --git a/drivers/mtd/gd25.c b/drivers/mtd/gd25.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/signal.h>
 #include <nuttx/fs/ioctl.h>

diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c
@@ -41,6 +41,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/drivers/rwbuffer.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
 

diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
@@ -28,6 +28,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/addrenv.h>

diff --git a/drivers/net/igc.c b/drivers/net/igc.c
@@ -28,6 +28,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/addrenv.h>

diff --git a/drivers/pci/pci_ivshmem.c b/drivers/pci/pci_ivshmem.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/list.h>
 #include <nuttx/mutex.h>

diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
@@ -38,6 +38,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>

diff --git a/drivers/power/battery/goldfish_battery.c b/drivers/power/battery/goldfish_battery.c
@@ -25,8 +25,10 @@
 #include <stdint.h>
 #include <errno.h>
 #include <debug.h>
-#include <nuttx/nuttx.h>
+
+#include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/nuttx.h>
 #include <nuttx/power/battery_gauge.h>
 #include <nuttx/power/battery_ioctl.h>
 

diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
@@ -32,6 +32,7 @@
 #include <poll.h>
 #include <fcntl.h>
 
+#include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/circbuf.h>