diff options
| author | David Lin <[email protected]> | 2021-06-24 22:36:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-24 22:36:14 +0800 |
| commit | 6efca1d120aa64b5345e6a0801f23c3fa0e47db4 (patch) | |
| tree | 8644973a5c0d19072a19d8d7f8ebd63dfbbed408 /components | |
| parent | 09b08cca8e5b8c728fb886abc866c22974527b6c (diff) | |
| parent | fcb0a47328a3178d02b3bc0a83bd9e84818e08b7 (diff) | |
Merge branch 'RT-Thread:master' into master
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/pm/pm.c | 4 | ||||
| -rw-r--r-- | components/finsh/shell.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/components/drivers/pm/pm.c b/components/drivers/pm/pm.c index 80ed101498..cf488a9ce1 100644 --- a/components/drivers/pm/pm.c +++ b/components/drivers/pm/pm.c @@ -836,12 +836,10 @@ rt_uint32_t rt_pm_module_get_status(void) rt_uint32_t req_status = 0x00; pm = &_pm; - for (index = 0; index < 32; index ++) + for (index = 0; index < PM_MODULE_MAX_ID; index ++) { if (pm->module_status[index].req_status == 0x01) req_status |= 1<<index; - if (index >= PM_MODULE_MAX_ID) - break; } return req_status; diff --git a/components/finsh/shell.c b/components/finsh/shell.c index a749660629..c89139c0ed 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -817,7 +817,7 @@ int finsh_system_init(void) rt_thread_t tid; #ifdef FINSH_USING_SYMTAB -#if defined(__CC_ARM) || defined(__CLANG_ARM) /* ARM C Compiler */ +#ifdef __ARMCC_VERSION /* ARM C Compiler */ extern const int FSymTab$$Base; extern const int FSymTab$$Limit; extern const int VSymTab$$Base; |