kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/fix_sign_conversion_warnign' into 'master'
freertos: Silence sign-conversion warning Closes IDFGH-3949 See merge request espressif/esp-idf!10724pull/6416/head
commit
19883d9799
|
@ -29,14 +29,14 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
static inline int IRAM_ATTR cpu_ll_get_core_id(void)
|
||||
static inline uint32_t IRAM_ATTR cpu_ll_get_core_id(void)
|
||||
{
|
||||
uint32_t id;
|
||||
asm volatile (
|
||||
"rsr.prid %0\n"
|
||||
"extui %0,%0,13,1"
|
||||
:"=r"(id));
|
||||
return (int) id;
|
||||
return id;
|
||||
}
|
||||
|
||||
static inline uint32_t cpu_ll_get_cycle_count(void)
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
static inline int IRAM_ATTR cpu_ll_get_core_id(void)
|
||||
static inline uint32_t IRAM_ATTR cpu_ll_get_core_id(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -28,14 +28,14 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
static inline int IRAM_ATTR cpu_ll_get_core_id(void)
|
||||
static inline uint32_t IRAM_ATTR cpu_ll_get_core_id(void)
|
||||
{
|
||||
uint32_t id;
|
||||
asm volatile (
|
||||
"rsr.prid %0\n"
|
||||
"extui %0,%0,13,1"
|
||||
:"=r"(id));
|
||||
return (int) id;
|
||||
return id;
|
||||
}
|
||||
|
||||
static inline uint32_t cpu_ll_get_cycle_count(void)
|
||||
|
|
|
@ -30,7 +30,7 @@ extern "C" {
|
|||
#if SOC_CPU_CORES_NUM > 1
|
||||
// Utility functions for multicore targets
|
||||
#define __SOC_HAL_PERFORM_ON_OTHER_CORES(action) { \
|
||||
for (int i = 0, cur = cpu_hal_get_core_id(); i < SOC_CPU_CORES_NUM; i++) { \
|
||||
for (uint32_t i = 0, cur = cpu_hal_get_core_id(); i < SOC_CPU_CORES_NUM; i++) { \
|
||||
if (i != cur) { \
|
||||
action(i); \
|
||||
} \
|
||||
|
|
Ładowanie…
Reference in New Issue