lby/mr-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正代码格式。

Browse Source
This commit is contained in:
MacRsh
2023-03-14 00:27:45 +08:00
parent 520306e358
commit e48d7b6fb0
3 changed files with 21 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/mrdef.h
View File

@@ -66,9 +66,7 @@ typedef mr_base_t mr_off_t; /**< Type for offset */
#define MR_OPEN_RDONLY 0x1000 /**< Read only */
#define MR_OPEN_WRONLY 0x2000 /**< Write only */
#define MR_OPEN_RDWR 0x3000 /**< Read and Write */
#define MR_OPEN_NONBLOCKING_RD 0x4000 /**< Non-blocking Read */
#define MR_OPEN_NONBLOCKING_WR 0x8000 /**< Non-blocking Write */
#define MR_OPEN_ACTIVE 0x0100 /**< Active */
#define MR_OPEN_ACTIVE 0x8000 /**< Active */
#define _MR_OPEN_FLAG_MASK 0xf000
/* mr-library basic command definitions */
@@ -81,8 +79,6 @@ typedef mr_base_t mr_off_t; /**< Type for offset */
#define MR_CMD_TRANSFER 0x6000 /**< Transfer command */
#define _MR_CMD_MASK 0xf000 /**< Mask for getting command */
/* Compiler Related Definitions */
#if defined(__ARMCC_VERSION)
#define MR_SECTION(x) __attribute__((section(x)))
@@ -238,8 +234,8 @@ struct mr_device
{
struct mr_object object;
mr_err_t (*rx_callback)(mr_device_t this, void *args);
mr_err_t (*tx_callback)(mr_device_t this, void *args);
mr_err_t (*rx_callback)(mr_device_t device, void *args);
mr_err_t (*tx_callback)(mr_device_t device, void *args);
enum mr_device_type type;
mr_uint16_t support_flag;
mr_uint16_t open_flag;

37
include/mrlib.h
View File

@@ -13,17 +13,15 @@
#include <mrdef.h>
#include <mrserve.h>
#include <mrlog.h>
mr_container_t mr_container_find(enum mr_container_type type);
mr_object_t mr_object_find(const char *name, enum mr_container_type type);
void mr_object_init(mr_object_t object, const char *name);
mr_object_t mr_object_create(const char *name);
mr_err_t mr_object_add_to_container(mr_object_t object, enum mr_container_type container_type);
mr_err_t mr_object_add_to_container(mr_object_t object, const char *name, enum mr_container_type container_type);
mr_err_t mr_object_remove_from_container(mr_object_t object);
mr_err_t mr_object_move(mr_object_t object, enum mr_container_type dest_type);
void mr_object_rename(mr_object_t object, char *name);
mr_bool_t mr_object_is_static(mr_object_t object);
void mr_mutex_init(mr_mutex_t mutex);
mr_err_t mr_mutex_take(mr_mutex_t mutex, mr_object_t owner);
@@ -31,16 +29,16 @@ mr_err_t mr_mutex_release(mr_mutex_t mutex, mr_object_t owner);
void mr_ringbuffer_init(mr_ringbuffer_t ringbuffer, mr_uint8_t *pool, mr_size_t pool_size);
mr_size_t mr_ringbuffer_get_data_length(mr_ringbuffer_t ringbuffer);
mr_size_t mr_ringbuffer_write(mr_ringbuffer_t ringbuffer, const mr_uint8_t *buffer, mr_size_t length);
mr_size_t mr_ringbuffer_write_byte(mr_ringbuffer_t ringbuffer, mr_uint8_t data);
mr_size_t mr_ringbuffer_write(mr_ringbuffer_t ringbuffer, const mr_uint8_t *buffer, mr_size_t length);
mr_size_t mr_ringbuffer_write_byte_force(mr_ringbuffer_t ringbuffer, mr_uint8_t data);
mr_size_t mr_ringbuffer_write_force(mr_ringbuffer_t ringbuffer, const mr_uint8_t *buffer, mr_size_t length);
mr_size_t mr_ringbuffer_read(mr_ringbuffer_t ringbuffer, mr_uint8_t *buffer, mr_size_t length);
mr_size_t mr_ringbuffer_read_byte(mr_ringbuffer_t ringbuffer, mr_uint8_t *data);
mr_device_t mr_device_find(const char *name);
void mr_device_init(mr_device_t device, const char *name);
mr_err_t mr_device_add_to_container(mr_device_t device,
const char *name,
enum mr_device_type type,
mr_uint16_t support_flag,
const struct mr_device_ops *ops,
@@ -51,31 +49,4 @@ mr_err_t mr_device_ioctl(mr_device_t device, int cmd, void *args);
mr_size_t mr_device_read(mr_device_t device, mr_off_t pos, void *buf, mr_size_t count);
mr_size_t mr_device_write(mr_device_t device, mr_off_t pos, const void *buf, mr_size_t count);
#define MR_LOG_D(string) \
printf("[ DEBUG ] [ %s ][ %d ][ %s ] { %s }\r\n", \
__FILE__, \
__LINE__, \
__FUNCTION__, \
string \
)
#define MR_LOG_W(string) \
printf("[ WARING ] [ %s ][ %d ][ %s ] { %s }\r\n", \
__FILE__, \
__LINE__, \
__FUNCTION__, \
string \
)
#define MR_LOG_E(string, error) \
if (error != MR_ERR_OK) \
{ \
printf("[ ERROR ] [ %s ][ %d ][ %s ] { %s }{ %d }\r\n", \
__FILE__, \
__LINE__, \
__FUNCTION__, \
string, \
error); \
}
#endif

20
include/mrserve.h
View File

@@ -1,9 +1,15 @@
//
// Created by 10632 on 2023/3/8.
//
/*
* Copyright (c), mr-library Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2023-03-08 MacRsh first version
*/
#ifndef DESIGN_MR_LIBRARY_INCLUDE_MRSERVE_H_
#define DESIGN_MR_LIBRARY_INCLUDE_MRSERVE_H_
#ifndef _MR_SERVE_H_
#define _MR_SERVE_H_
#include <mrdef.h>
@@ -18,6 +24,8 @@ do{ \
#define mr_container_of(ptr, type, member) \
((type *)((char *)(ptr) - (unsigned long)(&((type *)0)->member)))
#define mr_array_get_length(array) sizeof(array)/sizeof(array[0])
MR_INLINE void mr_list_init(mr_list_t list)
{
list->next = list;
@@ -41,4 +49,4 @@ MR_INLINE void mr_list_remove(mr_list_t node)
node->next = node->prev = node;
}
#endif //DESIGN_MR_LIBRARY_INCLUDE_MRSERVE_H_
#endif