circbuf: Move from mm/circbuf to libs/libc/misc

so that it can be used by userspace program. Signed-off-by: Xiang Xiao <[email protected]> Signed-off-by: Neo Xu <[email protected]>
lupyuen2 · Oct 9, 2024 · b068e23 · b068e23
1 parent 066cd79
commit b068e23
Show file tree

Hide file tree

Showing 29 changed files with 35 additions and 87 deletions.
diff --git a/arch/arm/src/phy62xx/uart.c b/arch/arm/src/phy62xx/uart.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/serial/serial.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 #define UART_TX_BUFFER_SIZE   64
 #define UART_RX_BUFFER_SIZE   64

diff --git a/arch/risc-v/src/common/espressif/esp_rmt.c b/arch/risc-v/src/common/espressif/esp_rmt.c
@@ -39,7 +39,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/rmt/rmt.h>
 #include <nuttx/spinlock.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 #include "esp_gpio.h"
 #include "esp_irq.h"

diff --git a/arch/xtensa/src/common/espressif/esp_rmt.c b/arch/xtensa/src/common/espressif/esp_rmt.c
@@ -39,7 +39,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/rmt/rmt.h>
 #include <nuttx/spinlock.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 #include "xtensa.h"
 #ifdef CONFIG_ARCH_CHIP_ESP32

diff --git a/arch/xtensa/src/esp32/esp32_i2s.c b/arch/xtensa/src/esp32/esp32_i2s.c
@@ -44,7 +44,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/mqueue.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
 

diff --git a/arch/xtensa/src/esp32s2/esp32s2_i2s.c b/arch/xtensa/src/esp32s2/esp32s2_i2s.c
@@ -42,7 +42,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/mqueue.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
 

diff --git a/arch/xtensa/src/esp32s3/esp32s3_i2s.c b/arch/xtensa/src/esp32s3/esp32s3_i2s.c
@@ -45,7 +45,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/mqueue.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
 

diff --git a/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c b/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
@@ -58,7 +58,7 @@
 #include <nuttx/net/bluetooth.h>
 #include <nuttx/wireless/bluetooth/bt_driver.h>
 #include <nuttx/wireless/bluetooth/bt_uart.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #if defined(CONFIG_UART_BTH4)
 #include <nuttx/serial/uart_bth4.h>
 #endif

diff --git a/drivers/input/keyboard_upper.c b/drivers/input/keyboard_upper.c
@@ -34,7 +34,7 @@
 #include <nuttx/input/virtio-input-event-codes.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/list.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/mutex.h>
 
 /****************************************************************************

diff --git a/drivers/input/mouse_upper.c b/drivers/input/mouse_upper.c
@@ -32,7 +32,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/list.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 /****************************************************************************
  * Private Types

diff --git a/drivers/input/touchscreen_upper.c b/drivers/input/touchscreen_upper.c
@@ -38,7 +38,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/list.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 /****************************************************************************
  * Private Types

diff --git a/drivers/ipcc/ipcc_register.c b/drivers/ipcc/ipcc_register.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/ipcc.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 #include <assert.h>
 #include <errno.h>

diff --git a/drivers/pipes/pipe_common.h b/drivers/pipes/pipe_common.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/mutex.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <sys/types.h>
 
 #include <stdint.h>

diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
@@ -34,7 +34,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/rc/lirc_dev.h>
 
 /****************************************************************************

diff --git a/drivers/rmt/rmtchar.c b/drivers/rmt/rmtchar.c
@@ -36,7 +36,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/mutex.h>
 #include <nuttx/rmt/rmt.h>
 

diff --git a/drivers/sensors/gnss_uorb.c b/drivers/sensors/gnss_uorb.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/list.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/sensors/sensor.h>
 #include <nuttx/sensors/gnss.h>
 

diff --git a/drivers/sensors/sensor.c b/drivers/sensors/sensor.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <nuttx/list.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/mutex.h>
 #include <nuttx/sensors/sensor.h>
 

diff --git a/drivers/serial/uart_bth4.c b/drivers/serial/uart_bth4.c
@@ -26,7 +26,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/mutex.h>
 #include <nuttx/semaphore.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 #include <fcntl.h>
 #include <string.h>

diff --git a/drivers/serial/uart_bth5.c b/drivers/serial/uart_bth5.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/mutex.h>
 #include <nuttx/semaphore.h>
 

diff --git a/drivers/video/fb.c b/drivers/video/fb.c
@@ -41,7 +41,7 @@
 #include <nuttx/video/fb.h>
 #include <nuttx/clock.h>
 #include <nuttx/wdog.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 
 /****************************************************************************
  * Pre-processor definitions

diff --git a/include/nuttx/mm/circbuf.h → include/nuttx/circbuf.h b/include/nuttx/mm/circbuf.h → include/nuttx/circbuf.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/mm/circbuf.h
+ * include/nuttx/circbuf.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_MM_CIRCBUF_H
-#define __INCLUDE_NUTTX_MM_CIRCBUF_H
+#ifndef __INCLUDE_NUTTX_CIRCBUF_H
+#define __INCLUDE_NUTTX_CIRCBUF_H
 
 /* Note about locking: There is no locking required while only one reader
  * and one writer is using the circular buffer.

diff --git a/include/nuttx/input/touchscreen.h b/include/nuttx/input/touchscreen.h
@@ -38,7 +38,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/semaphore.h>
 #include <time.h>
 #include <inttypes.h>

diff --git a/include/nuttx/ipcc.h b/include/nuttx/ipcc.h
@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/semaphore.h>
 
 #include <poll.h>

diff --git a/libs/libc/misc/CMakeLists.txt b/libs/libc/misc/CMakeLists.txt
@@ -27,6 +27,7 @@ list(
   APPEND
   SRCS
   lib_bitmap.c
+  lib_circbuf.c
   lib_mknod.c
   lib_umask.c
   lib_utsname.c

diff --git a/libs/libc/misc/Make.defs b/libs/libc/misc/Make.defs
@@ -22,8 +22,8 @@
 
 # Add the internal C files to the build
 
-CSRCS += lib_bitmap.c lib_mknod.c lib_umask.c lib_utsname.c lib_getrandom.c
-CSRCS += lib_xorshift128.c lib_tea_encrypt.c lib_tea_decrypt.c
+CSRCS += lib_bitmap.c lib_circbuf.c lib_mknod.c lib_umask.c lib_utsname.c
+CSRCS += lib_getrandom.c lib_xorshift128.c lib_tea_encrypt.c lib_tea_decrypt.c
 CSRCS += lib_cxx_initialize.c lib_impure.c lib_memfd.c lib_mutex.c
 CSRCS += lib_fchmodat.c lib_fstatat.c lib_getfullpath.c lib_openat.c
 CSRCS += lib_mkdirat.c lib_utimensat.c lib_mallopt.c lib_memoryregion.c

diff --git a/mm/circbuf/circbuf.c → libs/libc/misc/lib_circbuf.c b/mm/circbuf/circbuf.c → libs/libc/misc/lib_circbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/circbuf/circbuf.c
+ * libs/libc/misc/lib_circbuf.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -35,8 +35,8 @@
 
 #include <assert.h>
 
-#include <nuttx/kmalloc.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
+#include <nuttx/lib/lib.h>
 
 /****************************************************************************
  * Private Types
@@ -74,7 +74,7 @@ int circbuf_init(FAR struct circbuf_s *circ, FAR void *base, size_t bytes)
 
   if (!base && bytes)
     {
-      base = kmm_malloc(bytes);
+      base = lib_malloc(bytes);
       if (!base)
         {
           return -ENOMEM;
@@ -118,7 +118,7 @@ int circbuf_resize(FAR struct circbuf_s *circ, size_t bytes)
 
   if (bytes)
     {
-      tmp = kmm_malloc(bytes);
+      tmp = lib_malloc(bytes);
       if (!tmp)
         {
           return -ENOMEM;
@@ -134,7 +134,7 @@ int circbuf_resize(FAR struct circbuf_s *circ, size_t bytes)
       circbuf_read(circ, tmp, len);
     }
 
-  kmm_free(circ->base);
+  lib_free(circ->base);
 
   circ->base = tmp;
   circ->size = bytes;
@@ -176,7 +176,7 @@ void circbuf_uninit(FAR struct circbuf_s *circ)
 
   if (!circ->external)
     {
-      kmm_free(circ->base);
+      lib_free(circ->base);
     }
 
   memset(circ, 0, sizeof(*circ));

diff --git a/mm/Makefile b/mm/Makefile
@@ -30,7 +30,6 @@ include kmm_heap/Make.defs
 include mm_gran/Make.defs
 include shm/Make.defs
 include iob/Make.defs
-include circbuf/Make.defs
 include mempool/Make.defs
 include kasan/Make.defs
 include ubsan/Make.defs

diff --git a/mm/circbuf/CMakeLists.txt b/mm/circbuf/CMakeLists.txt
diff --git a/mm/circbuf/Make.defs b/mm/circbuf/Make.defs
diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c
@@ -35,7 +35,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/mm/circbuf.h>
+#include <nuttx/circbuf.h>
 #include <nuttx/rpmsg/rpmsg.h>
 #include <nuttx/mutex.h>
 #include <nuttx/semaphore.h>