ARM11: minor cleanup, mostly ITR comments

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

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 958844bb00bda1efde006ed27fd4dcc98c05d760..6ca50ab7ce0e0b614538ba98dbb7e8bc90cc425d 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -39,7 +39,7 @@
 #endif
 
 #include "arm_adi_v5.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 /*
  * Transaction Mode:
@@ -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
@@ -1370,12 +1373,12 @@ DAP_COMMAND_HANDLER(dap_baseaddr_command)
        int retval;
 
        apselsave = swjdp->apsel;
-       switch (argc) {
+       switch (CMD_ARGC) {
        case 0:
                apsel = swjdp->apsel;
                break;
        case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], apsel);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -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);
@@ -1398,19 +1401,19 @@ DAP_COMMAND_HANDLER(dap_memaccess_command)
 {
        uint32_t memaccess_tck;
 
-       switch (argc) {
+       switch (CMD_ARGC) {
        case 0:
                memaccess_tck = swjdp->memaccess_tck;
                break;
        case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], memaccess_tck);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], memaccess_tck);
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
        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;
@@ -1421,12 +1424,12 @@ DAP_COMMAND_HANDLER(dap_apsel_command)
        uint32_t apsel, apid;
        int retval;
 
-       switch (argc) {
+       switch (CMD_ARGC) {
        case 0:
                apsel = 0;
                break;
        case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], apsel);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -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;
@@ -1447,12 +1450,12 @@ DAP_COMMAND_HANDLER(dap_apid_command)
        int retval;
 
        apselsave = swjdp->apsel;
-       switch (argc) {
+       switch (CMD_ARGC) {
        case 0:
                apsel = swjdp->apsel;
                break;
        case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], apsel);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
                break;
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -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);