target: move regmaps to armv7m.c

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

diff --git a/src/target/avr32_ap7k.c b/src/target/avr32_ap7k.c
index a5cdbe47bf5d6b174bb743c69dddf6909d783a30..635fe462405a4641dca048ec423c3e99878d78ac 100644 (file)
--- a/src/target/avr32_ap7k.c
+++ b/src/target/avr32_ap7k.c
@@ -110,15 +110,13 @@ int avr32_ap7k_restore_context(struct target *target)
 static int avr32_read_core_reg(struct target *target, int num)
 {
        uint32_t reg_value;
-       struct avr32_core_reg *mips_core_reg;
 
        /* get pointers to arch-specific information */
        struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
 
        if ((num < 0) || (num >= AVR32NUMCOREREGS))
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       mips_core_reg = ap7k->core_cache->reg_list[num].arch_info;
        reg_value = ap7k->core_regs[num];
        buf_set_u32(ap7k->core_cache->reg_list[num].value, 0, 32, reg_value);
        ap7k->core_cache->reg_list[num].valid = 1;
@@ -130,16 +128,14 @@ static int avr32_read_core_reg(struct target *target, int num)
 static int avr32_write_core_reg(struct target *target, int num)
 {
        uint32_t reg_value;
-       struct avr32_core_reg *mips_core_reg;
 
        /* get pointers to arch-specific information */
        struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
 
        if ((num < 0) || (num >= AVR32NUMCOREREGS))
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        reg_value = buf_get_u32(ap7k->core_cache->reg_list[num].value, 0, 32);
-       mips_core_reg = ap7k->core_cache->reg_list[num].arch_info;
        ap7k->core_regs[num] = reg_value;
        LOG_DEBUG("write core reg %i value 0x%" PRIx32 "", num , reg_value);
        ap7k->core_cache->reg_list[num].valid = 1;
@@ -491,7 +487,7 @@ static int avr32_ap7k_read_memory(struct target *target, uint32_t address,
 
        /* sanitize arguments */
        if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
@@ -499,10 +495,10 @@ static int avr32_ap7k_read_memory(struct target *target, uint32_t address,
        switch (size)
        {
        case 4:
-               return avr32_jtag_read_memory32(&ap7k->jtag, address, count, (uint32_t*)buffer);
+               return avr32_jtag_read_memory32(&ap7k->jtag, address, count, (uint32_t*)(void *)buffer);
                break;
        case 2:
-               return avr32_jtag_read_memory16(&ap7k->jtag, address, count, (uint16_t*)buffer);
+               return avr32_jtag_read_memory16(&ap7k->jtag, address, count, (uint16_t*)(void *)buffer);
                break;
        case 1:
                return avr32_jtag_read_memory8(&ap7k->jtag, address, count, buffer);
@@ -515,7 +511,7 @@ static int avr32_ap7k_read_memory(struct target *target, uint32_t address,
 }
 
 static int avr32_ap7k_write_memory(struct target *target, uint32_t address,
-               uint32_t size, uint32_t count, uint8_t *buffer)
+               uint32_t size, uint32_t count, const uint8_t *buffer)
 {
        struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
 
@@ -529,7 +525,7 @@ static int avr32_ap7k_write_memory(struct target *target, uint32_t address,
 
        /* sanitize arguments */
        if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
@@ -537,10 +533,10 @@ static int avr32_ap7k_write_memory(struct target *target, uint32_t address,
        switch (size)
        {
        case 4:
-               return avr32_jtag_write_memory32(&ap7k->jtag, address, count, (uint32_t*)buffer);
+               return avr32_jtag_write_memory32(&ap7k->jtag, address, count, (uint32_t*)(void *)buffer);
                break;
        case 2:
-               return avr32_jtag_write_memory16(&ap7k->jtag, address, count, (uint16_t*)buffer);
+               return avr32_jtag_write_memory16(&ap7k->jtag, address, count, (uint16_t*)(void *)buffer);
                break;
        case 1:
                return avr32_jtag_write_memory8(&ap7k->jtag, address, count, buffer);
@@ -600,7 +596,7 @@ static int avr32_ap7k_examine(struct target *target)
 }
 
 static int avr32_ap7k_bulk_write_memory(struct target *target, uint32_t address,
-               uint32_t count, uint8_t *buffer)
+               uint32_t count, const uint8_t *buffer)
 {
        LOG_ERROR("%s: implement me", __func__);