libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[finsh][cmd] Enhance system robustness (#5832)

This commit is contained in:
Tangyuxin 2022-04-19 22:46:42 +08:00 committed by GitHub
parent 7847c5e98d
commit 14d9709fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/finsh/cmd.c
View File

@ -793,7 +793,7 @@ long list_timer(void)
MSH_CMD_EXPORT(list_timer, list timer in system); MSH_CMD_EXPORT(list_timer, list timer in system);
#ifdef RT_USING_DEVICE #ifdef RT_USING_DEVICE
static char *const device_type_str[] = static char *const device_type_str[RT_Device_Class_Unknown] =
{ {
"Character Device", "Character Device",
"Block Device", "Block Device",
@ -825,7 +825,6 @@ static char *const device_type_str[] =
"DAC Device", "DAC Device",
"WDT Device", "WDT Device",
"PWM Device", "PWM Device",
"Unknown"
}; };
long list_device(void) long list_device(void)
@ -834,6 +833,7 @@ long list_device(void)
list_get_next_t find_arg; list_get_next_t find_arg;
rt_list_t *obj_list[LIST_FIND_OBJ_NR]; rt_list_t *obj_list[LIST_FIND_OBJ_NR];
rt_list_t *next = (rt_list_t *)RT_NULL; rt_list_t *next = (rt_list_t *)RT_NULL;
const char *device_type;
int maxlen; int maxlen;
const char *item_title = "device"; const char *item_title = "device";
@ -866,12 +866,16 @@ long list_device(void)
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
device = (struct rt_device *)obj; device = (struct rt_device *)obj;
device_type = "Unknown";
if (device->type < RT_Device_Class_Unknown &&
device_type_str[device->type] != RT_NULL)
{
device_type = device_type_str[device->type];
}
rt_kprintf("%-*.*s %-20s %-8d\n", rt_kprintf("%-*.*s %-20s %-8d\n",
maxlen, RT_NAME_MAX, maxlen, RT_NAME_MAX,
device->parent.name, device->parent.name,
(device->type <= RT_Device_Class_Unknown) ? device_type,
device_type_str[device->type] :
device_type_str[RT_Device_Class_Unknown],
device->ref_count); device->ref_count);
} }