coding style: use ARRAY_SIZE() when possible

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

diff --git a/src/target/target.c b/src/target/target.c
index 51fdff3425e0e630084690fefa1f234b9d3ccbc7..936a5da0d259c31168938a6c523e4c84c70fd033 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -94,6 +94,7 @@ extern struct target_type cortexr4_target;
 extern struct target_type arm11_target;
 extern struct target_type ls1_sap_target;
 extern struct target_type mips_m4k_target;
+extern struct target_type mips_mips64_target;
 extern struct target_type avr_target;
 extern struct target_type dsp563xx_target;
 extern struct target_type dsp5680xx_target;
@@ -147,6 +148,7 @@ static struct target_type *target_types[] = {
        &esirisc_target,
 #if BUILD_TARGET64
        &aarch64_target,
+       &mips_mips64_target,
 #endif
        NULL,
 };
@@ -1680,7 +1682,7 @@ static int target_call_timer_callbacks_check_time(int checktime)
         * next item; initially, that's a standalone "root of the
         * list" variable. */
        struct target_timer_callback **callback = &target_timer_callbacks;
-       while (*callback) {
+       while (callback && *callback) {
                if ((*callback)->removed) {
                        struct target_timer_callback *p = *callback;
                        *callback = (*callback)->next;
@@ -3336,8 +3338,8 @@ COMMAND_HANDLER(handle_mw_command)
        target_addr_t address;
        COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address);
 
-       target_addr_t value;
-       COMMAND_PARSE_ADDRESS(CMD_ARGV[1], value);
+       uint64_t value;
+       COMMAND_PARSE_NUMBER(u64, CMD_ARGV[1], value);
 
        unsigned count = 1;
        if (CMD_ARGC == 3)
@@ -3636,14 +3638,7 @@ static COMMAND_HELPER(handle_verify_image_command_internal, enum verify_mode ver
 
                                data = malloc(buf_cnt);
 
-                               /* Can we use 32bit word accesses? */
-                               int size = 1;
-                               int count = buf_cnt;
-                               if ((count % 4) == 0) {
-                                       size *= 4;
-                                       count /= 4;
-                               }
-                               retval = target_read_memory(target, image.sections[i].base_address, size, count, data);
+                               retval = target_read_buffer(target, image.sections[i].base_address, buf_cnt, data);
                                if (retval == ERROR_OK) {
                                        uint32_t t;
                                        for (t = 0; t < buf_cnt; t++) {