summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsakumisu <[email protected]>2024-09-06 22:23:44 +0800
committersakumisu <[email protected]>2024-09-06 22:24:16 +0800
commitbacacdb32c36279177e550ffa88b1973d57c6ab1 (patch)
tree894ce440fc3c03956872897347f8f1fc73758894
parent0323ffb424a27082b40becb482b85f21807a39d7 (diff)
update: remove uvc queue
-rw-r--r--cherryusb.cmake1
-rw-r--r--third_party/cherrymp/usbh_uvc_queue.c75
-rw-r--r--third_party/cherrymp/usbh_uvc_queue.h18
3 files changed, 0 insertions, 94 deletions
diff --git a/cherryusb.cmake b/cherryusb.cmake
index 28eec1d0..1c434e03 100644
--- a/cherryusb.cmake
+++ b/cherryusb.cmake
@@ -287,6 +287,5 @@ endif()
if(CONFIG_CHERRYMP)
list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp/chry_mempool.c)
-list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp/usbh_uvc_queue.c)
list(APPEND cherryusb_incs ${CMAKE_CURRENT_LIST_DIR}/third_party/cherrymp)
endif() \ No newline at end of file
diff --git a/third_party/cherrymp/usbh_uvc_queue.c b/third_party/cherrymp/usbh_uvc_queue.c
deleted file mode 100644
index b7962ed3..00000000
--- a/third_party/cherrymp/usbh_uvc_queue.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "usbh_uvc_queue.h"
-#include "chry_mempool.h"
-
-struct chry_mempool usbh_uvc_pool;
-
-int usbh_uvc_frame_create(struct usbh_videoframe *frame, uint32_t count)
-{
- return chry_mempool_create(&usbh_uvc_pool, frame, sizeof(struct usbh_videoframe), count);
-}
-
-struct usbh_videoframe *usbh_uvc_frame_alloc(void)
-{
- return (struct usbh_videoframe *)chry_mempool_alloc(&usbh_uvc_pool);
-}
-
-int usbh_uvc_frame_free(struct usbh_videoframe *frame)
-{
- return chry_mempool_free(&usbh_uvc_pool, (uintptr_t *)frame);
-}
-
-int usbh_uvc_frame_send(struct usbh_videoframe *frame)
-{
- return chry_mempool_send(&usbh_uvc_pool, (uintptr_t *)frame);
-}
-
-int usbh_uvc_frame_recv(struct usbh_videoframe **frame, uint32_t timeout)
-{
- return chry_mempool_recv(&usbh_uvc_pool, (uintptr_t **)frame, timeout);
-}
-
-uint8_t frame_buffer1[1]; /* just for test */
-uint8_t frame_buffer2[1]; /* just for test */
-struct usbh_videoframe frame_pool[2];
-
-void usbh_uvc_frame_init(void)
-{
- frame_pool[0].frame_buf = frame_buffer1;
- frame_pool[0].frame_bufsize = 640 * 480 * 2;
- frame_pool[1].frame_buf = frame_buffer2;
- frame_pool[1].frame_bufsize = 640 * 480 * 2;
- usbh_uvc_frame_create(frame_pool, 2);
-}
-
-static void usbh_frame_thread(void *argument)
-{
- int ret;
- struct usbh_videoframe *frame;
-
- while (1) {
- ret = usbh_uvc_frame_recv(&frame, 0xfffffff);
- if (ret < 0) {
- continue;
- }
- USB_LOG_RAW("frame buf:%p,frame len:%d\r\n", frame->frame_buf, frame->frame_size);
- usbh_uvc_frame_free(frame);
- }
-}
-
-void usbh_uvc_frame_alloc_send_test(void)
-{
- struct usbh_videoframe *frame = NULL;
-
- frame = usbh_uvc_frame_alloc();
- if (frame) {
- frame->frame_size = 640 * 480 * 2;
- usbh_uvc_frame_send(frame);
- }
-}
-
-void usbh_uvc_frame_test(void)
-{
- usbh_uvc_frame_init();
-
- usb_osal_thread_create("usbh_video", 3072, 5, usbh_frame_thread, NULL);
-}
diff --git a/third_party/cherrymp/usbh_uvc_queue.h b/third_party/cherrymp/usbh_uvc_queue.h
deleted file mode 100644
index 26da9caf..00000000
--- a/third_party/cherrymp/usbh_uvc_queue.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef USBH_UVC_QUEUE_H
-#define USBH_UVC_QUEUE_H
-
-#include "chry_mempool.h"
-#include "usbh_core.h"
-#include "usbh_video.h"
-
-int usbh_uvc_frame_create(struct usbh_videoframe *frame, uint32_t count);
-struct usbh_videoframe *usbh_uvc_frame_alloc(void);
-int usbh_uvc_frame_free(struct usbh_videoframe *frame);
-int usbh_uvc_frame_send(struct usbh_videoframe *frame);
-int usbh_uvc_frame_recv(struct usbh_videoframe **frame, uint32_t timeout);
-
-/* test uvc frame */
-void usbh_uvc_frame_alloc_send_test(void);
-void usbh_uvc_frame_test(void);
-
-#endif \ No newline at end of file