mips32, pic32 use uint8_t in 8 bit scan function

Makes code shorter.

Change-Id: I6cc01adffbea063ccb071ddf3a3e3d81727b29ce
Signed-off-by: Salvador Arroyo <sarroyofdez@yahoo.es>
Reviewed-on: http://openocd.zylin.com/4004
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>

diff --git a/src/flash/nor/pic32mx.c b/src/flash/nor/pic32mx.c
index de212ed362b5b88998eeb33cfdc648256a1f3ed5..1f148fd73935dd00af72f9ecc123065e2f37525d 100644 (file)
--- a/src/flash/nor/pic32mx.c
+++ b/src/flash/nor/pic32mx.c
@@ -879,7 +879,6 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
 
 COMMAND_HANDLER(pic32mx_handle_unlock_command)
 {
-       uint32_t mchip_cmd;
        struct target *target = NULL;
        struct mips_m4k_common *mips_m4k;
        struct mips_ejtag *ejtag_info;
@@ -904,7 +903,7 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command)
        mips_ejtag_set_instr(ejtag_info, MTAP_COMMAND);
 
        /* first check status of device */
-       mchip_cmd = MCHP_STATUS;
+       uint8_t mchip_cmd = MCHP_STATUS;
        mips_ejtag_drscan_8(ejtag_info, &mchip_cmd);
        if (mchip_cmd & (1 << 7)) {
                /* device is not locked */

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index 594711fb53be06bede8400d3c48c4ee061c5aac5..650af3eb80a52962528793caafd477d9a973a135 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -169,31 +169,24 @@ void mips_ejtag_drscan_32_out(struct mips_ejtag *ejtag_info, uint32_t data)
        jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
 }
 
-int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint32_t *data)
+int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint8_t *data)
 {
-       struct jtag_tap *tap;
-       tap  = ejtag_info->tap;
-       assert(tap != NULL);
+       assert(ejtag_info->tap != NULL);
+       struct jtag_tap *tap = ejtag_info->tap;
 
        struct scan_field field;
-       uint8_t t[4] = {0, 0, 0, 0}, r[4];
-       int retval;
-
        field.num_bits = 8;
-       field.out_value = t;
-       buf_set_u32(t, 0, field.num_bits, *data);
-       field.in_value = r;
+
+       field.out_value = data;
+       field.in_value = data;
 
        jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
 
-       retval = jtag_execute_queue();
+       int retval = jtag_execute_queue();
        if (retval != ERROR_OK) {
                LOG_ERROR("register read failed");
                return retval;
        }
-
-       *data = buf_get_u32(field.in_value, 0, 32);
-
        return ERROR_OK;
 }
 

diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index 6ef08675da70ad7bc884cb56e095fd1e274804c0..2178afc6ffb67c062ce7ba511dedffebf97e0a6c 100644 (file)
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -220,7 +220,7 @@ void mips_ejtag_add_scan_96(struct mips_ejtag *ejtag_info,
 void mips_ejtag_drscan_32_out(struct mips_ejtag *ejtag_info, uint32_t data);
 int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data);
 void mips_ejtag_drscan_8_out(struct mips_ejtag *ejtag_info, uint8_t data);
-int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint32_t *data);
+int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint8_t *data);
 int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t, uint32_t *data);
 
 int mips_ejtag_init(struct mips_ejtag *ejtag_info);