projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/nor/efm32: Use Cortex-M 'core_info' field
[fw/openocd]
/
src
/
target
/
arm_cti.c
diff --git
a/src/target/arm_cti.c
b/src/target/arm_cti.c
index 30212cbf4e2867b57d0e5e0144b30617538965e5..c776e9c2a5c35e967b87e494e4c8f74321eef8db 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);
/* 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 */
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);
{
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);
return ERROR_COMMAND_ARGUMENT_INVALID;
return mem_ap_read_atomic_u32(ap, self->spot.base + reg, p_value);
@@
-456,7
+456,7
@@
static int cti_create(struct jim_getopt_info *goi)
int e;
cmd_ctx = current_command_context(goi->interp);
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...");
if (goi->argc < 3) {
Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ..options...");
@@
-465,7
+465,7
@@
static int cti_create(struct jim_getopt_info *goi)
/* COMMAND */
jim_getopt_obj(goi, &new_cmd);
/* does this command exist? */
/* 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);
if (cmd) {
cp = Jim_GetString(new_cmd, NULL);
Jim_SetResultFormatted(goi->interp, "Command: %s Exists", cp);
@@
-474,7
+474,7
@@
static int cti_create(struct jim_getopt_info *goi)
/* Create it */
cti = calloc(1, sizeof(*cti));
/* Create it */
cti = calloc(1, sizeof(*cti));
- if (
cti == NULL
)
+ if (
!cti
)
return JIM_ERR;
adiv5_mem_ap_spot_init(&cti->spot);
return JIM_ERR;
adiv5_mem_ap_spot_init(&cti->spot);
@@
-508,7
+508,7
@@
static int cti_create(struct jim_getopt_info *goi)
COMMAND_REGISTRATION_DONE
};
e = register_commands_with_data(cmd_ctx, NULL, cti_commands, cti);
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);
return JIM_ERR;
list_add_tail(&cti->lh, &all_cti);