JTAG: no LOG_WARNING() for taps without IDCODE

[openocd.git] / src / jtag / core.c

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 1841dde9f4c311a3e5967b3511cdd063e798b41c..da745d09a22535fb0c688dbf76718e230d52937c 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -586,7 +586,7 @@ int jtag_add_statemove(tap_state_t goal_state)
                unsigned tms_bits  = tap_get_tms_path(cur_state, goal_state);
                unsigned tms_count = tap_get_tms_path_len(cur_state, goal_state);
                tap_state_t moves[8];
-               assert(tms_count < DIM(moves));
+               assert(tms_count < ARRAY_SIZE(moves));
 
                for (unsigned i = 0; i < tms_count; i++, tms_bits >>= 1)
                {
@@ -1064,7 +1064,7 @@ static int jtag_examine_chain(void)
                if ((idcode & 1) == 0)
                {
                        /* Zero for LSB indicates a device in bypass */
-                       LOG_WARNING("TAP %s does not have IDCODE",
+                       LOG_INFO("TAP %s does not have IDCODE",
                                        tap->dotted_name);
                        idcode = 0;
                        tap->hasidcode = false;
@@ -1193,7 +1193,7 @@ static int jtag_validate_ircapture(void)
        /* increase length to add 2 bit sentinel after scan */
        total_ir_length += 2;
 
-       ir_test = malloc(CEIL(total_ir_length, 8));
+       ir_test = malloc(DIV_ROUND_UP(total_ir_length, 8));
        if (ir_test == NULL)
                return ERROR_FAIL;
 
@@ -1293,7 +1293,7 @@ void jtag_tap_init(struct jtag_tap *tap)
 
        /* if we're autoprobing, cope with potentially huge ir_length */
        ir_len_bits = tap->ir_length ? : JTAG_IRLEN_MAX;
-       ir_len_bytes = CEIL(ir_len_bits, 8);
+       ir_len_bytes = DIV_ROUND_UP(ir_len_bits, 8);
 
        tap->expected = calloc(1, ir_len_bytes);
        tap->expected_mask = calloc(1, ir_len_bytes);