From 330ad33582036334e95792d87252b3fcd84f6a20 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 13 Jul 2025 19:11:14 +0200 Subject: [PATCH] common: Remove unused ringbuf. Signed-off-by: iabdalkader --- common/common.mk | 1 - common/ringbuf.c | 57 ---------------------------------- common/ringbuf.h | 41 ------------------------ ports/rp2/omv_portconfig.cmake | 1 - 4 files changed, 100 deletions(-) delete mode 100644 common/ringbuf.c delete mode 100644 common/ringbuf.h diff --git a/common/common.mk b/common/common.mk index 75d7daf59..71949aaec 100644 --- a/common/common.mk +++ b/common/common.mk @@ -32,7 +32,6 @@ COMMON_SRC_C += \ nosys_stubs.c \ omv_csi.c \ pendsv.c \ - ringbuf.c \ tinyusb_debug.c \ trace.c \ umm_malloc.c \ diff --git a/common/ringbuf.c b/common/ringbuf.c deleted file mode 100644 index bb5a2c6f7..000000000 --- a/common/ringbuf.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * SPDX-License-Identifier: MIT - * - * Copyright (C) 2013-2024 OpenMV, LLC. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * Simple Ring Buffer implementation. - */ -#include -#include "ringbuf.h" - -void ring_buf_init(ring_buf_t *buf) { - memset(buf, 0, sizeof(*buf)); -} - -int ring_buf_empty(ring_buf_t *buf) { - return (buf->head == buf->tail); -} - -void ring_buf_put(ring_buf_t *buf, uint8_t c) { - if ((buf->tail + 1) % BUFFER_SIZE == buf->head) { - /*buffer is full*/ - return; - } - - buf->data[buf->tail] = c; - buf->tail = (buf->tail + 1) % BUFFER_SIZE; -} - -uint8_t ring_buf_get(ring_buf_t *buf) { - uint8_t c; - if (buf->head == buf->tail) { - /*buffer is empty*/ - return 0; - } - - c = buf->data[buf->head]; - buf->head = (buf->head + 1) % BUFFER_SIZE; - return c; -} diff --git a/common/ringbuf.h b/common/ringbuf.h deleted file mode 100644 index 0f8f32798..000000000 --- a/common/ringbuf.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * SPDX-License-Identifier: MIT - * - * Copyright (C) 2013-2024 OpenMV, LLC. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * Simple Ring Buffer implementation. - */ -#ifndef __RING_BUFFER_H__ -#define __RING_BUFFER_H__ -#include -#define BUFFER_SIZE (1024) - -typedef struct ring_buffer { - volatile uint32_t head; - volatile uint32_t tail; - uint8_t data[BUFFER_SIZE]; -} ring_buf_t; - -void ring_buf_init(ring_buf_t *buf); -int ring_buf_empty(ring_buf_t *buf); -void ring_buf_put(ring_buf_t *buf, uint8_t c); -uint8_t ring_buf_get(ring_buf_t *buf); -#endif /* __RING_BUFFER_H__ */ diff --git a/ports/rp2/omv_portconfig.cmake b/ports/rp2/omv_portconfig.cmake index e1f5994cd..ec79981e1 100644 --- a/ports/rp2/omv_portconfig.cmake +++ b/ports/rp2/omv_portconfig.cmake @@ -110,7 +110,6 @@ file(GLOB OMV_USER_MODULES ${TOP_DIR}/modules/*.c) target_sources(${MICROPY_TARGET} PRIVATE ${TOP_DIR}/common/array.c - ${TOP_DIR}/common/ringbuf.c ${TOP_DIR}/common/trace.c ${TOP_DIR}/common/mutex.c ${TOP_DIR}/common/pendsv.c