Skip to content

Commit f89a162

Browse files
mysterywolfBernardXiong
authored andcommitted
[core] 使用rt_memcpy rt_memset代替memcpy memset
1 parent bb10845 commit f89a162

File tree

25 files changed

+86
-86
lines changed

25 files changed

+86
-86
lines changed

components/dfs/filesystems/elmfat/dfs_elm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ int dfs_elm_mkfs(rt_device_t dev_id)
265265
/* [IN] Format options */
266266
/* [-] Working buffer */
267267
/* [IN] Size of working buffer */
268-
memset(&opt, 0, sizeof(opt));
268+
rt_memset(&opt, 0, sizeof(opt));
269269
opt.fmt = FM_ANY|FM_SFD;
270270
result = f_mkfs(logic_nbr, &opt, work, FF_MAX_SS);
271271
rt_free(work); work = RT_NULL;
@@ -792,7 +792,7 @@ int dfs_elm_stat(struct dfs_filesystem *fs, const char *path, struct stat *st)
792792
tmp >>= 6;
793793
hour = tmp & 0x1F; /* bit[15:11] Hour(0..23) */
794794

795-
memset(&tm_file, 0, sizeof(tm_file));
795+
rt_memset(&tm_file, 0, sizeof(tm_file));
796796
tm_file.tm_year = year - 1900; /* Years since 1900 */
797797
tm_file.tm_mon = mon - 1; /* Months *since* january: 0-11 */
798798
tm_file.tm_mday = day; /* Day of the month: 1-31 */
@@ -957,7 +957,7 @@ DWORD get_fattime(void)
957957
/* converts calendar time time into local time. */
958958
p_tm = gmtime(&now);
959959
/* copy the statically located variable */
960-
memcpy(&tm_now, p_tm, sizeof(struct tm));
960+
rt_memcpy(&tm_now, p_tm, sizeof(struct tm));
961961
/* unlock scheduler. */
962962
rt_exit_critical();
963963

components/dfs/filesystems/ramfs/dfs_ramfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ int dfs_ramfs_read(struct dfs_fd *file, void *buf, size_t count)
106106
length = file->size - file->pos;
107107

108108
if (length > 0)
109-
memcpy(buf, &(dirent->data[file->pos]), length);
109+
rt_memcpy(buf, &(dirent->data[file->pos]), length);
110110

111111
/* update file current position */
112112
file->pos += length;
@@ -143,7 +143,7 @@ int dfs_ramfs_write(struct dfs_fd *fd, const void *buf, size_t count)
143143
}
144144

145145
if (count > 0)
146-
memcpy(dirent->data + fd->pos, buf, count);
146+
rt_memcpy(dirent->data + fd->pos, buf, count);
147147

148148
/* update file current position */
149149
fd->pos += count;
@@ -442,7 +442,7 @@ struct dfs_ramfs *dfs_ramfs_create(rt_uint8_t *pool, rt_size_t size)
442442
ramfs->memheap.parent.type = RT_Object_Class_MemHeap | RT_Object_Class_Static;
443443

444444
/* initialize root directory */
445-
memset(&(ramfs->root), 0x00, sizeof(ramfs->root));
445+
rt_memset(&(ramfs->root), 0x00, sizeof(ramfs->root));
446446
rt_list_init(&(ramfs->root.list));
447447
ramfs->root.size = 0;
448448
strcpy(ramfs->root.name, ".");

components/dfs/filesystems/romfs/dfs_romfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ int dfs_romfs_read(struct dfs_fd *file, void *buf, size_t count)
147147
length = file->size - file->pos;
148148

149149
if (length > 0)
150-
memcpy(buf, &(dirent->data[file->pos]), length);
150+
rt_memcpy(buf, &(dirent->data[file->pos]), length);
151151

152152
/* update file current position */
153153
file->pos += length;

components/dfs/src/dfs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ int dfs_init(void)
5555
}
5656

5757
/* clear filesystem operations table */
58-
memset((void *)filesystem_operation_table, 0, sizeof(filesystem_operation_table));
58+
rt_memset((void *)filesystem_operation_table, 0, sizeof(filesystem_operation_table));
5959
/* clear filesystem table */
60-
memset(filesystem_table, 0, sizeof(filesystem_table));
60+
rt_memset(filesystem_table, 0, sizeof(filesystem_table));
6161
/* clean fd table */
62-
memset(&_fdtab, 0, sizeof(_fdtab));
62+
rt_memset(&_fdtab, 0, sizeof(_fdtab));
6363

6464
/* create device filesystem lock */
6565
rt_mutex_init(&fslock, "fslock", RT_IPC_FLAG_PRIO);
6666

6767
#ifdef DFS_USING_WORKDIR
6868
/* set current working directory */
69-
memset(working_directory, 0, sizeof(working_directory));
69+
rt_memset(working_directory, 0, sizeof(working_directory));
7070
working_directory[0] = '/';
7171
#endif
7272

components/dfs/src/dfs_file.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -543,11 +543,11 @@ void ls(const char *pathname)
543543
rt_kprintf("Directory %s:\n", path);
544544
do
545545
{
546-
memset(&dirent, 0, sizeof(struct dirent));
546+
rt_memset(&dirent, 0, sizeof(struct dirent));
547547
length = dfs_file_getdents(&fd, &dirent, sizeof(struct dirent));
548548
if (length > 0)
549549
{
550-
memset(&stat, 0, sizeof(struct stat));
550+
rt_memset(&stat, 0, sizeof(struct stat));
551551

552552
/* build full path for each file */
553553
fullpath = dfs_normalize_path(path, dirent.d_name);
@@ -607,7 +607,7 @@ void cat(const char *filename)
607607

608608
do
609609
{
610-
memset(buffer, 0, sizeof(buffer));
610+
rt_memset(buffer, 0, sizeof(buffer));
611611
length = dfs_file_read(&fd, buffer, sizeof(buffer) - 1);
612612
if (length > 0)
613613
{
@@ -692,7 +692,7 @@ static void copydir(const char *src, const char *dst)
692692

693693
do
694694
{
695-
memset(&dirent, 0, sizeof(struct dirent));
695+
rt_memset(&dirent, 0, sizeof(struct dirent));
696696

697697
length = dfs_file_getdents(&cpfd, &dirent, sizeof(struct dirent));
698698
if (length > 0)
@@ -716,7 +716,7 @@ static void copydir(const char *src, const char *dst)
716716
break;
717717
}
718718

719-
memset(&stat, 0, sizeof(struct stat));
719+
rt_memset(&stat, 0, sizeof(struct stat));
720720
if (dfs_file_stat(src_entry_full, &stat) != 0)
721721
{
722722
rt_kprintf("open file: %s failed\n", dirent.d_name);

components/dfs/src/dfs_fs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ int dfs_mount(const char *device_name,
323323
{
324324
/* The underlying device has error, clear the entry. */
325325
dfs_lock();
326-
memset(fs, 0, sizeof(struct dfs_filesystem));
326+
rt_memset(fs, 0, sizeof(struct dfs_filesystem));
327327

328328
goto err1;
329329
}
@@ -339,7 +339,7 @@ int dfs_mount(const char *device_name,
339339
/* mount failed */
340340
dfs_lock();
341341
/* clear filesystem table entry */
342-
memset(fs, 0, sizeof(struct dfs_filesystem));
342+
rt_memset(fs, 0, sizeof(struct dfs_filesystem));
343343

344344
goto err1;
345345
}
@@ -403,7 +403,7 @@ int dfs_unmount(const char *specialfile)
403403
rt_free(fs->path);
404404

405405
/* clear this filesystem table entry */
406-
memset(fs, 0, sizeof(struct dfs_filesystem));
406+
rt_memset(fs, 0, sizeof(struct dfs_filesystem));
407407

408408
dfs_unlock();
409409
rt_free(fullpath);
@@ -590,7 +590,7 @@ int dfs_unmount_device(rt_device_t dev)
590590
rt_free(fs->path);
591591

592592
/* clear this filesystem table entry */
593-
memset(fs, 0, sizeof(struct dfs_filesystem));
593+
rt_memset(fs, 0, sizeof(struct dfs_filesystem));
594594

595595
dfs_unlock();
596596

components/dfs/src/dfs_posix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ DIR *opendir(const char *name)
639639
}
640640
else
641641
{
642-
memset(t, 0, sizeof(DIR));
642+
rt_memset(t, 0, sizeof(DIR));
643643

644644
t->fd = fd;
645645
}

components/drivers/audio/audio.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio)
5252
rt_completion_done(&audio->replay->cmp);
5353

5454
/* send zero frames */
55-
memset(&buf_info->buffer[audio->replay->pos], 0, dst_size);
55+
rt_memset(&buf_info->buffer[audio->replay->pos], 0, dst_size);
5656

5757
audio->replay->pos += dst_size;
5858
audio->replay->pos %= buf_info->total_size;
5959
}
6060
else
6161
{
62-
memset(&buf_info->buffer[audio->replay->pos], 0, dst_size);
62+
rt_memset(&buf_info->buffer[audio->replay->pos], 0, dst_size);
6363

6464
/* copy data from memory pool to hardware device fifo */
6565
while (index < dst_size)
@@ -77,7 +77,7 @@ static rt_err_t _audio_send_replay_frame(struct rt_audio_device *audio)
7777
}
7878

7979
remain_bytes = MIN((dst_size - index), (src_size - audio->replay->read_index));
80-
memcpy(&buf_info->buffer[audio->replay->pos],
80+
rt_memcpy(&buf_info->buffer[audio->replay->pos],
8181
&data[audio->replay->read_index], remain_bytes);
8282

8383
index += remain_bytes;
@@ -229,7 +229,7 @@ static rt_err_t _audio_dev_init(struct rt_device *dev)
229229

230230
if (replay == RT_NULL)
231231
return -RT_ENOMEM;
232-
memset(replay, 0, sizeof(struct rt_audio_replay));
232+
rt_memset(replay, 0, sizeof(struct rt_audio_replay));
233233

234234
/* init memory pool for replay */
235235
replay->mp = rt_mp_create("adu_mp", RT_AUDIO_REPLAY_MP_BLOCK_COUNT, RT_AUDIO_REPLAY_MP_BLOCK_SIZE);
@@ -258,7 +258,7 @@ static rt_err_t _audio_dev_init(struct rt_device *dev)
258258

259259
if (record == RT_NULL)
260260
return -RT_ENOMEM;
261-
memset(record, 0, sizeof(struct rt_audio_record));
261+
rt_memset(record, 0, sizeof(struct rt_audio_record));
262262

263263
/* init pipe for record*/
264264
buffer = rt_malloc(RT_AUDIO_RECORD_PIPE_SIZE);
@@ -393,12 +393,12 @@ static rt_size_t _audio_dev_write(struct rt_device *dev, rt_off_t pos, const voi
393393
if (audio->replay->write_index % block_size == 0)
394394
{
395395
audio->replay->write_data = rt_mp_alloc(audio->replay->mp, RT_WAITING_FOREVER);
396-
memset(audio->replay->write_data, 0, block_size);
396+
rt_memset(audio->replay->write_data, 0, block_size);
397397
}
398398

399399
/* copy data to replay memory pool */
400400
remain_bytes = MIN((block_size - audio->replay->write_index), (size - index));
401-
memcpy(&audio->replay->write_data[audio->replay->write_index], &ptr[index], remain_bytes);
401+
rt_memcpy(&audio->replay->write_data[audio->replay->write_index], &ptr[index], remain_bytes);
402402

403403
index += remain_bytes;
404404
audio->replay->write_index += remain_bytes;

components/drivers/misc/rt_drv_pwm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ rt_err_t rt_device_pwm_register(struct rt_device_pwm *device, const char *name,
105105
{
106106
rt_err_t result = RT_EOK;
107107

108-
memset(device, 0, sizeof(struct rt_device_pwm));
108+
rt_memset(device, 0, sizeof(struct rt_device_pwm));
109109

110110
#ifdef RT_USING_DEVICE_OPS
111111
device->parent.ops = &pwm_device_ops;

components/drivers/rtc/soft_rtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
6161
struct tm time_temp;
6262

6363
RT_ASSERT(dev != RT_NULL);
64-
memset(&time_temp, 0, sizeof(struct tm));
64+
rt_memset(&time_temp, 0, sizeof(struct tm));
6565

6666
switch (cmd)
6767
{

0 commit comments

Comments
 (0)