helper: Remove src/helper from include dirs

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

diff --git a/src/target/mips64_pracc.c b/src/target/mips64_pracc.c
index dbad248fcd4288b55c930e15d19e40ad1e1e96cb..9583ad767edc897fa22dc569877f587f3195880f 100644 (file)
--- a/src/target/mips64_pracc.c
+++ b/src/target/mips64_pracc.c
@@ -20,7 +20,7 @@
 #include "mips64.h"
 #include "mips64_pracc.h"
 
-#include "time_support.h"
+#include <helper/time_support.h>
 
 #define STACK_DEPTH    32
 
@@ -79,7 +79,7 @@ static int mips64_pracc_exec_read(struct mips64_pracc_context *ctx, uint64_t add
                        return ERROR_JTAG_DEVICE_ERROR;
                }
 
-               if (ctx->local_iparam == NULL) {
+               if (!ctx->local_iparam) {
                        LOG_ERROR("Error: unexpected reading of input parameter");
                        return ERROR_JTAG_DEVICE_ERROR;
                }
@@ -91,7 +91,7 @@ static int mips64_pracc_exec_read(struct mips64_pracc_context *ctx, uint64_t add
                   && (address < MIPS64_PRACC_PARAM_OUT + ctx->num_oparam * MIPS64_PRACC_DATA_STEP)) {
 
                offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP;
-               if (ctx->local_oparam == NULL) {
+               if (!ctx->local_oparam) {
                        LOG_ERROR("Error: unexpected reading of output parameter");
                        return ERROR_JTAG_DEVICE_ERROR;
                }
@@ -179,7 +179,7 @@ static int mips64_pracc_exec_write(struct mips64_pracc_context *ctx, uint64_t ad
        if ((address >= MIPS64_PRACC_PARAM_IN)
                && (address < MIPS64_PRACC_PARAM_IN + ctx->num_iparam * MIPS64_PRACC_DATA_STEP)) {
                offset = (address - MIPS64_PRACC_PARAM_IN) / MIPS64_PRACC_DATA_STEP;
-               if (ctx->local_iparam == NULL) {
+               if (!ctx->local_iparam) {
                        LOG_ERROR("Error: unexpected writing of input parameter");
                        return ERROR_JTAG_DEVICE_ERROR;
                }
@@ -187,7 +187,7 @@ static int mips64_pracc_exec_write(struct mips64_pracc_context *ctx, uint64_t ad
        } else if ((address >= MIPS64_PRACC_PARAM_OUT)
                && (address < MIPS64_PRACC_PARAM_OUT + ctx->num_oparam * MIPS64_PRACC_DATA_STEP)) {
                offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP;
-               if (ctx->local_oparam == NULL) {
+               if (!ctx->local_oparam) {
                        LOG_ERROR("Error: unexpected writing of output parameter");
                        return ERROR_JTAG_DEVICE_ERROR;
                }
@@ -283,7 +283,7 @@ int mips64_pracc_exec(struct mips_ejtag *ejtag_info,
                if (ejtag_ctrl & EJTAG_CTRL_PRNW) {
                        retval = mips64_pracc_exec_write(&ctx, address);
                        if (retval != ERROR_OK) {
-                               printf("ERROR mips64_pracc_exec_write\n");
+                               LOG_ERROR("mips64_pracc_exec_write() failed");
                                return retval;
                        }
                } else {
@@ -296,7 +296,7 @@ int mips64_pracc_exec(struct mips_ejtag *ejtag_info,
                        }
                        retval = mips64_pracc_exec_read(&ctx, address);
                        if (retval != ERROR_OK) {
-                               printf("ERROR mips64_pracc_exec_read\n");
+                               LOG_ERROR("mips64_pracc_exec_read() failed");
                                return retval;
                        }