Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-27 09:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Fix simulator compilation warnings (#6438)

Browse Source 
* [fix] Fix simulator compilation warnings

* Update bsp/simulator/rtconfig_project.h

Co-authored-by: Man, Jianting (Meco) <920369182@qq.com>
This commit is contained in:
Tangyuxin
2022-09-20 22:31:11 +08:00
committed by GitHub
parent 746d7a01bd
commit a4829b1c00
22 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/utilities/rt-link/inc/rtlink.h
View File

@@ -18,21 +18,21 @@
#define RT_LINK_AUTO_INIT
#define RT_LINK_FLAG_ACK 0x01
#define RT_LINK_FLAG_CRC 0x02
#define RT_LINK_FLAG_ACK 0x01U
#define RT_LINK_FLAG_CRC 0x02U
#define RT_LINK_FRAME_HEAD 0x15
#define RT_LINK_FRAME_HEAD_MASK 0x1F
#define RT_LINK_FRAME_HEAD 0x15U
#define RT_LINK_FRAME_HEAD_MASK 0x1FU
/* The maximum number of split frames for a long package */
#define RT_LINK_FRAMES_MAX 0x03
#define RT_LINK_FRAMES_MAX 0x03U
/* The length in the rt_link_frame_head structure occupies 11 bits,
so the value range after 4-byte alignment is 0-2044.*/
#define RT_LINK_MAX_FRAME_LENGTH 1024
#define RT_LINK_MAX_FRAME_LENGTH 1024U
#define RT_LINK_ACK_MAX 0x07
#define RT_LINK_CRC_LENGTH 4
#define RT_LINK_HEAD_LENGTH 4
#define RT_LINK_EXTEND_LENGTH 4
#define RT_LINK_ACK_MAX 0x07U
#define RT_LINK_CRC_LENGTH 4U
#define RT_LINK_HEAD_LENGTH 4U
#define RT_LINK_EXTEND_LENGTH 4U
#define RT_LINK_MAX_DATA_LENGTH (RT_LINK_MAX_FRAME_LENGTH - \
RT_LINK_HEAD_LENGTH - \

22
components/utilities/rt-link/src/rtlink.c
View File

@@ -70,7 +70,7 @@ struct rt_link_session *rt_link_get_scb(void)
return rt_link_scb;
}
static rt_int16_t rt_link_check_seq(rt_uint8_t new, rt_uint8_t used)
static rt_uint8_t rt_link_check_seq(rt_uint8_t new, rt_uint8_t used)
{
rt_int16_t compare_seq = 0;
compare_seq = new - used;
@@ -78,7 +78,7 @@ static rt_int16_t rt_link_check_seq(rt_uint8_t new, rt_uint8_t used)
{
compare_seq = compare_seq + 256;
}
return compare_seq;
return (rt_uint8_t)compare_seq;
}
static int rt_link_frame_init(struct rt_link_frame *frame, rt_uint8_t config)
@@ -157,7 +157,7 @@ static rt_err_t rt_link_frame_extend_config(struct rt_link_frame *frame, rt_link
return RT_EOK;
}
static int rt_link_command_frame_send(rt_uint8_t serv, rt_uint8_t sequence, rt_link_frame_attr_e attribute, rt_uint16_t parameter)
static int rt_link_command_frame_send(rt_uint16_t serv, rt_uint8_t sequence, rt_link_frame_attr_e attribute, rt_uint16_t parameter)
{
struct rt_link_frame command_frame = {0};
rt_uint8_t data[sizeof(command_frame.head) + sizeof(command_frame.extend)] = {0};
@@ -182,7 +182,7 @@ static int rt_link_command_frame_send(rt_uint8_t serv, rt_uint8_t sequence, rt_l
static void rt_link_service_send_finish(rt_link_err_e err)
{
struct rt_link_frame *frame = RT_NULL;
rt_uint8_t service = RT_LINK_SERVICE_MAX;
rt_uint16_t service = RT_LINK_SERVICE_MAX;
void *buffer = RT_NULL;
rt_slist_t *tem_list = rt_slist_first(&rt_link_scb->tx_data_slist);
if (tem_list == RT_NULL)
@@ -416,7 +416,7 @@ static rt_err_t rt_link_confirm_handle(struct rt_link_frame *receive_frame)
}
/* serv type rt_link_service_e */
static void rt_link_recv_finish(rt_uint8_t serv, void *data, rt_size_t size)
static void rt_link_recv_finish(rt_uint16_t serv, void *data, rt_size_t size)
{
if (rt_link_scb->service[serv] == RT_NULL)
{
@@ -570,7 +570,7 @@ static rt_err_t rt_link_handshake_handle(struct rt_link_frame *receive_frame)
/* sync requester tx seq, responder rx seq = requester tx seq */
rt_link_scb->rx_record.rx_seq = receive_frame->head.sequence;
/* sync requester rx seq, responder tx seq = requester rx seq */
rt_link_scb->tx_seq = receive_frame->extend.parameter;
rt_link_scb->tx_seq = (rt_uint8_t)receive_frame->extend.parameter;
if (rt_link_scb->service[receive_frame->head.service] != RT_NULL)
{
@@ -1042,11 +1042,11 @@ rt_size_t rt_link_send(struct rt_link_service *service, const void *data, rt_siz
service->err = RT_LINK_EOK;
if (size % RT_LINK_MAX_DATA_LENGTH == 0)
{
total = size / RT_LINK_MAX_DATA_LENGTH;
total = (rt_uint8_t)(size / RT_LINK_MAX_DATA_LENGTH);
}
else
{
total = size / RT_LINK_MAX_DATA_LENGTH + 1;
total = (rt_uint8_t)(size / RT_LINK_MAX_DATA_LENGTH + 1);
}
if (total > RT_LINK_FRAMES_MAX)
@@ -1079,7 +1079,7 @@ rt_size_t rt_link_send(struct rt_link_service *service, const void *data, rt_siz
send_frame->attribute = RT_LINK_LONG_DATA_FRAME;
if (offset + RT_LINK_MAX_DATA_LENGTH > size)
{
send_frame->data_len = size - offset;
send_frame->data_len = (rt_uint16_t)(size - offset);
}
else
{
@@ -1087,12 +1087,12 @@ rt_size_t rt_link_send(struct rt_link_service *service, const void *data, rt_siz
offset += RT_LINK_MAX_DATA_LENGTH;
}
rt_link_frame_extend_config(send_frame, RT_LINK_LONG_DATA_FRAME, size);
rt_link_frame_extend_config(send_frame, RT_LINK_LONG_DATA_FRAME, (rt_uint16_t)size);
}
else
{
send_frame->attribute = RT_LINK_SHORT_DATA_FRAME;
send_frame->data_len = size;
send_frame->data_len = (rt_uint16_t)size;
}
/* append the frame on the tail of list */

2
components/utilities/rt-link/src/rtlink_hw.c
View File

@@ -47,7 +47,7 @@ struct rt_link_receive_buffer *rt_link_hw_buffer_init(void *parameter)
static rt_size_t rt_link_hw_buffer_write(void *data, rt_size_t count)
{
int surplus = 0;
rt_size_t surplus = 0;
if (rx_buffer == RT_NULL)
{
return 0;

4
components/utilities/ulog/ulog.c
View File

@@ -522,7 +522,7 @@ static void do_output(rt_uint32_t level, const char *tag, rt_bool_t is_raw, cons
}
else if (ulog.async_rb)
{
rt_ringbuffer_put(ulog.async_rb, (const rt_uint8_t *)log_buf, log_buf_size);
rt_ringbuffer_put(ulog.async_rb, (const rt_uint8_t *)log_buf, (rt_uint16_t)log_buf_size);
/* send a notice */
rt_sem_release(&ulog.async_notice);
}
@@ -1405,7 +1405,7 @@ void ulog_async_output(void)
char *log = rt_malloc(log_len + 1);
if (log)
{
rt_size_t len = rt_ringbuffer_get(ulog.async_rb, (rt_uint8_t *)log, log_len);
rt_size_t len = rt_ringbuffer_get(ulog.async_rb, (rt_uint8_t *)log, (rt_uint16_t)log_len);
log[log_len] = '\0';
ulog_output_to_all_backend(LOG_LVL_DBG, "", RT_TRUE, log, len);
rt_free(log);