target: make target re-configuration possible again

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

diff --git a/src/target/semihosting_common.c b/src/target/semihosting_common.c
index 7ef1810e51ffbda2a97035f58a6aca1462ec2795..ce6a791717c5e866f254877de8a355078cd7fa85 100644 (file)
--- a/src/target/semihosting_common.c
+++ b/src/target/semihosting_common.c
@@ -225,6 +225,10 @@ int semihosting_common(struct target *target)
                        else {
                                int fd = semihosting_get_field(target, 0, fields);
                                if (semihosting->is_fileio) {
+                                       if (fd == 0 || fd == 1 || fd == 2) {
+                                               semihosting->result = 0;
+                                               break;
+                                       }
                                        semihosting->hit_fileio = true;
                                        fileio_info->identifier = "close";
                                        fileio_info->param_1 = fd;
@@ -445,8 +449,8 @@ int semihosting_common(struct target *target)
                         * - –1 if an error occurs.
                         */
                        if (semihosting->is_fileio) {
-                               LOG_ERROR("SYS_FLEN not supported by semihosting fileio");
-                               return ERROR_FAIL;
+                               semihosting->result = -1;
+                               semihosting->sys_errno = EINVAL;
                        }
                        retval = semihosting_read_fields(target, 1, fields);
                        if (retval != ERROR_OK)
@@ -690,9 +694,19 @@ int semihosting_common(struct target *target)
                                        /* TODO: implement the :semihosting-features special file.
                                         * */
                                        if (semihosting->is_fileio) {
-                                               if (strcmp((char *)fn, ":tt") == 0)
-                                                       semihosting->result = 0;
-                                               else {
+                                               if (strcmp((char *)fn, ":semihosting-features") == 0) {
+                                                       semihosting->result = -1;
+                                                       semihosting->sys_errno = EINVAL;
+                                               } else if (strcmp((char *)fn, ":tt") == 0) {
+                                                       if (mode == 0)
+                                                               semihosting->result = 0;
+                                                       else if (mode == 4)
+                                                               semihosting->result = 1;
+                                                       else if (mode == 8)
+                                                               semihosting->result = 2;
+                                                       else
+                                                               semihosting->result = -1;
+                                               } else {
                                                        semihosting->hit_fileio = true;
                                                        fileio_info->identifier = "open";
                                                        fileio_info->param_1 = addr;
@@ -1456,7 +1470,7 @@ __COMMAND_HANDLER(handle_common_semihosting_command)
 
        struct semihosting *semihosting = target->semihosting;
        if (!semihosting) {
-               command_print(CMD_CTX, "semihosting not supported for current target");
+               command_print(CMD, "semihosting not supported for current target");
                return ERROR_FAIL;
        }
 
@@ -1479,7 +1493,7 @@ __COMMAND_HANDLER(handle_common_semihosting_command)
                semihosting->is_active = is_active;
        }
 
-       command_print(CMD_CTX, "semihosting is %s",
+       command_print(CMD, "semihosting is %s",
                semihosting->is_active
                ? "enabled" : "disabled");
 
@@ -1498,19 +1512,19 @@ __COMMAND_HANDLER(handle_common_semihosting_fileio_command)
 
        struct semihosting *semihosting = target->semihosting;
        if (!semihosting) {
-               command_print(CMD_CTX, "semihosting not supported for current target");
+               command_print(CMD, "semihosting not supported for current target");
                return ERROR_FAIL;
        }
 
        if (!semihosting->is_active) {
-               command_print(CMD_CTX, "semihosting not yet enabled for current target");
+               command_print(CMD, "semihosting not yet enabled for current target");
                return ERROR_FAIL;
        }
 
        if (CMD_ARGC > 0)
                COMMAND_PARSE_ENABLE(CMD_ARGV[0], semihosting->is_fileio);
 
-       command_print(CMD_CTX, "semihosting fileio is %s",
+       command_print(CMD, "semihosting fileio is %s",
                semihosting->is_fileio
                ? "enabled" : "disabled");
 
@@ -1529,7 +1543,7 @@ __COMMAND_HANDLER(handle_common_semihosting_cmdline)
 
        struct semihosting *semihosting = target->semihosting;
        if (!semihosting) {
-               command_print(CMD_CTX, "semihosting not supported for current target");
+               command_print(CMD, "semihosting not supported for current target");
                return ERROR_FAIL;
        }
 
@@ -1544,7 +1558,7 @@ __COMMAND_HANDLER(handle_common_semihosting_cmdline)
                semihosting->cmdline = cmdline;
        }
 
-       command_print(CMD_CTX, "semihosting command line is [%s]",
+       command_print(CMD, "semihosting command line is [%s]",
                semihosting->cmdline);
 
        return ERROR_OK;
@@ -1561,19 +1575,19 @@ __COMMAND_HANDLER(handle_common_semihosting_resumable_exit_command)
 
        struct semihosting *semihosting = target->semihosting;
        if (!semihosting) {
-               command_print(CMD_CTX, "semihosting not supported for current target");
+               command_print(CMD, "semihosting not supported for current target");
                return ERROR_FAIL;
        }
 
        if (!semihosting->is_active) {
-               command_print(CMD_CTX, "semihosting not yet enabled for current target");
+               command_print(CMD, "semihosting not yet enabled for current target");
                return ERROR_FAIL;
        }
 
        if (CMD_ARGC > 0)
                COMMAND_PARSE_ENABLE(CMD_ARGV[0], semihosting->has_resumable_exit);
 
-       command_print(CMD_CTX, "semihosting resumable exit is %s",
+       command_print(CMD, "semihosting resumable exit is %s",
                semihosting->has_resumable_exit
                ? "enabled" : "disabled");