Michael Bruck <mbruck@digenius.de> ARM11 cleanup stale dependencies with generic...

[openocd] / src / target / arm11.h

diff --git a/src/target/arm11.h b/src/target/arm11.h
index b22baabcff1a785efcb30615f8bbb7c24ac2bda6..53b2fe6b1bb7b8b8ac8fcd77eae758b6a89b225d 100644 (file)
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2008 digenius technology GmbH.                          *
+ *   Michael Bruck                                                         *
  *                                                                         *
  *   Copyright (C) 2008 Georg Acher <acher@in.tum.de>                      *
  *                                                                         *
@@ -24,9 +25,7 @@
 
 #include "target.h"
 #include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
-#include "types.h"
+#include "jtag.h"
 
 #define asizeof(x)     (sizeof(x) / sizeof((x)[0]))
 
@@ -51,6 +50,19 @@
 #define ARM11_TAP_DEFAULT                      TAP_INVALID
 
 
+#define CHECK_RETVAL(action)                                                           \
+do {                                                                                                           \
+       int __retval = (action);                                                                \
+                                                                                                                       \
+       if (__retval != ERROR_OK)                                                               \
+       {                                                                                                               \
+               LOG_DEBUG("error while calling \"" # action "\"");      \
+               return __retval;                                                                        \
+       }                                                                                                               \
+                                                                                                                       \
+} while (0)
+
+
 typedef struct arm11_register_history_s
 {
        u32             value;
@@ -69,8 +81,6 @@ typedef struct arm11_common_s
 {
        target_t *      target;         /**< Reference back to the owner */
 
-       arm_jtag_t      jtag_info;      /**< Handler to access assigned JTAG device */
-
        /** \name Processor type detection */
        /*@{*/
 
@@ -91,7 +101,7 @@ typedef struct arm11_common_s
        bool    trst_active;
        bool    halt_requested;                                 /**< Keep track if arm11_halt() calls occured
                                                                                                 during reset. Otherwise do it ASAP. */
-                                                                                                
+
        bool    simulate_reset_on_next_halt;    /**< Perform cleanups of the ARM state on next halt */
 
        /** \name Shadow registers to save processor state */
@@ -239,19 +249,19 @@ void arm11_setup_field                    (arm11_common_t * arm11, int num_bits, void * in_data,
 void arm11_add_IR                              (arm11_common_t * arm11, u8 instr, tap_state_t state);
 void arm11_add_debug_SCAN_N            (arm11_common_t * arm11, u8 chain, tap_state_t state);
 void arm11_add_debug_INST              (arm11_common_t * arm11, u32 inst, u8 * flag, tap_state_t state);
-u32  arm11_read_DSCR                   (arm11_common_t * arm11);
-void arm11_write_DSCR                  (arm11_common_t * arm11, u32 dscr);
+int arm11_read_DSCR                            (arm11_common_t * arm11, u32 *dscr);
+int arm11_write_DSCR                   (arm11_common_t * arm11, u32 dscr);
 
 enum target_debug_reason arm11_get_DSCR_debug_reason(u32 dscr);
 
 void arm11_run_instr_data_prepare                      (arm11_common_t * arm11);
 void arm11_run_instr_data_finish                       (arm11_common_t * arm11);
-void arm11_run_instr_no_data                           (arm11_common_t * arm11, u32 * opcode, size_t count);
+int arm11_run_instr_no_data                                    (arm11_common_t * arm11, u32 * opcode, size_t count);
 void arm11_run_instr_no_data1                          (arm11_common_t * arm11, u32 opcode);
-void arm11_run_instr_data_to_core                      (arm11_common_t * arm11, u32 opcode, u32 * data, size_t count);
-void arm11_run_instr_data_to_core_noack                (arm11_common_t * arm11, u32 opcode, u32 * data, size_t count);
-void arm11_run_instr_data_to_core1                     (arm11_common_t * arm11, u32 opcode, u32 data);
-void arm11_run_instr_data_from_core                    (arm11_common_t * arm11, u32 opcode, u32 * data, size_t count);
+int arm11_run_instr_data_to_core                       (arm11_common_t * arm11, u32 opcode, u32 * data, size_t count);
+int arm11_run_instr_data_to_core_noack         (arm11_common_t * arm11, u32 opcode, u32 * data, size_t count);
+int arm11_run_instr_data_to_core1                      (arm11_common_t * arm11, u32 opcode, u32 data);
+int arm11_run_instr_data_from_core                     (arm11_common_t * arm11, u32 opcode, u32 * data, size_t count);
 void arm11_run_instr_data_from_core_via_r0     (arm11_common_t * arm11, u32 opcode, u32 * data);
 void arm11_run_instr_data_to_core_via_r0       (arm11_common_t * arm11, u32 opcode, u32 data);
 
@@ -271,12 +281,12 @@ typedef struct arm11_sc7_action_s
                                                                         function returns.                                      */
 } arm11_sc7_action_t;
 
-void arm11_sc7_run(arm11_common_t * arm11, arm11_sc7_action_t * actions, size_t count);
+int arm11_sc7_run(arm11_common_t * arm11, arm11_sc7_action_t * actions, size_t count);
 
 /* Mid-level helper functions */
 void arm11_sc7_clear_vbw(arm11_common_t * arm11);
 void arm11_sc7_set_vcr(arm11_common_t * arm11, u32 value);
 
-void arm11_read_memory_word(arm11_common_t * arm11, u32 address, u32 * result);
+int arm11_read_memory_word(arm11_common_t * arm11, u32 address, u32 * result);
 
 #endif /* ARM11_H */