From 20dc03b42ba529e0c6370b4a2aaedf4d39f9c273 Mon Sep 17 00:00:00 2001 From: N1netyNine99 <2570955716@qq.com> Date: Fri, 3 Apr 2026 21:39:34 +0800 Subject: [PATCH] =?UTF-8?q?[opt]=20=E4=BC=98=E5=8C=96=20ek=5Flist.h=20?= =?UTF-8?q?=E4=B8=ADapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- L2_Core/hal/src/ek_hal_adc.c | 4 ++-- L2_Core/hal/src/ek_hal_dac.c | 4 ++-- L2_Core/hal/src/ek_hal_dma.c | 4 ++-- L2_Core/hal/src/ek_hal_dma2d.c | 4 ++-- L2_Core/hal/src/ek_hal_gpio.c | 4 ++-- L2_Core/hal/src/ek_hal_i2c.c | 4 ++-- L2_Core/hal/src/ek_hal_ltdc.c | 4 ++-- L2_Core/hal/src/ek_hal_pwm.c | 4 ++-- L2_Core/hal/src/ek_hal_spi.c | 4 ++-- L2_Core/hal/src/ek_hal_tick.c | 4 ++-- L2_Core/hal/src/ek_hal_tim.c | 4 ++-- L2_Core/hal/src/ek_hal_uart.c | 4 ++-- L2_Core/readme.md | 8 ++++---- L2_Core/utils/inc/ek_list.h | 22 +++++++++++----------- 14 files changed, 39 insertions(+), 39 deletions(-) diff --git a/L2_Core/hal/src/ek_hal_adc.c b/L2_Core/hal/src/ek_hal_adc.c index 7be6540..b42a03f 100644 --- a/L2_Core/hal/src/ek_hal_adc.c +++ b/L2_Core/hal/src/ek_hal_adc.c @@ -27,7 +27,7 @@ void ek_hal_adc_register(ek_hal_adc_t *const dev, const char *name, const ek_adc dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_adc_head, &dev->node); + ek_list_insert_tail(&ek_hal_adc_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_adc_t *ek_hal_adc_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_adc_head) + ek_list_foreach(p, &ek_hal_adc_head) { ek_hal_adc_t *dev = ek_list_container(p, ek_hal_adc_t, node); diff --git a/L2_Core/hal/src/ek_hal_dac.c b/L2_Core/hal/src/ek_hal_dac.c index 1b49e39..cec6c96 100644 --- a/L2_Core/hal/src/ek_hal_dac.c +++ b/L2_Core/hal/src/ek_hal_dac.c @@ -27,7 +27,7 @@ void ek_hal_dac_register(ek_hal_dac_t *const dev, const char *name, const ek_dac dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_dac_head, &dev->node); + ek_list_insert_tail(&ek_hal_dac_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_dac_t *ek_hal_dac_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_dac_head) + ek_list_foreach(p, &ek_hal_dac_head) { ek_hal_dac_t *dev = ek_list_container(p, ek_hal_dac_t, node); diff --git a/L2_Core/hal/src/ek_hal_dma.c b/L2_Core/hal/src/ek_hal_dma.c index 9a2a31f..2838447 100644 --- a/L2_Core/hal/src/ek_hal_dma.c +++ b/L2_Core/hal/src/ek_hal_dma.c @@ -27,7 +27,7 @@ void ek_hal_dma_register(ek_hal_dma_t *const dev, const char *name, const ek_dma dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_dma_head, &dev->node); + ek_list_insert_tail(&ek_hal_dma_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_dma_t *ek_hal_dma_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_dma_head) + ek_list_foreach(p, &ek_hal_dma_head) { ek_hal_dma_t *dev = ek_list_container(p, ek_hal_dma_t, node); diff --git a/L2_Core/hal/src/ek_hal_dma2d.c b/L2_Core/hal/src/ek_hal_dma2d.c index 8b7a829..01efeaf 100644 --- a/L2_Core/hal/src/ek_hal_dma2d.c +++ b/L2_Core/hal/src/ek_hal_dma2d.c @@ -26,7 +26,7 @@ void ek_hal_dma2d_register(ek_hal_dma2d_t *const dev, const char *name, const ek dev->name = name; dev->ops = ops; dev->dev_info = dev_info; - ek_list_add_tail(&ek_hal_dma2d_head, &dev->node); + ek_list_insert_tail(&ek_hal_dma2d_head, &dev->node); dev->ops->init(dev); } @@ -41,7 +41,7 @@ ek_hal_dma2d_t *ek_hal_dma2d_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_dma2d_head) + ek_list_foreach(p, &ek_hal_dma2d_head) { ek_hal_dma2d_t *dev = ek_list_container(p, ek_hal_dma2d_t, node); diff --git a/L2_Core/hal/src/ek_hal_gpio.c b/L2_Core/hal/src/ek_hal_gpio.c index 75daf15..91dd771 100644 --- a/L2_Core/hal/src/ek_hal_gpio.c +++ b/L2_Core/hal/src/ek_hal_gpio.c @@ -30,7 +30,7 @@ void ek_hal_gpio_register( dev->mode = mode; dev->ops = ops; dev->dev_info = dev_info; - ek_list_add_tail(&ek_hal_gpio_head, &dev->node); + ek_list_insert_tail(&ek_hal_gpio_head, &dev->node); dev->ops->init(dev, mode); dev->status = dev->ops->read(dev); @@ -46,7 +46,7 @@ ek_hal_gpio_t *ek_hal_gpio_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_gpio_head) + ek_list_foreach(p, &ek_hal_gpio_head) { ek_hal_gpio_t *dev = ek_list_container(p, ek_hal_gpio_t, node); diff --git a/L2_Core/hal/src/ek_hal_i2c.c b/L2_Core/hal/src/ek_hal_i2c.c index 24a5ba6..f7df464 100644 --- a/L2_Core/hal/src/ek_hal_i2c.c +++ b/L2_Core/hal/src/ek_hal_i2c.c @@ -27,7 +27,7 @@ void ek_hal_i2c_register(ek_hal_i2c_t *const dev, const char *name, const ek_i2c dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_i2c_head, &dev->node); + ek_list_insert_tail(&ek_hal_i2c_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_i2c_t *ek_hal_i2c_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_i2c_head) + ek_list_foreach(p, &ek_hal_i2c_head) { ek_hal_i2c_t *dev = ek_list_container(p, ek_hal_i2c_t, node); diff --git a/L2_Core/hal/src/ek_hal_ltdc.c b/L2_Core/hal/src/ek_hal_ltdc.c index 6583957..5c64a91 100644 --- a/L2_Core/hal/src/ek_hal_ltdc.c +++ b/L2_Core/hal/src/ek_hal_ltdc.c @@ -26,7 +26,7 @@ void ek_hal_ltdc_register(ek_hal_ltdc_t *const dev, const char *name, const ek_l dev->name = name; dev->ops = ops; dev->dev_info = dev_info; - ek_list_add_tail(&ek_hal_ltdc_head, &dev->node); + ek_list_insert_tail(&ek_hal_ltdc_head, &dev->node); dev->ops->init(dev); } @@ -41,7 +41,7 @@ ek_hal_ltdc_t *ek_hal_ltdc_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_ltdc_head) + ek_list_foreach(p, &ek_hal_ltdc_head) { ek_hal_ltdc_t *dev = ek_list_container(p, ek_hal_ltdc_t, node); diff --git a/L2_Core/hal/src/ek_hal_pwm.c b/L2_Core/hal/src/ek_hal_pwm.c index 47fbeec..bf7db8e 100644 --- a/L2_Core/hal/src/ek_hal_pwm.c +++ b/L2_Core/hal/src/ek_hal_pwm.c @@ -27,7 +27,7 @@ void ek_hal_pwm_register(ek_hal_pwm_t *const dev, const char *name, const ek_pwm dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_pwm_head, &dev->node); + ek_list_insert_tail(&ek_hal_pwm_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_pwm_t *ek_hal_pwm_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_pwm_head) + ek_list_foreach(p, &ek_hal_pwm_head) { ek_hal_pwm_t *dev = ek_list_container(p, ek_hal_pwm_t, node); diff --git a/L2_Core/hal/src/ek_hal_spi.c b/L2_Core/hal/src/ek_hal_spi.c index 6186a24..bd8f485 100644 --- a/L2_Core/hal/src/ek_hal_spi.c +++ b/L2_Core/hal/src/ek_hal_spi.c @@ -27,7 +27,7 @@ void ek_hal_spi_register(ek_hal_spi_t *const dev, const char *name, const ek_spi dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_spi_head, &dev->node); + ek_list_insert_tail(&ek_hal_spi_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_spi_t *ek_hal_spi_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_spi_head) + ek_list_foreach(p, &ek_hal_spi_head) { ek_hal_spi_t *dev = ek_list_container(p, ek_hal_spi_t, node); diff --git a/L2_Core/hal/src/ek_hal_tick.c b/L2_Core/hal/src/ek_hal_tick.c index ddc995b..44161ee 100644 --- a/L2_Core/hal/src/ek_hal_tick.c +++ b/L2_Core/hal/src/ek_hal_tick.c @@ -26,7 +26,7 @@ void ek_hal_tick_register(ek_hal_tick_t *const dev, const char *name, const ek_t dev->name = name; dev->ops = ops; dev->dev_info = dev_info; - ek_list_add_tail(&ek_hal_tick_head, &dev->node); + ek_list_insert_tail(&ek_hal_tick_head, &dev->node); dev->ops->init(dev); } @@ -41,7 +41,7 @@ ek_hal_tick_t *ek_hal_tick_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_tick_head) + ek_list_foreach(p, &ek_hal_tick_head) { ek_hal_tick_t *dev = ek_list_container(p, ek_hal_tick_t, node); diff --git a/L2_Core/hal/src/ek_hal_tim.c b/L2_Core/hal/src/ek_hal_tim.c index 45fb9e2..d3838b1 100644 --- a/L2_Core/hal/src/ek_hal_tim.c +++ b/L2_Core/hal/src/ek_hal_tim.c @@ -27,7 +27,7 @@ void ek_hal_tim_register(ek_hal_tim_base_t *const dev, const char *name, const e dev->ops = ops; dev->dev_info = dev_info; dev->state = EK_HAL_TIM_STATE_STP; - ek_list_add_tail(&ek_hal_tim_head, &dev->node); + ek_list_insert_tail(&ek_hal_tim_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_tim_base_t *ek_hal_tim_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_tim_head) + ek_list_foreach(p, &ek_hal_tim_head) { ek_hal_tim_base_t *dev = ek_list_container(p, ek_hal_tim_base_t, node); diff --git a/L2_Core/hal/src/ek_hal_uart.c b/L2_Core/hal/src/ek_hal_uart.c index 93818d6..36f72d1 100644 --- a/L2_Core/hal/src/ek_hal_uart.c +++ b/L2_Core/hal/src/ek_hal_uart.c @@ -27,7 +27,7 @@ void ek_hal_uart_register(ek_hal_uart_t *const dev, const char *name, const ek_u dev->ops = ops; dev->dev_info = dev_info; dev->lock = false; - ek_list_add_tail(&ek_hal_uart_head, &dev->node); + ek_list_insert_tail(&ek_hal_uart_head, &dev->node); dev->ops->init(dev); } @@ -42,7 +42,7 @@ ek_hal_uart_t *ek_hal_uart_find(const char *name) ek_assert_param(name != NULL); ek_list_node_t *p; - ek_list_iterate(p, &ek_hal_uart_head) + ek_list_foreach(p, &ek_hal_uart_head) { ek_hal_uart_t *dev = ek_list_container(p, ek_hal_uart_t, node); diff --git a/L2_Core/readme.md b/L2_Core/readme.md index 7de6d10..74b578d 100644 --- a/L2_Core/readme.md +++ b/L2_Core/readme.md @@ -242,11 +242,11 @@ typedef struct { } my_node_t; // 添加节点 -ek_list_add_tail(&my_list, &node->node); +ek_list_insert_tail(&my_list, &node->node); // 遍历链表 ek_list_node_t *pos; -ek_list_iterate(pos, &my_list) { +ek_list_foreach(pos, &my_list) { my_node_t *n = ek_list_container(pos, my_node_t, node); // 处理节点 } @@ -482,13 +482,13 @@ void ek_hal_xxx_register( dev->name = name; dev->ops = ops; dev->dev_info = dev_info; - ek_list_add_tail(&ek_hal_xxx_head, &dev->node); + ek_list_insert_tail(&ek_hal_xxx_head, &dev->node); } ek_hal_xxx_t *ek_hal_xxx_find(const char *name) { ek_list_node_t *pos; - ek_list_iterate(pos, &ek_hal_xxx_head) { + ek_list_foreach(pos, &ek_hal_xxx_head) { ek_hal_xxx_t *dev = ek_list_container(pos, ek_hal_xxx_t, node); if (strcmp(dev->name, name) == 0) { return dev; diff --git a/L2_Core/utils/inc/ek_list.h b/L2_Core/utils/inc/ek_list.h index 1738326..5f164fb 100644 --- a/L2_Core/utils/inc/ek_list.h +++ b/L2_Core/utils/inc/ek_list.h @@ -51,9 +51,9 @@ struct ek_list_node_t * @param pos 当前节点指针(迭代变量) * @param head 链表头节点 * - * @warning 遍历过程中不能删除当前节点,否则使用 ek_list_iterate_safe + * @warning 遍历过程中不能删除当前节点,否则使用 ek_list_foreach_safe */ -#define ek_list_iterate(pos, head) \ +#define ek_list_foreach(pos, head) \ for (pos = (head)->next; pos != (head); pos = pos->next) /** @@ -62,7 +62,7 @@ struct ek_list_node_t * @param n 临时节点指针(保存下一个节点) * @param head 链表头节点 */ -#define ek_list_iterate_safe(pos, n, head) \ +#define ek_list_foreach_safe(pos, n, head) \ for (pos = (head)->next, n = pos->next; pos != (head); pos = n, n = pos->next) /* clang-format on */ @@ -85,7 +85,7 @@ __EK_STATIC_INLINE void ek_list_init(ek_list_node_t *head) * @param prev 前一个节点(插入位置之前) * @param next 后一个节点(插入位置之后) */ -__EK_STATIC_INLINE void __ek_list_add(ek_list_node_t *new_node, ek_list_node_t *prev, ek_list_node_t *next) +__EK_STATIC_INLINE void _ek_list_insert(ek_list_node_t *new_node, ek_list_node_t *prev, ek_list_node_t *next) { prev->next = new_node; new_node->next = next; @@ -98,9 +98,9 @@ __EK_STATIC_INLINE void __ek_list_add(ek_list_node_t *new_node, ek_list_node_t * * @param head 链表头节点指针 * @param new_node 要添加的新节点 */ -__EK_STATIC_INLINE void ek_list_add_head(ek_list_node_t *head, ek_list_node_t *new_node) +__EK_STATIC_INLINE void ek_list_insert_head(ek_list_node_t *head, ek_list_node_t *new_node) { - __ek_list_add(new_node, head, head->next); + _ek_list_insert(new_node, head, head->next); } /** @@ -108,9 +108,9 @@ __EK_STATIC_INLINE void ek_list_add_head(ek_list_node_t *head, ek_list_node_t *n * @param head 链表头节点指针 * @param new_node 要添加的新节点 */ -__EK_STATIC_INLINE void ek_list_add_tail(ek_list_node_t *head, ek_list_node_t *new_node) +__EK_STATIC_INLINE void ek_list_insert_tail(ek_list_node_t *head, ek_list_node_t *new_node) { - __ek_list_add(new_node, head->prev, head); + _ek_list_insert(new_node, head->prev, head); } /** @@ -118,7 +118,7 @@ __EK_STATIC_INLINE void ek_list_add_tail(ek_list_node_t *head, ek_list_node_t *n * @param prev 前一个节点 * @param next 后一个节点 */ -__EK_STATIC_INLINE void __ek_list_remove(ek_list_node_t *prev, ek_list_node_t *next) +__EK_STATIC_INLINE void _ek_list_remove(ek_list_node_t *prev, ek_list_node_t *next) { next->prev = prev; prev->next = next; @@ -132,7 +132,7 @@ __EK_STATIC_INLINE void __ek_list_remove(ek_list_node_t *prev, ek_list_node_t *n */ __EK_STATIC_INLINE void ek_list_remove(ek_list_node_t *remove) { - __ek_list_remove(remove->prev, remove->next); + _ek_list_remove(remove->prev, remove->next); remove->prev = NULL; remove->next = NULL; } @@ -143,7 +143,7 @@ __EK_STATIC_INLINE void ek_list_remove(ek_list_node_t *remove) * @return true 链表为空 * @return false 链表非空 */ -__EK_STATIC_INLINE bool ek_list_empty(ek_list_node_t *head) +__EK_STATIC_INLINE bool ek_list_is_empty(ek_list_node_t *head) { return head->next == head; }