arm_adi_v5: let dap_lookup_cs_component() to get AP dbgbase

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

diff --git a/src/target/arm_cti.c b/src/target/arm_cti.c
index 30212cbf4e2867b57d0e5e0144b30617538965e5..96927bf9459cf75c37a7f1dd91cf9782faf6e6c9 100644 (file)
--- a/src/target/arm_cti.c
+++ b/src/target/arm_cti.c
@@ -70,7 +70,7 @@ static int arm_cti_mod_reg_bits(struct arm_cti *self, unsigned int reg, uint32_t
 
        /* Read register */
        int retval = mem_ap_read_atomic_u32(ap, self->spot.base + reg, &tmp);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        /* clear bitfield */
@@ -143,7 +143,7 @@ int arm_cti_read_reg(struct arm_cti *self, unsigned int reg, uint32_t *p_value)
 {
        struct adiv5_ap *ap = dap_ap(self->spot.dap, self->spot.ap_num);
 
-       if (p_value == NULL)
+       if (!p_value)
                return ERROR_COMMAND_ARGUMENT_INVALID;
 
        return mem_ap_read_atomic_u32(ap, self->spot.base + reg, p_value);
@@ -435,8 +435,13 @@ static int cti_configure(struct jim_getopt_info *goi, struct arm_cti *cti)
        /* parse config or cget options ... */
        while (goi->argc > 0) {
                int e = adiv5_jim_mem_ap_spot_configure(&cti->spot, goi);
+
+               if (e == JIM_CONTINUE)
+                       Jim_SetResultFormatted(goi->interp, "unknown option '%s'",
+                               Jim_String(goi->argv[0]));
+
                if (e != JIM_OK)
-                       return e;
+                       return JIM_ERR;
        }
 
        if (!cti->spot.dap) {
@@ -456,7 +461,7 @@ static int cti_create(struct jim_getopt_info *goi)
        int e;
 
        cmd_ctx = current_command_context(goi->interp);
-       assert(cmd_ctx != NULL);
+       assert(cmd_ctx);
 
        if (goi->argc < 3) {
                Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ..options...");
@@ -465,7 +470,7 @@ static int cti_create(struct jim_getopt_info *goi)
        /* COMMAND */
        jim_getopt_obj(goi, &new_cmd);
        /* does this command exist? */
-       cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
+       cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_NONE);
        if (cmd) {
                cp = Jim_GetString(new_cmd, NULL);
                Jim_SetResultFormatted(goi->interp, "Command: %s Exists", cp);
@@ -474,7 +479,7 @@ static int cti_create(struct jim_getopt_info *goi)
 
        /* Create it */
        cti = calloc(1, sizeof(*cti));
-       if (cti == NULL)
+       if (!cti)
                return JIM_ERR;
 
        adiv5_mem_ap_spot_init(&cti->spot);
@@ -508,7 +513,7 @@ static int cti_create(struct jim_getopt_info *goi)
                COMMAND_REGISTRATION_DONE
        };
        e = register_commands_with_data(cmd_ctx, NULL, cti_commands, cti);
-       if (ERROR_OK != e)
+       if (e != ERROR_OK)
                return JIM_ERR;
 
        list_add_tail(&cti->lh, &all_cti);