diff options
| author | Wayne Lin <[email protected]> | 2022-01-10 12:36:11 +0800 |
|---|---|---|
| committer | Wayne Lin <[email protected]> | 2022-01-10 12:36:11 +0800 |
| commit | 715eecd3eb6cfbbc95aba4fdf932db2e1a7698fb (patch) | |
| tree | 111003eb53eaa4a789729792a622d2abfd602031 /components/net/at/src | |
| parent | 6d2a7d00db2808f26b96efaebfa3aa18b6fd47b8 (diff) | |
| parent | 5206f6504018d1e1978e1c547f6a5b782d505be5 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into nuvoton
# Conflicts:
# bsp/nuvoton/nk-980iot/.config
# bsp/nuvoton/nk-n9h30/.config
# bsp/nuvoton/nk-rtu980/.config
# bsp/nuvoton/numaker-iot-m487/.config
# bsp/nuvoton/numaker-m2354/.config
# bsp/nuvoton/numaker-pfm-m487/.config
Diffstat (limited to 'components/net/at/src')
| -rw-r--r-- | components/net/at/src/at_cli.c | 10 | ||||
| -rw-r--r-- | components/net/at/src/at_server.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/components/net/at/src/at_cli.c b/components/net/at/src/at_cli.c index d51358d863..5ff7880eee 100644 --- a/components/net/at/src/at_cli.c +++ b/components/net/at/src/at_cli.c @@ -123,14 +123,14 @@ static void server_cli_parser(void) device_bak = server->device; getchar_bak = server->get_char; - memset(endmark_back, 0x00, AT_END_MARK_LEN); - memcpy(endmark_back, server->end_mark, strlen(server->end_mark)); + rt_memset(endmark_back, 0x00, AT_END_MARK_LEN); + rt_memcpy(endmark_back, server->end_mark, strlen(server->end_mark)); /* setup server device as console device */ server->device = rt_console_get_device(); server->get_char = at_server_console_getchar; - memset(server->end_mark, 0x00, AT_END_MARK_LEN); + rt_memset(server->end_mark, 0x00, AT_END_MARK_LEN); server->end_mark[0] = '\r'; rt_hw_interrupt_enable(int_lvl); @@ -154,8 +154,8 @@ static void server_cli_parser(void) server->device = device_bak; server->get_char = getchar_bak; - memset(server->end_mark, 0x00, AT_END_MARK_LEN); - memcpy(server->end_mark, endmark_back, strlen(endmark_back)); + rt_memset(server->end_mark, 0x00, AT_END_MARK_LEN); + rt_memcpy(server->end_mark, endmark_back, strlen(endmark_back)); rt_hw_interrupt_enable(int_lvl); } diff --git a/components/net/at/src/at_server.c b/components/net/at/src/at_server.c index 1db26a260b..5d6a63fd98 100644 --- a/components/net/at/src/at_server.c +++ b/components/net/at/src/at_server.c @@ -406,7 +406,7 @@ static rt_err_t at_cmd_get_name(const char *cmd_buffer, char *cmd_name) || (*(cmd_buffer + i) >= AT_CMD_CHAR_0 && *(cmd_buffer + i) <= AT_CMD_CHAR_9)) { cmd_name_len = i; - memcpy(cmd_name, cmd_buffer, cmd_name_len); + rt_memcpy(cmd_name, cmd_buffer, cmd_name_len); *(cmd_name + cmd_name_len) = '\0'; return RT_EOK; @@ -508,7 +508,7 @@ static void server_parser(at_server_t server) } __retry: - memset(server->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); + rt_memset(server->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); server->cur_recv_len = 0; } } @@ -564,7 +564,7 @@ int at_server_init(void) at_server_local->echo_mode = 1; at_server_local->status = AT_STATUS_UNINITIALIZED; - memset(at_server_local->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); + rt_memset(at_server_local->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); at_server_local->cur_recv_len = 0; at_server_local->rx_notice = rt_sem_create("at_svr", 0, RT_IPC_FLAG_FIFO); @@ -600,7 +600,7 @@ int at_server_init(void) } at_server_local->get_char = at_server_getchar; - memcpy(at_server_local->end_mark, AT_CMD_END_MARK, sizeof(AT_CMD_END_MARK)); + rt_memcpy(at_server_local->end_mark, AT_CMD_END_MARK, sizeof(AT_CMD_END_MARK)); at_server_local->parser_entry = server_parser; at_server_local->parser = rt_thread_create("at_svr", |