Merge branch 'contrib/github_pr_15942_v5.5' into 'release/v5.5'

Jiang Jiang Jian · Jiang Jiang Jian · commit 27b85137c771 · 2025-05-20T22:37:40.000+08:00
fix(esp_hw_support): Fix compile error on esp_cpu_int_has_handler on ESP32-P4 (GitHub PR) (v5.5)

See merge request espressif/esp-idf!39117
diff --git a/components/esp_hw_support/include/esp_cpu.h b/components/esp_hw_support/include/esp_cpu.h
@@ -364,7 +364,7 @@ FORCE_INLINE_ATTR bool esp_cpu_intr_has_handler(int intr_num)
 #ifdef __XTENSA__
     has_handler = xt_int_has_handler(intr_num, esp_cpu_get_core_id());
 #else
-    has_handler = intr_handler_get(intr_num);
+    has_handler = intr_handler_get(intr_num) != NULL;
 #endif
     return has_handler;
 }

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ FORCE_INLINE_ATTR bool esp_cpu_intr_has_handler(int intr_num)`
`364`	`364`	`#ifdef __XTENSA__`
`365`	`365`	`has_handler = xt_int_has_handler(intr_num, esp_cpu_get_core_id());`
`366`	`366`	`#else`
`367`		`- has_handler = intr_handler_get(intr_num);`
	`367`	`+ has_handler = intr_handler_get(intr_num) != NULL;`
`368`	`368`	`#endif`
`369`	`369`	`return has_handler;`
`370`	`370`	`}`