libjaylink: Update to latest master branch

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

diff --git a/src/target/target.c b/src/target/target.c
index 598d7d5a8043303b4ddbef21082c19bd9e7cb262..e12760c8f13c6a80f1d9b479c3812606a445a65c 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -104,6 +104,7 @@ extern struct target_type nds32_v3_target;
 extern struct target_type nds32_v3m_target;
 extern struct target_type or1k_target;
 extern struct target_type quark_x10xx_target;
+extern struct target_type quark_d20xx_target;
 
 static struct target_type *target_types[] = {
        &arm7tdmi_target,
@@ -133,6 +134,7 @@ static struct target_type *target_types[] = {
        &nds32_v3m_target,
        &or1k_target,
        &quark_x10xx_target,
+       &quark_d20xx_target,
        NULL,
 };
 
@@ -3219,7 +3221,7 @@ COMMAND_HANDLER(handle_load_image_command)
 
 COMMAND_HANDLER(handle_dump_image_command)
 {
-       struct fileio fileio;
+       struct fileio *fileio;
        uint8_t *buffer;
        int retval, retvaltemp;
        uint32_t address, size;
@@ -3252,7 +3254,7 @@ COMMAND_HANDLER(handle_dump_image_command)
                if (retval != ERROR_OK)
                        break;
 
-               retval = fileio_write(&fileio, this_run_size, buffer, &size_written);
+               retval = fileio_write(fileio, this_run_size, buffer, &size_written);
                if (retval != ERROR_OK)
                        break;
 
@@ -3264,7 +3266,7 @@ COMMAND_HANDLER(handle_dump_image_command)
 
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK)) {
                size_t filesize;
-               retval = fileio_size(&fileio, &filesize);
+               retval = fileio_size(fileio, &filesize);
                if (retval != ERROR_OK)
                        return retval;
                command_print(CMD_CTX,
@@ -3272,7 +3274,7 @@ COMMAND_HANDLER(handle_dump_image_command)
                                duration_elapsed(&bench), duration_kbps(&bench, filesize));
        }
 
-       retvaltemp = fileio_close(&fileio);
+       retvaltemp = fileio_close(fileio);
        if (retvaltemp != ERROR_OK)
                return retvaltemp;
 
@@ -4918,10 +4920,7 @@ static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        struct target *target = Jim_CmdPrivData(goi.interp);
        if (!target->tap->enabled)
                return jim_target_tap_disabled(interp);
-       if (!(target_was_examined(target))) {
-               LOG_ERROR("Target not examined yet");
-               return ERROR_TARGET_NOT_EXAMINED;
-       }
+
        if (!target->type->assert_reset || !target->type->deassert_reset) {
                Jim_SetResultFormatted(interp,
                                "No target-specific reset for %s",
@@ -5184,7 +5183,6 @@ static int target_create(Jim_GetOptInfo *goi)
        Jim_Obj *new_cmd;
        Jim_Cmd *cmd;
        const char *cp;
-       char *cp2;
        int e;
        int x;
        struct target *target;
@@ -5209,10 +5207,9 @@ static int target_create(Jim_GetOptInfo *goi)
        }
 
        /* TYPE */
-       e = Jim_GetOpt_String(goi, &cp2, NULL);
+       e = Jim_GetOpt_String(goi, &cp, NULL);
        if (e != JIM_OK)
                return e;
-       cp = cp2;
        struct transport *tr = get_current_transport();
        if (tr->override_target) {
                e = tr->override_target(&cp);