semihosting: remove comparison with NULL

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

diff --git a/src/target/mem_ap.c b/src/target/mem_ap.c
index 0c3d7f78a016da0655afaf573b979305f5003e0f..cf5aa54497423a6e4d785b09da568197638154ce 100644 (file)
--- a/src/target/mem_ap.c
+++ b/src/target/mem_ap.c
@@ -29,7 +29,7 @@ struct mem_ap {
        int common_magic;
        struct adiv5_dap *dap;
        struct adiv5_ap *ap;
-       int ap_num;
+       uint64_t ap_num;
 };
 
 static int mem_ap_target_create(struct target *target, Jim_Interp *interp)
@@ -38,7 +38,7 @@ static int mem_ap_target_create(struct target *target, Jim_Interp *interp)
        struct adiv5_private_config *pc;
 
        pc = (struct adiv5_private_config *)target->private_config;
-       if (pc == NULL)
+       if (!pc)
                return ERROR_FAIL;
 
        if (pc->ap_num == DP_APSEL_INVALID) {
@@ -47,7 +47,7 @@ static int mem_ap_target_create(struct target *target, Jim_Interp *interp)
        }
 
        mem_ap = calloc(1, sizeof(struct mem_ap));
-       if (mem_ap == NULL) {
+       if (!mem_ap) {
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
        }
@@ -74,8 +74,13 @@ static int mem_ap_init_target(struct command_context *cmd_ctx, struct target *ta
 
 static void mem_ap_deinit_target(struct target *target)
 {
+       struct mem_ap *mem_ap = target->arch_info;
+
        LOG_DEBUG("%s", __func__);
 
+       if (mem_ap->ap)
+               dap_put_ap(mem_ap->ap);
+
        free(target->private_config);
        free(target->arch_info);
        return;
@@ -139,7 +144,16 @@ static int mem_ap_examine(struct target *target)
        struct mem_ap *mem_ap = target->arch_info;
 
        if (!target_was_examined(target)) {
-               mem_ap->ap = dap_ap(mem_ap->dap, mem_ap->ap_num);
+               if (mem_ap->ap) {
+                       dap_put_ap(mem_ap->ap);
+                       mem_ap->ap = NULL;
+               }
+
+               mem_ap->ap = dap_get_ap(mem_ap->dap, mem_ap->ap_num);
+               if (!mem_ap->ap) {
+                       LOG_ERROR("Cannot get AP");
+                       return ERROR_FAIL;
+               }
                target_set_examined(target);
                target->state = TARGET_UNKNOWN;
                target->debug_reason = DBG_REASON_UNDEFINED;
@@ -238,7 +252,7 @@ static int mem_ap_read_memory(struct target *target, target_addr_t address,
        LOG_DEBUG("Reading memory at physical address " TARGET_ADDR_FMT
                  "; size %" PRIu32 "; count %" PRIu32, address, size, count);
 
-       if (count == 0 || buffer == NULL)
+       if (count == 0 || !buffer)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        return mem_ap_read_buf(mem_ap->ap, buffer, size, count, address);
@@ -253,7 +267,7 @@ static int mem_ap_write_memory(struct target *target, target_addr_t address,
        LOG_DEBUG("Writing memory at physical address " TARGET_ADDR_FMT
                  "; size %" PRIu32 "; count %" PRIu32, address, size, count);
 
-       if (count == 0 || buffer == NULL)
+       if (count == 0 || !buffer)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        return mem_ap_write_buf(mem_ap->ap, buffer, size, count, address);