refactor: move cherryrb and cherrymp into common dir, rename with usb_ringbuffer and usb_mempool

Signed-off-by: sakumisu <1203593632@qq.com>

Author: sakumisu

SConscript

@@ -140,9 +140,6 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']):
         src += Glob('class/dfu/usbd_dfu.c')
     if GetDepend(['PKG_CHERRYUSB_DEVICE_DISPLAY']):
         src += Glob('class/vendor/display/usbd_display.c')
-        src += Glob('third_party/cherrymp/chry_mempool.c')
-        src += Glob('third_party/cherrymp/chry_mempool_osal_rtthread.c')
-        path += [cwd + '/third_party/cherrymp']
     if GetDepend(['PKG_CHERRYUSB_DEVICE_ADB']):
         src += Glob('class/adb/usbd_adb.c')
         src += Glob('platform/rtthread/usbd_adb_shell.c')

cherryusb.cmake

@@ -380,18 +380,3 @@ if(DEFINED CONFIG_CHERRYUSB_OSAL)
         list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/osal/usb_osal_zephyr.c)
     endif()
 endif()
-
-if(CONFIG_CHERRYRB)
-    list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherryrb/chry_ringbuffer.c)
-    list(APPEND cherryusb_incs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherryrb)
-endif()
-
-if(CONFIG_CHERRYMP)
-    list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp/chry_mempool.c)
-    list(APPEND cherryusb_incs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp)
-    if("${CONFIG_CHERRYUSB_OSAL}" STREQUAL "freertos")
-        list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp/chry_mempool_osal_freertos.c)
-    elseif("${CONFIG_CHERRYUSB_OSAL}" STREQUAL "rtthread")
-        list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp/chry_mempool_osal_rtthread.c)
-    endif()
-endif()

class/serial/usbh_serial.c

@@ -23,94 +23,6 @@ static uint32_t g_cdcacm_devinuse = 0;
 
 USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_serial_iobuffer[CONFIG_USBHOST_MAX_SERIAL_CLASS][USB_ALIGN_UP((USBH_SERIAL_RX2_NOCACHE_OFFSET + USBH_SERIAL_RX2_NOCACHE_SIZE), CONFIG_USB_ALIGN_SIZE)];
 
-/* refer to cherryrb */
-static int usbh_serial_ringbuffer_init(usbh_serial_ringbuf_t *rb, void *pool, uint32_t size)
-{
-    if (NULL == rb) {
-        return -1;
-    }
-
-    if (NULL == pool) {
-        return -1;
-    }
-
-    if ((size < 2) || (size & (size - 1))) {
-        return -1;
-    }
-
-    rb->in = 0;
-    rb->out = 0;
-    rb->mask = size - 1;
-    rb->pool = pool;
-
-    return 0;
-}
-
-static void usbh_serial_ringbuffer_reset(usbh_serial_ringbuf_t *rb)
-{
-    rb->in = 0;
-    rb->out = 0;
-}
-
-static uint32_t usbh_serial_ringbuffer_get_used(usbh_serial_ringbuf_t *rb)
-{
-    return rb->in - rb->out;
-}
-
-static uint32_t usbh_serial_ringbuffer_write(usbh_serial_ringbuf_t *rb, void *data, uint32_t size)
-{
-    uint32_t unused;
-    uint32_t offset;
-    uint32_t remain;
-
-    unused = (rb->mask + 1) - (rb->in - rb->out);
-
-    if (size > unused) {
-        size = unused;
-    }
-
-    offset = rb->in & rb->mask;
-
-    remain = rb->mask + 1 - offset;
-    remain = remain > size ? size : remain;
-
-    memcpy(((uint8_t *)(rb->pool)) + offset, data, remain);
-    memcpy(rb->pool, (uint8_t *)data + remain, size - remain);
-
-    rb->in += size;
-
-    return size;
-}
-
-static uint32_t usbh_serial_ringbuffer_peek(usbh_serial_ringbuf_t *rb, void *data, uint32_t size)
-{
-    uint32_t used;
-    uint32_t offset;
-    uint32_t remain;
-
-    used = rb->in - rb->out;
-    if (size > used) {
-        size = used;
-    }
-
-    offset = rb->out & rb->mask;
-
-    remain = rb->mask + 1 - offset;
-    remain = remain > size ? size : remain;
-
-    memcpy(data, ((uint8_t *)(rb->pool)) + offset, remain);
-    memcpy((uint8_t *)data + remain, rb->pool, size - remain);
-
-    return size;
-}
-
-static uint32_t usbh_serial_ringbuffer_read(usbh_serial_ringbuf_t *rb, void *data, uint32_t size)
-{
-    size = usbh_serial_ringbuffer_peek(rb, data, size);
-    rb->out += size;
-    return size;
-}
-
 static struct usbh_serial *usbh_serial_alloc(bool is_cdcacm)
 {
     uint8_t devno;
@@ -193,9 +105,9 @@ static void usbh_serial_callback(void *arg, int nbytes)
             return;
         }
 
-        usbh_serial_ringbuffer_write(&serial->rx_rb,
-                                     &serial->iobuffer[(serial->rx_buf_index ? USBH_SERIAL_RX2_NOCACHE_OFFSET : USBH_SERIAL_RX_NOCACHE_OFFSET) + serial->driver->ignore_rx_header],
-                                     (nbytes - serial->driver->ignore_rx_header));
+        usb_ringbuffer_write(&serial->rx_rb,
+                             &serial->iobuffer[(serial->rx_buf_index ? USBH_SERIAL_RX2_NOCACHE_OFFSET : USBH_SERIAL_RX_NOCACHE_OFFSET) + serial->driver->ignore_rx_header],
+                             (nbytes - serial->driver->ignore_rx_header));
 
         if (serial->rx_complete_callback) {
             serial->rx_complete_callback(serial, nbytes - serial->driver->ignore_rx_header);
@@ -319,7 +231,7 @@ struct usbh_serial *usbh_serial_open(const char *devname, uint32_t open_flags)
         }
     }
 
-    usbh_serial_ringbuffer_init(&serial->rx_rb, serial->rx_rb_pool, CONFIG_USBHOST_SERIAL_RX_SIZE);
+    usb_ringbuffer_init(&serial->rx_rb, serial->rx_rb_pool, CONFIG_USBHOST_SERIAL_RX_SIZE);
 
     serial->ref_count++;
     serial->open_flags = open_flags;
@@ -454,7 +366,7 @@ int usbh_serial_control(struct usbh_serial *serial, int cmd, void *arg)
                 return ret;
             }
 
-            usbh_serial_ringbuffer_reset(&serial->rx_rb);
+            usb_ringbuffer_reset(&serial->rx_rb);
             usb_osal_sem_reset(serial->rx_complete_sem);
             serial->rx_buf_index = 0;
             usbh_bulk_urb_fill(&serial->bulkin_urb, serial->hport, serial->bulkin, &serial->iobuffer[serial->rx_buf_index ? USBH_SERIAL_RX2_NOCACHE_OFFSET : USBH_SERIAL_RX_NOCACHE_OFFSET], serial->bulkin->wMaxPacketSize,
@@ -561,9 +473,9 @@ int usbh_serial_read(struct usbh_serial *serial, void *buffer, uint32_t buflen)
     }
 
     if (serial->open_flags & USBH_SERIAL_O_NONBLOCK) {
-        return usbh_serial_ringbuffer_read(&serial->rx_rb, buffer, buflen);
+        return usb_ringbuffer_read(&serial->rx_rb, buffer, buflen);
     } else {
-        if (usbh_serial_ringbuffer_get_used(&serial->rx_rb) == 0) {
+        if (usb_ringbuffer_get_used(&serial->rx_rb) == 0) {
             ret = usb_osal_sem_take(serial->rx_complete_sem, serial->rx_timeout_ms == 0 ? USB_OSAL_WAITING_FOREVER : serial->rx_timeout_ms);
             if (ret < 0) {
                 return ret;
@@ -572,7 +484,7 @@ int usbh_serial_read(struct usbh_serial *serial, void *buffer, uint32_t buflen)
                 return serial->rx_errorcode;
             }
         }
-        return usbh_serial_ringbuffer_read(&serial->rx_rb, buffer, buflen);
+        return usb_ringbuffer_read(&serial->rx_rb, buffer, buflen);
     }
 }
 

class/serial/usbh_serial.h

@@ -67,13 +67,6 @@
 extern "C" {
 #endif
 
-typedef struct {
-    uint32_t in;   /*!< Define the write pointer.               */
-    uint32_t out;  /*!< Define the read pointer.                */
-    uint32_t mask; /*!< Define the write and read pointer mask. */
-    void *pool;    /*!< Define the memory pointer.              */
-} usbh_serial_ringbuf_t;
-
 /*
  * Counters of the input lines (CTS, DSR, RI, CD) interrupts
  */
@@ -143,7 +136,7 @@ struct usbh_serial {
 
     const struct usbh_serial_driver *driver;
 
-    usbh_serial_ringbuf_t rx_rb;
+    usb_ringbuffer_t rx_rb;
     uint8_t rx_rb_pool[CONFIG_USBHOST_SERIAL_RX_SIZE];
     usb_osal_sem_t rx_complete_sem;
     uint8_t rx_buf_index;

class/vendor/display/usbd_display.c

@@ -6,50 +6,37 @@
 
 #include "usbd_core.h"
 #include "usbd_display.h"
-#include "chry_mempool.h"
-
-struct usbd_disp_frame_header {
-    uint16_t crc16; //payload crc16
-    uint8_t type;   //raw rgb,yuv,jpg,other
-    uint8_t cmd;
-    uint16_t x; //32bit
-    uint16_t y;
-    uint16_t width; //32bit
-    uint16_t height;
-    uint32_t frame_id      : 10;
-    uint32_t payload_total : 22; //payload max 4MB
-} __PACKED;
 
 struct usbd_display_priv {
-    struct chry_mempool pool;
+    struct usb_mempool pool;
     struct usbd_endpoint out_ep;
     struct usbd_endpoint in_ep;
     struct usbd_display_frame *current_frame;
 } g_usbd_display;
 
 int usbd_display_frame_create(struct usbd_display_frame *frame, uint32_t count)
 {
-    return chry_mempool_create(&g_usbd_display.pool, frame, sizeof(struct usbd_display_frame), count);
+    return usb_mempool_create(&g_usbd_display.pool, frame, sizeof(struct usbd_display_frame), count);
 }
 
 struct usbd_display_frame *usbd_display_frame_alloc(void)
 {
-    return (struct usbd_display_frame *)chry_mempool_alloc(&g_usbd_display.pool);
+    return (struct usbd_display_frame *)usb_mempool_alloc(&g_usbd_display.pool);
 }
 
 int usbd_display_frame_free(struct usbd_display_frame *frame)
 {
-    return chry_mempool_free(&g_usbd_display.pool, (uintptr_t *)frame);
+    return usb_mempool_free(&g_usbd_display.pool, (uintptr_t *)frame);
 }
 
 int usbd_display_frame_send(struct usbd_display_frame *frame)
 {
-    return chry_mempool_send(&g_usbd_display.pool, (uintptr_t *)frame);
+    return usb_mempool_send(&g_usbd_display.pool, (uintptr_t *)frame);
 }
 
 int usbd_display_frame_recv(struct usbd_display_frame **frame, uint32_t timeout)
 {
-    return chry_mempool_recv(&g_usbd_display.pool, (uintptr_t **)frame, timeout);
+    return usb_mempool_recv(&g_usbd_display.pool, (uintptr_t **)frame, timeout);
 }
 
 uint8_t usb_dispay_dummy[512];
@@ -65,6 +52,7 @@ static void display_notify_handler(uint8_t busid, uint8_t event, void *arg)
             usb_display_buf_offset = 0;
             usb_display_ignore_frame = true;
             g_usbd_display.current_frame = NULL;
+            usb_mempool_reset(&g_usbd_display.pool);
             usbd_ep_start_read(busid, g_usbd_display.out_ep.ep_addr, usb_dispay_dummy, usbd_get_ep_mps(0, g_usbd_display.out_ep.ep_addr));
             break;
         default:

class/vendor/display/usbd_display.h

@@ -11,6 +11,18 @@
 #define USBD_DISPLAY_TYPE_YUV420 2
 #define USBD_DISPLAY_TYPE_JPG    3
 
+struct usbd_disp_frame_header {
+    uint16_t crc16; //payload crc16
+    uint8_t type;   //raw rgb,yuv,jpg,other
+    uint8_t cmd;
+    uint16_t x; //32bit
+    uint16_t y;
+    uint16_t width; //32bit
+    uint16_t height;
+    uint32_t frame_id      : 10;
+    uint32_t payload_total : 22; //payload max 4MB
+} __PACKED;
+
 struct usbd_display_frame {
     uint8_t *frame_buf;
     uint32_t frame_bufsize;