Adds 'interp' field to command_context, chasing the few remaining
references to the global variable outside of the command module.
#if !BUILD_ECOSBOARD
Jim_InitEmbedded();
/* Create an interpreter */
#if !BUILD_ECOSBOARD
Jim_InitEmbedded();
/* Create an interpreter */
- interp = Jim_CreateInterp();
+ interp = context->interp = Jim_CreateInterp();
/* Add all the Jim core commands */
Jim_RegisterCoreCommands(interp);
#endif
/* Add all the Jim core commands */
Jim_RegisterCoreCommands(interp);
#endif
enum command_mode mode;
struct command *commands;
int current_target;
enum command_mode mode;
struct command *commands;
int current_target;
#define ERROR_COMMAND_ARGUMENT_OVERFLOW (-604)
#define ERROR_COMMAND_ARGUMENT_UNDERFLOW (-605)
#define ERROR_COMMAND_ARGUMENT_OVERFLOW (-604)
#define ERROR_COMMAND_ARGUMENT_UNDERFLOW (-605)
-extern Jim_Interp *interp;
-
int parse_ulong(const char *str, unsigned long *ul);
int parse_ullong(const char *str, unsigned long long *ul);
int parse_ulong(const char *str, unsigned long *ul);
int parse_ullong(const char *str, unsigned long long *ul);
if ((retval = jtag_execute_queue()) != ERROR_OK)
return retval;
if ((retval = jtag_execute_queue()) != ERROR_OK)
return retval;
- if (Jim_Eval_Named(interp, "jtag_init", __FILE__, __LINE__) != JIM_OK)
+ if (Jim_Eval_Named(cmd_ctx->interp, "jtag_init", __FILE__, __LINE__) != JIM_OK)
return ERROR_FAIL;
return ERROR_OK;
return ERROR_FAIL;
return ERROR_OK;
return EXIT_FAILURE;
#endif
return EXIT_FAILURE;
#endif
+ ret = server_init(cmd_ctx);
if (ERROR_OK != ret)
return EXIT_FAILURE;
if (ERROR_OK != ret)
return EXIT_FAILURE;
struct httpd_request
{
int post;
struct httpd_request
{
int post;
struct MHD_PostProcessor *postprocessor;
//Jim_Obj *dict;
struct MHD_PostProcessor *postprocessor;
//Jim_Obj *dict;
}
/* append to said key in dictionary */
}
/* append to said key in dictionary */
-static void append_key(struct httpd_request *r, const char *key,
+static void append_key(Jim_Interp *interp,
+ struct httpd_request *r, const char *key,
const char *data, size_t off, size_t size)
{
Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1);
const char *data, size_t off, size_t size)
{
Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1);
{
struct httpd_request *r = (struct httpd_request*) con_cls;
{
struct httpd_request *r = (struct httpd_request*) con_cls;
- append_key(r, key, data, off, size);
+ append_key(r->interp, r, key, data, off, size);
const char *value)
{
struct httpd_request *r = (struct httpd_request*) cls;
const char *value)
{
struct httpd_request *r = (struct httpd_request*) cls;
- append_key(r, key, value, 0, strlen(value));
+ append_key(r->interp, r, key, value, 0, strlen(value));
-static int handle_request(struct MHD_Connection * connection, const char * url)
+static int handle_request(Jim_Interp *interp,
+ struct MHD_Connection * connection, const char * url)
{
struct MHD_Response * response;
{
struct MHD_Response * response;
const char * url, const char * method, const char * version,
const char * upload_data, size_t * upload_data_size, void ** ptr)
{
const char * url, const char * method, const char * version,
const char * upload_data, size_t * upload_data_size, void ** ptr)
{
+ Jim_Interp *interp = (Jim_Interp *)cls;
int post = 0;
if (0 == strcmp(method, "POST"))
int post = 0;
if (0 == strcmp(method, "POST"))
memset(*ptr, 0, sizeof(struct httpd_request));
r = (struct httpd_request *) *ptr;
memset(*ptr, 0, sizeof(struct httpd_request));
r = (struct httpd_request *) *ptr;
r->post = post;
Jim_SetVariableStr(interp, "httppostdata", Jim_NewDictObj(interp, NULL, 0));
r->post = post;
Jim_SetVariableStr(interp, "httppostdata", Jim_NewDictObj(interp, NULL, 0));
url="index.tcl";
const char *file_name = alloc_printf("%s/%s", httpd_dir, url);
url="index.tcl";
const char *file_name = alloc_printf("%s/%s", httpd_dir, url);
- int result = handle_request(connection, file_name);
+ int result = handle_request(interp, connection, file_name);
free((void *)file_name);
return result;
}
free((void *)file_name);
return result;
}
int port = 8888;
LOG_USER("Launching httpd server on port %d", port);
d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL,
int port = 8888;
LOG_USER("Launching httpd server on port %d", port);
d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL,
- &ahc_echo, NULL, /* could be data for handler, but we only have a single handler, use global variables instead */
+ &ahc_echo, cmd_ctx->interp,
MHD_OPTION_NOTIFY_COMPLETED, request_completed, NULL, /* Closure... what's that??? */
MHD_OPTION_END);
if (d == NULL)
MHD_OPTION_NOTIFY_COMPLETED, request_completed, NULL, /* Closure... what's that??? */
MHD_OPTION_END);
if (d == NULL)
+int server_init(struct command_context *cmd_ctx)
{
#ifdef _WIN32
WORD wVersionRequested;
{
#ifdef _WIN32
WORD wVersionRequested;
signal(SIGABRT, sig_handler);
#endif
signal(SIGABRT, sig_handler);
#endif
+ int ret = tcl_init(cmd_ctx);
if (ERROR_OK != ret)
return ret;
if (ERROR_OK != ret)
return ret;
input_handler_t in_handler, connection_closed_handler_t close_handler,
void *priv);
input_handler_t in_handler, connection_closed_handler_t close_handler,
void *priv);
+int server_init(struct command_context *cmd_ctx);
int server_quit(void);
int server_loop(struct command_context *command_context);
int server_quit(void);
int server_loop(struct command_context *command_context);
static int tcl_input(struct connection *connection)
{
static int tcl_input(struct connection *connection)
{
+ Jim_Interp *interp = (Jim_Interp *)connection->priv;
int retval;
int i;
ssize_t rlen;
int retval;
int i;
ssize_t rlen;
+int tcl_init(struct command_context *cmd_ctx)
- retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1, tcl_new_connection, tcl_input, tcl_closed, NULL);
+ retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1,
+ &tcl_new_connection, &tcl_input,
+ &tcl_closed, cmd_ctx->interp);
+int tcl_init(struct command_context *cmd_ctx);
int tcl_register_commands(struct command_context *cmd_ctx);
#endif /* _TCL_SERVER_H_ */
int tcl_register_commands(struct command_context *cmd_ctx);
#endif /* _TCL_SERVER_H_ */
jtag_poll_set_enabled(false);
sprintf(buf, "ocd_process_reset %s", n->name);
jtag_poll_set_enabled(false);
sprintf(buf, "ocd_process_reset %s", n->name);
- retval = Jim_Eval(interp, buf);
+ retval = Jim_Eval(cmd_ctx->interp, buf);
jtag_poll_set_enabled(save_poll);
if (retval != JIM_OK) {
jtag_poll_set_enabled(save_poll);
if (retval != JIM_OK) {
- Jim_PrintErrorMessage(interp);
+ Jim_PrintErrorMessage(cmd_ctx->interp);
+static int handle_target(void *priv);
+
int target_init(struct command_context *cmd_ctx)
{
struct target *target;
int target_init(struct command_context *cmd_ctx)
{
struct target *target;
{
if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
return retval;
{
if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
return retval;
- if ((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)
+ if ((retval = target_register_timer_callback(&handle_target, 100, 1, cmd_ctx->interp)) != ERROR_OK)
}
/* process target state changes */
}
/* process target state changes */
-int handle_target(void *priv)
+static int handle_target(void *priv)
+ Jim_Interp *interp = (Jim_Interp *)priv;
int retval = ERROR_OK;
/* we do not want to recurse here... */
int retval = ERROR_OK;
/* we do not want to recurse here... */
int target_register_user_commands(struct command_context *cmd_ctx);
int target_init(struct command_context *cmd_ctx);
int target_examine(void);
int target_register_user_commands(struct command_context *cmd_ctx);
int target_init(struct command_context *cmd_ctx);
int target_examine(void);
-int handle_target(void *priv);
int target_process_reset(struct command_context *cmd_ctx,
enum target_reset_mode reset_mode);
int target_process_reset(struct command_context *cmd_ctx,
enum target_reset_mode reset_mode);
Linking to existing account procedure
If you already have an account and want to add another login method
you
MUST first sign in with your existing account and
then change URL to read
https://review.openocd.org/login/?link
to get to this page again but this time it'll work for linking. Thank you.
SSH host keys fingerprints
1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=.. |
|+o.. . |
|*.o . . |
|+B . . . |
|Bo. = o S |
|Oo.+ + = |
|oB=.* = . o |
| =+=.+ + E |
|. .=o . o |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)