src/target: remove 'extern' and wrap headers

[fw/openocd] / src / target / etm.h

diff --git a/src/target/etm.h b/src/target/etm.h
index 6b4938aa782693c1317ebdb81eba2b6da9c02541..c751aac46f3102eed06e0e3cb527f5700a270103 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -165,6 +165,8 @@ typedef struct etm_context_s
        bool data_half;                 /* port half on a 16 bit port */
        bool pc_ok;                     /* full PC has been acquired */
        bool ptr_ok;                    /* whether last_ptr is valid */
+       uint8_t bcd_vers;               /* e.g. 0x13 == ETMv1.3 */
+       uint32_t config;                /* cache of ETM_CONFIG value */
        uint32_t current_pc;            /* current program counter */
        uint32_t last_branch;           /* last branch address output */
        uint32_t last_branch_reason;    /* type of last branch encountered */
@@ -198,8 +200,10 @@ typedef enum
        BR_RSVD7   = 0x7, /* reserved */
 } etmv1_branch_reason_t;
 
-extern reg_cache_t* etm_build_reg_cache(target_t *target, arm_jtag_t *jtag_info, etm_context_t *etm_ctx);
-extern int etm_setup(target_t *target);
+reg_cache_t* etm_build_reg_cache(target_t *target,
+               arm_jtag_t *jtag_info, etm_context_t *etm_ctx);
+
+int etm_setup(target_t *target);
 
 int etm_register_commands(struct command_context_s *cmd_ctx);