arm_adi_v5: simplify handling of AP type

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

diff --git a/src/target/esirisc_jtag.c b/src/target/esirisc_jtag.c
index 700ae3a60dfb6b6bc0a15e241f99a9b6620687e7..dd5cd5a0ee792b1f17bffc000e845e787c33c96e 100644 (file)
--- a/src/target/esirisc_jtag.c
+++ b/src/target/esirisc_jtag.c
@@ -57,7 +57,7 @@ static int esirisc_jtag_get_padding(void)
        int padding = 0;
        int bypass_devices = 0;
 
-       for (struct jtag_tap *tap = jtag_tap_next_enabled(NULL); tap != NULL;
+       for (struct jtag_tap *tap = jtag_tap_next_enabled(NULL); tap;
                        tap = jtag_tap_next_enabled(tap))
                if (tap->bypass)
                        bypass_devices++;
@@ -181,8 +181,8 @@ static int esirisc_jtag_check_status(struct esirisc_jtag *jtag_info)
 {
        uint8_t eid = esirisc_jtag_get_eid(jtag_info);
        if (eid != EID_NONE) {
-               LOG_ERROR("esirisc_jtag: bad status: 0x%02" PRIx32 " (DA: %" PRId32 ", "
-                               "S: %" PRId32 ", EID: 0x%02" PRIx32 ")",
+               LOG_ERROR("esirisc_jtag: bad status: 0x%02" PRIx8 " (DA: %" PRId32 ", "
+                               "S: %" PRId32 ", EID: 0x%02" PRIx8 ")",
                                jtag_info->status, esirisc_jtag_is_debug_active(jtag_info),
                                esirisc_jtag_is_stopped(jtag_info), eid);
                return ERROR_FAIL;
@@ -201,13 +201,13 @@ static int esirisc_jtag_send_and_recv(struct esirisc_jtag *jtag_info, uint8_t co
 
        retval = esirisc_jtag_send(jtag_info, command, num_out_fields, out_fields);
        if (retval != ERROR_OK) {
-               LOG_ERROR("esirisc_jtag: send failed (command: 0x%02" PRIx32 ")", command);
+               LOG_ERROR("esirisc_jtag: send failed (command: 0x%02" PRIx8 ")", command);
                return ERROR_FAIL;
        }
 
        retval = esirisc_jtag_recv(jtag_info, num_in_fields, in_fields);
        if (retval != ERROR_OK) {
-               LOG_ERROR("esirisc_jtag: recv failed (command: 0x%02" PRIx32 ")", command);
+               LOG_ERROR("esirisc_jtag: recv failed (command: 0x%02" PRIx8 ")", command);
                return ERROR_FAIL;
        }
 
@@ -409,7 +409,7 @@ int esirisc_jtag_read_reg(struct esirisc_jtag *jtag_info, uint8_t reg, uint32_t
                return retval;
 
        *data = le_to_h_u32(d);
-       LOG_DEBUG("register: 0x%" PRIx32 ", data: 0x%" PRIx32, reg, *data);
+       LOG_DEBUG("register: 0x%" PRIx8 ", data: 0x%" PRIx32, reg, *data);
 
        return ERROR_OK;
 }
@@ -419,7 +419,7 @@ int esirisc_jtag_write_reg(struct esirisc_jtag *jtag_info, uint8_t reg, uint32_t
        struct scan_field out_fields[2];
        uint8_t d[4];
 
-       LOG_DEBUG("register: 0x%" PRIx32 ", data: 0x%" PRIx32, reg, data);
+       LOG_DEBUG("register: 0x%" PRIx8 ", data: 0x%" PRIx32, reg, data);
 
        out_fields[0].num_bits = 8;
        out_fields[0].out_value = ®
@@ -457,7 +457,7 @@ int esirisc_jtag_read_csr(struct esirisc_jtag *jtag_info, uint8_t bank, uint8_t
                return retval;
 
        *data = le_to_h_u32(d);
-       LOG_DEBUG("bank: 0x%" PRIx32 ", csr: 0x%" PRIx32 ", data: 0x%" PRIx32, bank, csr, *data);
+       LOG_DEBUG("bank: 0x%" PRIx8 ", csr: 0x%" PRIx8 ", data: 0x%" PRIx32, bank, csr, *data);
 
        return ERROR_OK;
 }
@@ -467,7 +467,7 @@ int esirisc_jtag_write_csr(struct esirisc_jtag *jtag_info, uint8_t bank, uint8_t
        struct scan_field out_fields[2];
        uint8_t c[2], d[4];
 
-       LOG_DEBUG("bank: 0x%" PRIx32 ", csr: 0x%" PRIx32 ", data: 0x%" PRIx32, bank, csr, data);
+       LOG_DEBUG("bank: 0x%" PRIx8 ", csr: 0x%" PRIx8 ", data: 0x%" PRIx32, bank, csr, data);
 
        out_fields[0].num_bits = 16;
        out_fields[0].out_value = c;