ARMv7-M: make DAP commands verify target is an ARMv7-M

[openocd.git] / src / target / avrt.c

diff --git a/src/target/avrt.c b/src/target/avrt.c
index 43715614d7da0ca13729a5277fe04f08d7d90ff6..6ba620688d2657936e51d1efe701dea38b288f56 100644 (file)
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -28,12 +28,9 @@
 
 #define AVR_JTAG_INS_LEN       4
 
-/* cli handling */
-int avr_register_commands(struct command_context_s *cmd_ctx);
-
 /* forward declarations */
 int avr_target_create(struct target *target, Jim_Interp *interp);
-int avr_init_target(struct command_context_s *cmd_ctx, struct target *target);
+int avr_init_target(struct command_context *cmd_ctx, struct target *target);
 
 int avr_arch_state(struct target *target);
 int avr_poll(struct target *target);
@@ -91,17 +88,10 @@ struct target_type avr_target =
        .add_watchpoint = avr_add_watchpoint,
        .remove_watchpoint = avr_remove_watchpoint,
 */
-       .register_commands = avr_register_commands,
        .target_create = avr_target_create,
        .init_target = avr_init_target,
 };
 
-int avr_register_commands(struct command_context_s *cmd_ctx)
-{
-       LOG_DEBUG("%s", __FUNCTION__);
-       return ERROR_OK;
-}
-
 int avr_target_create(struct target *target, Jim_Interp *interp)
 {
        struct avr_common *avr = calloc(1, sizeof(struct avr_common));
@@ -112,7 +102,7 @@ int avr_target_create(struct target *target, Jim_Interp *interp)
        return ERROR_OK;
 }
 
-int avr_init_target(struct command_context_s *cmd_ctx, struct target *target)
+int avr_init_target(struct command_context *cmd_ctx, struct target *target)
 {
        LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
@@ -206,7 +196,7 @@ int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_l
                field[0].num_bits = tap->ir_length;
                field[0].out_value = ir_out;
                field[0].in_value = ir_in;
-               jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, jtag_set_end_state(TAP_IDLE));
+               jtag_add_plain_ir_scan(ARRAY_SIZE(field), field, jtag_set_end_state(TAP_IDLE));
        }
 
        return ERROR_OK;
@@ -227,7 +217,7 @@ int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_l
                field[0].num_bits = dr_len;
                field[0].out_value = dr_out;
                field[0].in_value = dr_in;
-               jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, jtag_set_end_state(TAP_IDLE));
+               jtag_add_plain_dr_scan(ARRAY_SIZE(field), field, jtag_set_end_state(TAP_IDLE));
        }
 
        return ERROR_OK;