From f43697d25fc61c6d46083c8fde6ae186b65ab0df Mon Sep 17 00:00:00 2001 From: MacRsh Date: Sun, 27 Aug 2023 15:16:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=80=82=E9=85=8D=E6=96=B0api=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/mrlib.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/include/mrlib.h b/include/mrlib.h index 21be715..ba69f03 100644 --- a/include/mrlib.h +++ b/include/mrlib.h @@ -41,6 +41,7 @@ mr_size_t mr_rb_get_buffer_size(mr_rb_t rb); mr_size_t mr_rb_get(mr_rb_t rb, mr_uint8_t *data); mr_size_t mr_rb_read(mr_rb_t rb, void *buffer, mr_size_t size); mr_size_t mr_rb_put(mr_rb_t rb, mr_uint8_t data); +mr_size_t mr_rb_put_force(mr_rb_t rb, mr_uint8_t data); mr_size_t mr_rb_write(mr_rb_t rb, const void *buffer, mr_size_t size); mr_size_t mr_rb_write_force(mr_rb_t rb, const void *buffer, mr_size_t size); /** @} */ @@ -79,6 +80,14 @@ mr_err_t mr_mutex_release(mr_mutex_t mutex, void *owner); void *mr_mutex_get_owner(mr_mutex_t mutex); /** @} */ +/** + * @addtogroup Memory + * @{ + */ +void *mr_malloc(mr_size_t size); +void mr_free(void *memory); +/** @} */ + /** * @addtogroup Finite State Machine * @{ @@ -129,7 +138,12 @@ mr_uint32_t mr_soft_timer_get_time(mr_soft_timer_t timer); */ #if (MR_CFG_DEVICE == MR_CFG_ENABLE) mr_device_t mr_device_find(const char *name); -mr_err_t mr_device_add(mr_device_t device, const char *name, mr_uint16_t flags, mr_device_ops_t ops, void *data); +mr_err_t mr_device_add(mr_device_t device, + const char *name, + enum mr_device_type type, + mr_uint16_t flags, + struct mr_device_ops *ops, + void *data); mr_err_t mr_device_open(mr_device_t device, mr_uint16_t flags); mr_err_t mr_device_close(mr_device_t device); mr_err_t mr_device_ioctl(mr_device_t device, int cmd, void *args); @@ -142,8 +156,6 @@ mr_ssize_t mr_device_write(mr_device_t device, mr_pos_t pos, const void *buffer, * @addtogroup Lib C * @{ */ -#define mr_malloc malloc -#define mr_free free #define mr_strncmp strncmp #define mr_strncpy strncpy #define mr_memset memset