This is an automated email from Gerrit.

"Erhan Kurubas <erhan.kuru...@espressif.com>" just uploaded a new patch set to 
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7441

-- gerrit

commit 8b8e988c3d1872a5a48878670969d6f647b6508f
Author: Erhan Kurubas <erhan.kuru...@espressif.com>
Date:   Sat Jan 21 12:46:33 2023 +0100

    rtos: remove config.h includes from stackings headers
    
    And add its own header to the rtos_xxx_stackings.c
    
    Signed-off-by: Erhan Kurubas <erhan.kuru...@espressif.com>
    Change-Id: I084130fde7ee8645129a7cf60bb7bf59448e2f39

diff --git a/src/rtos/rtos_chibios_stackings.c 
b/src/rtos/rtos_chibios_stackings.c
index e2fe0a27f0..c0816ac3cf 100644
--- a/src/rtos/rtos_chibios_stackings.c
+++ b/src/rtos/rtos_chibios_stackings.c
@@ -14,6 +14,7 @@
 
 #include "rtos.h"
 #include "target/armv7m.h"
+#include "rtos_chibios_stackings.h"
 
 static const struct stack_register_offset 
rtos_chibios_arm_v7m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
        { ARMV7M_R0,   -1,   32 },              /* r0   */
diff --git a/src/rtos/rtos_chibios_stackings.h 
b/src/rtos/rtos_chibios_stackings.h
index 23ad44ae3b..e909451e25 100644
--- a/src/rtos/rtos_chibios_stackings.h
+++ b/src/rtos/rtos_chibios_stackings.h
@@ -8,10 +8,6 @@
 #ifndef OPENOCD_RTOS_RTOS_CHIBIOS_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_CHIBIOS_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_chibios_arm_v7m_stacking;
diff --git a/src/rtos/rtos_ecos_stackings.c b/src/rtos/rtos_ecos_stackings.c
index 86e1765078..cae271270a 100644
--- a/src/rtos/rtos_ecos_stackings.c
+++ b/src/rtos/rtos_ecos_stackings.c
@@ -5,8 +5,9 @@
 #endif
 
 #include "rtos.h"
-#include "rtos_standard_stackings.h"
 #include "target/armv7m.h"
+#include "rtos_standard_stackings.h"
+#include "rtos_ecos_stackings.h"
 
 /* For Cortex-M eCos applications the actual thread context register layout can
  * be different between active threads of an application depending on whether
diff --git a/src/rtos/rtos_ecos_stackings.h b/src/rtos/rtos_ecos_stackings.h
index 0375e2d1c5..a6bcf1acbb 100644
--- a/src/rtos/rtos_ecos_stackings.h
+++ b/src/rtos/rtos_ecos_stackings.h
@@ -3,10 +3,6 @@
 #ifndef OPENOCD_RTOS_RTOS_ECOS_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_ECOS_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_ecos_cortex_m3_stacking;
diff --git a/src/rtos/rtos_embkernel_stackings.c 
b/src/rtos/rtos_embkernel_stackings.c
index 809b622e06..b98628a136 100644
--- a/src/rtos/rtos_embkernel_stackings.c
+++ b/src/rtos/rtos_embkernel_stackings.c
@@ -12,6 +12,7 @@
 #include "rtos.h"
 #include "target/armv7m.h"
 #include "rtos_standard_stackings.h"
+#include "rtos_embkernel_stackings.h"
 
 static const struct stack_register_offset 
rtos_embkernel_cortex_m_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
        { ARMV7M_R0,   0x24, 32 },              /* r0   */
diff --git a/src/rtos/rtos_embkernel_stackings.h 
b/src/rtos/rtos_embkernel_stackings.h
index 972bce66d9..87bd0e73b8 100644
--- a/src/rtos/rtos_embkernel_stackings.h
+++ b/src/rtos/rtos_embkernel_stackings.h
@@ -8,10 +8,6 @@
 #ifndef OPENOCD_RTOS_RTOS_EMBKERNEL_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_EMBKERNEL_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_embkernel_cortex_m_stacking;
diff --git a/src/rtos/rtos_mqx_stackings.c b/src/rtos/rtos_mqx_stackings.c
index 8c8fd2053a..5ab743bf30 100644
--- a/src/rtos/rtos_mqx_stackings.c
+++ b/src/rtos/rtos_mqx_stackings.c
@@ -11,7 +11,7 @@
 
 #include "rtos.h"
 #include "target/armv7m.h"
-
+#include "rtos_mqx_stackings.h"
 
 /*
  * standard exception stack
diff --git a/src/rtos/rtos_mqx_stackings.h b/src/rtos/rtos_mqx_stackings.h
index f86c05a40d..faa741de60 100644
--- a/src/rtos/rtos_mqx_stackings.h
+++ b/src/rtos/rtos_mqx_stackings.h
@@ -8,10 +8,6 @@
 #ifndef OPENOCD_RTOS_RTOS_MQX_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_MQX_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_mqx_arm_v7m_stacking;
diff --git a/src/rtos/rtos_riot_stackings.c b/src/rtos/rtos_riot_stackings.c
index e717e8cfec..e467621684 100644
--- a/src/rtos/rtos_riot_stackings.c
+++ b/src/rtos/rtos_riot_stackings.c
@@ -12,6 +12,7 @@
 #include "rtos.h"
 #include "target/armv7m.h"
 #include "rtos_standard_stackings.h"
+#include "rtos_riot_stackings.h"
 
 /* This works for the M0 and M34 stackings as xPSR is in a fixed
  * location
diff --git a/src/rtos/rtos_riot_stackings.h b/src/rtos/rtos_riot_stackings.h
index 3b6c5f41c0..ebd5337568 100644
--- a/src/rtos/rtos_riot_stackings.h
+++ b/src/rtos/rtos_riot_stackings.h
@@ -8,14 +8,9 @@
 #ifndef OPENOCD_RTOS_RTOS_RIOT_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_RIOT_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_riot_cortex_m0_stacking;
 extern const struct rtos_register_stacking rtos_riot_cortex_m34_stacking;
 
 #endif /* OPENOCD_RTOS_RTOS_RIOT_STACKINGS_H */
-
diff --git a/src/rtos/rtos_standard_stackings.c 
b/src/rtos/rtos_standard_stackings.c
index f83f0a1fbf..5478080cf7 100644
--- a/src/rtos/rtos_standard_stackings.c
+++ b/src/rtos/rtos_standard_stackings.c
@@ -11,6 +11,7 @@
 
 #include "rtos.h"
 #include "target/armv7m.h"
+#include "rtos_standard_stackings.h"
 
 static const struct stack_register_offset 
rtos_standard_cortex_m3_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
        { ARMV7M_R0,   0x20, 32 },              /* r0   */
diff --git a/src/rtos/rtos_standard_stackings.h 
b/src/rtos/rtos_standard_stackings.h
index 2477fffd1e..99fbe07e48 100644
--- a/src/rtos/rtos_standard_stackings.h
+++ b/src/rtos/rtos_standard_stackings.h
@@ -8,10 +8,6 @@
 #ifndef OPENOCD_RTOS_RTOS_STANDARD_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_STANDARD_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_standard_cortex_m3_stacking;
diff --git a/src/rtos/rtos_ucos_iii_stackings.c 
b/src/rtos/rtos_ucos_iii_stackings.c
index 9ba5288bf1..f1e248231e 100644
--- a/src/rtos/rtos_ucos_iii_stackings.c
+++ b/src/rtos/rtos_ucos_iii_stackings.c
@@ -9,11 +9,11 @@
 #include "config.h"
 #endif
 
-#include <helper/types.h>
-#include <rtos/rtos.h>
-#include <rtos/rtos_standard_stackings.h>
-#include <target/armv7m.h>
-#include <target/esirisc.h>
+#include "rtos.h"
+#include "target/armv7m.h"
+#include "target/esirisc.h"
+#include "rtos_standard_stackings.h"
+#include "rtos_ucos_iii_stackings.h"
 
 static const struct stack_register_offset 
rtos_ucos_iii_cortex_m_stack_offsets[] = {
        { ARMV7M_R0,   0x20, 32 },      /* r0   */
diff --git a/src/rtos/rtos_ucos_iii_stackings.h 
b/src/rtos/rtos_ucos_iii_stackings.h
index 831c68e1c9..dfe60b27b4 100644
--- a/src/rtos/rtos_ucos_iii_stackings.h
+++ b/src/rtos/rtos_ucos_iii_stackings.h
@@ -8,11 +8,7 @@
 #ifndef OPENOCD_RTOS_RTOS_UCOS_III_STACKINGS_H
 #define OPENOCD_RTOS_RTOS_UCOS_III_STACKINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtos/rtos.h>
+#include "rtos.h"
 
 extern const struct rtos_register_stacking rtos_ucos_iii_cortex_m_stacking;
 extern const struct rtos_register_stacking rtos_ucos_iii_esi_risc_stacking;

-- 

Reply via email to