change #include "log.h" to <helper/log.h>

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

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 7f4bc58c22e10f6144d228661bfddf8c1eda8c93..72408e1e68fe8666975aff3a40879f477d16b252 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1007,12 +1007,15 @@ int ahbap_debugport_init(struct swjdp_common *swjdp)
        return ERROR_OK;
 }
 
-/* CID interpretation -- see ARM IHI 0029B section 3 */
+/* CID interpretation -- see ARM IHI 0029B section 3
+ * and ARM IHI 0031A table 13-3.
+ */
 static const char *class_description[16] ={
        "Reserved", "ROM table", "Reserved", "Reserved",
        "Reserved", "Reserved", "Reserved", "Reserved",
        "Reserved", "CoreSight component", "Reserved", "Peripheral Test Block",
-       "Reserved", "DESS", "Generic IP component", "PrimeCell or System component"
+       "Reserved", "OptimoDE DESS",
+               "Generic IP component", "PrimeCell or System component"
 };
 
 static bool
@@ -1386,7 +1389,7 @@ DAP_COMMAND_HANDLER(dap_baseaddr_command)
 
        dap_ap_read_reg_u32(swjdp, 0xF8, &baseaddr);
        retval = swjdp_transaction_endcheck(swjdp);
-       command_print(cmd_ctx, "0x%8.8" PRIx32, baseaddr);
+       command_print(CMD_CTX, "0x%8.8" PRIx32, baseaddr);
 
        if (apselsave != apsel)
                dap_ap_select(swjdp, apselsave);
@@ -1410,7 +1413,7 @@ DAP_COMMAND_HANDLER(dap_memaccess_command)
        }
        swjdp->memaccess_tck = memaccess_tck;
 
-       command_print(cmd_ctx, "memory bus access delay set to %" PRIi32 " tck",
+       command_print(CMD_CTX, "memory bus access delay set to %" PRIi32 " tck",
                        swjdp->memaccess_tck);
 
        return ERROR_OK;
@@ -1435,7 +1438,7 @@ DAP_COMMAND_HANDLER(dap_apsel_command)
        dap_ap_select(swjdp, apsel);
        dap_ap_read_reg_u32(swjdp, 0xFC, &apid);
        retval = swjdp_transaction_endcheck(swjdp);
-       command_print(cmd_ctx, "ap %" PRIi32 " selected, identification register 0x%8.8" PRIx32,
+       command_print(CMD_CTX, "ap %" PRIi32 " selected, identification register 0x%8.8" PRIx32,
                        apsel, apid);
 
        return retval;
@@ -1463,7 +1466,7 @@ DAP_COMMAND_HANDLER(dap_apid_command)
 
        dap_ap_read_reg_u32(swjdp, 0xFC, &apid);
        retval = swjdp_transaction_endcheck(swjdp);
-       command_print(cmd_ctx, "0x%8.8" PRIx32, apid);
+       command_print(CMD_CTX, "0x%8.8" PRIx32, apid);
        if (apselsave != apsel)
                dap_ap_select(swjdp, apselsave);