kinetis: Revise CPU un-securing code

[fw/openocd] / src / target / avr32_ap7k.c

diff --git a/src/target/avr32_ap7k.c b/src/target/avr32_ap7k.c
index 1e9fcbfc44e393ea6a7879a19995598fb04c38ce..e1812eccb049dfdd47d1a698ee24c817aac84c3b 100644 (file)
--- a/src/target/avr32_ap7k.c
+++ b/src/target/avr32_ap7k.c
@@ -178,7 +178,7 @@ static struct reg_cache *avr32_build_reg_cache(struct target *target)
        struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
        struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
        struct reg_cache *cache = malloc(sizeof(struct reg_cache));
-       struct reg *reg_list = malloc(sizeof(struct reg) * num_regs);
+       struct reg *reg_list = calloc(num_regs, sizeof(struct reg));
        struct avr32_core_reg *arch_info =
                malloc(sizeof(struct avr32_core_reg) * num_regs);
        int i;
@@ -544,7 +544,7 @@ static int avr32_ap7k_examine(struct target *target)
        if (!target_was_examined(target)) {
                target_set_examined(target);
                avr32_jtag_nexus_read(&ap7k->jtag, AVR32_OCDREG_DID, &devid);
-               LOG_INFO("device id: %08x", devid);
+               LOG_INFO("device id: %08" PRIx32, devid);
                avr32_ocd_setbits(&ap7k->jtag, AVR32_OCDREG_DC, OCDREG_DC_DBE);
                avr32_jtag_nexus_read(&ap7k->jtag, AVR32_OCDREG_DS, &ds);
 
@@ -599,8 +599,6 @@ struct target_type avr32_ap7k_target = {
        .poll = avr32_ap7k_poll,
        .arch_state = avr32_ap7k_arch_state,
 
-       .target_request_data = NULL,
-
        .halt = avr32_ap7k_halt,
        .resume = avr32_ap7k_resume,
        .step = avr32_ap7k_step,