rtos : smp support

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

diff --git a/src/target/target.c b/src/target/target.c
index 7763685db7548e9e4c5c3507d767e33bd6e4db09..e53d6f844668cd6cf4ba52e3688ea782ad51dfa0 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1074,7 +1074,7 @@ int target_register_event_callback(int (*callback)(struct target *target, enum t
 
        if (callback == NULL)
        {
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        if (*callbacks_p)
@@ -1099,7 +1099,7 @@ int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int
 
        if (callback == NULL)
        {
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        if (*callbacks_p)
@@ -1137,7 +1137,7 @@ int target_unregister_event_callback(int (*callback)(struct target *target, enum
 
        if (callback == NULL)
        {
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        while (c)
@@ -1164,7 +1164,7 @@ static int target_unregister_timer_callback(int (*callback)(void *priv), void *p
 
        if (callback == NULL)
        {
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        while (c)
@@ -1681,7 +1681,7 @@ int target_checksum_memory(struct target *target, uint32_t address, uint32_t siz
                if (buffer == NULL)
                {
                        LOG_ERROR("error allocating buffer for section (%d bytes)", (int)size);
-                       return ERROR_INVALID_ARGUMENTS;
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                }
                retval = target_read_buffer(target, address, size, buffer);
                if (retval != ERROR_OK)
@@ -2246,9 +2246,7 @@ COMMAND_HANDLER(handle_reg_command)
                return ERROR_OK;
        }
 
-       command_print(CMD_CTX, "usage: reg <#|name> [value]");
-
-       return ERROR_OK;
+       return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
 COMMAND_HANDLER(handle_poll_command)
@@ -2295,7 +2293,6 @@ COMMAND_HANDLER(handle_wait_halt_command)
                int retval = parse_uint(CMD_ARGV[0], &ms);
                if (ERROR_OK != retval)
                {
-                       command_print(CMD_CTX, "usage: %s [seconds]", CMD_NAME);
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
                // convert seconds (given) to milliseconds (needed)
@@ -3155,7 +3152,6 @@ COMMAND_HANDLER(handle_bp_command)
                        return handle_bp_command_set(CMD_CTX, addr, asid, length, hw);
 
                default:
-                       command_print(CMD_CTX, "usage: bp <address> [<asid>]<length> ['hw'|'hw_ctx']");
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
 }
@@ -3235,8 +3231,6 @@ COMMAND_HANDLER(handle_wp_command)
                break;
 
        default:
-               command_print(CMD_CTX, "usage: wp [address length "
-                               "[(r|w|a) [value [mask]]]]");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -5056,6 +5050,7 @@ static int target_create(Jim_GetOptInfo *goi)
                        .name = cp,
                        .mode = COMMAND_ANY,
                        .help = "target command group",
+                       .usage = "",
                        .chain = target_subcommands,
                },
                COMMAND_REGISTRATION_DONE
@@ -5124,11 +5119,12 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        int i;
        const char *targetname;
        int retval,len;
-       struct target *target;
-       struct target_list *head, *curr;
-    curr = (struct target_list*) NULL;
-       head = (struct target_list*) NULL;
-       
+       struct target *target = (struct target *) NULL;
+       struct target_list *head, *curr, *new;
+       curr = (struct target_list *) NULL;
+       head = (struct target_list *) NULL;
+       new = (struct target_list *) NULL;
+
        retval = 0;
        LOG_DEBUG("%d",argc);
        /* argv[1] = target to associate in smp
@@ -5144,7 +5140,6 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                LOG_DEBUG("%s ",targetname);
                if (target)
                {
-                       struct target_list *new;
                        new=malloc(sizeof(struct target_list));
                        new->target = target;
                        new->next = (struct target_list*)NULL;
@@ -5165,11 +5160,13 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 
     while(curr!=(struct target_list *)NULL)
        {
-    target=curr->target;
-       target->smp = 1;
-       target->head = head;
-       curr=curr->next;
+               target = curr->target;
+               target->smp = 1;
+               target->head = head;
+               curr = curr->next;
        }
+       if (target->rtos)
+               retval = rtos_smp_init(head->target);
        return retval;
 }