esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE

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

diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index 3be4d7199c1c9122d33d4ee7b335b36ade13cc55..fbcfe0d4df0b3b4fd588805f50b30525f1a6b0e8 100644 (file)
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -48,7 +48,7 @@ static void dap_instance_init(struct adiv5_dap *dap)
 {
        int i;
        /* Set up with safe defaults */
-       for (i = 0; i <= 255; i++) {
+       for (i = 0; i <= DP_APSEL_MAX; i++) {
                dap->ap[i].dap = dap;
                dap->ap[i].ap_num = i;
                /* memaccess_tck max is 255 */
@@ -56,7 +56,7 @@ static void dap_instance_init(struct adiv5_dap *dap)
                /* Number of bits for tar autoincrement, impl. dep. at least 10 */
                dap->ap[i].tar_autoincr_block = (1<<10);
                /* default CSW value */
-               dap->ap[i].csw_default = CSW_DEFAULT;
+               dap->ap[i].csw_default = CSW_AHB_DEFAULT;
        }
        INIT_LIST_HEAD(&dap->cmd_journal);
 }
@@ -313,20 +313,25 @@ COMMAND_HANDLER(handle_dap_info_command)
        struct adiv5_dap *dap = arm->dap;
        uint32_t apsel;
 
+       if (dap == NULL) {
+               LOG_ERROR("DAP instance not available. Probably a HLA target...");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       }
+
        switch (CMD_ARGC) {
                case 0:
                        apsel = dap->apsel;
                        break;
                case 1:
                        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
-                       if (apsel >= 256)
+                       if (apsel > DP_APSEL_MAX)
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        break;
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       return dap_info_command(CMD_CTX, &dap->ap[apsel]);
+       return dap_info_command(CMD, &dap->ap[apsel]);
 }
 
 static const struct command_registration dap_subcommand_handlers[] = {
@@ -368,6 +373,7 @@ static const struct command_registration dap_commands[] = {
                .mode = COMMAND_CONFIG,
                .help = "DAP commands",
                .chain = dap_subcommand_handlers,
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };