projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/nor: add support for Nuvoton NPCX series flash
[fw/openocd]
/
src
/
openocd.c
diff --git
a/src/openocd.c
b/src/openocd.c
index 83c35458b9ae89a1ad962f25ded32731a3b00de1..b4571b46499e9c6781c027be68c60c0221c7c81d 100644
(file)
--- a/
src/openocd.c
+++ b/
src/openocd.c
@@
-30,7
+30,6
@@
#include <jtag/driver.h>
#include <jtag/jtag.h>
#include <transport/transport.h>
#include <jtag/driver.h>
#include <jtag/jtag.h>
#include <transport/transport.h>
-#include <helper/ioutil.h>
#include <helper/util.h>
#include <helper/configuration.h>
#include <flash/nor/core.h>
#include <helper/util.h>
#include <helper/configuration.h>
#include <flash/nor/core.h>
@@
-38,6
+37,7
@@
#include <pld/pld.h>
#include <target/arm_cti.h>
#include <target/arm_adi_v5.h>
#include <pld/pld.h>
#include <target/arm_cti.h>
#include <target/arm_adi_v5.h>
+#include <target/arm_tpiu_swo.h>
#include <rtt/rtt.h>
#include <server/server.h>
#include <rtt/rtt.h>
#include <server/server.h>
@@
-131,7
+131,7
@@
COMMAND_HANDLER(handle_init_command)
initialized = 1;
retval = command_run_line(CMD_CTX, "target init");
initialized = 1;
retval = command_run_line(CMD_CTX, "target init");
- if (
ERROR_OK != retval
)
+ if (
retval != ERROR_OK
)
return ERROR_FAIL;
retval = adapter_init(CMD_CTX);
return ERROR_FAIL;
retval = adapter_init(CMD_CTX);
@@
-150,11
+150,11
@@
COMMAND_HANDLER(handle_init_command)
command_context_mode(CMD_CTX, COMMAND_EXEC);
retval = command_run_line(CMD_CTX, "transport init");
command_context_mode(CMD_CTX, COMMAND_EXEC);
retval = command_run_line(CMD_CTX, "transport init");
- if (
ERROR_OK != retval
)
+ if (
retval != ERROR_OK
)
return ERROR_FAIL;
retval = command_run_line(CMD_CTX, "dap init");
return ERROR_FAIL;
retval = command_run_line(CMD_CTX, "dap init");
- if (
ERROR_OK != retval
)
+ if (
retval != ERROR_OK
)
return ERROR_FAIL;
LOG_DEBUG("Examining targets...");
return ERROR_FAIL;
LOG_DEBUG("Examining targets...");
@@
-173,6
+173,10
@@
COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL;
command_context_mode(CMD_CTX, COMMAND_EXEC);
return ERROR_FAIL;
command_context_mode(CMD_CTX, COMMAND_EXEC);
+ /* in COMMAND_EXEC, after target_examine(), only tpiu or only swo */
+ if (command_run_line(CMD_CTX, "tpiu init") != ERROR_OK)
+ return ERROR_FAIL;
+
/* initialize telnet subsystem */
gdb_target_add_all(all_targets);
/* initialize telnet subsystem */
gdb_target_add_all(all_targets);
@@
-255,11
+259,12
@@
static struct command_context *setup_command_handler(Jim_Interp *interp)
&pld_register_commands,
&cti_register_commands,
&dap_register_commands,
&pld_register_commands,
&cti_register_commands,
&dap_register_commands,
+ &arm_tpiu_swo_register_commands,
NULL
};
NULL
};
- for (unsigned i = 0;
NULL !=
command_registrants[i]; i++) {
+ for (unsigned i = 0; command_registrants[i]; i++) {
int retval = (*command_registrants[i])(cmd_ctx);
int retval = (*command_registrants[i])(cmd_ctx);
- if (
ERROR_OK != retval
) {
+ if (
retval != ERROR_OK
) {
command_done(cmd_ctx);
return NULL;
}
command_done(cmd_ctx);
return NULL;
}
@@
-298,12
+303,12
@@
static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
}
ret = server_init(cmd_ctx);
}
ret = server_init(cmd_ctx);
- if (
ERROR_OK != ret
)
+ if (
ret != ERROR_OK
)
return ERROR_FAIL;
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
return ERROR_FAIL;
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
- if (
ERROR_OK != ret
) {
+ if (
ret != ERROR_OK
) {
server_quit();
return ERROR_FAIL;
}
server_quit();
return ERROR_FAIL;
}
@@
-335,9
+340,6
@@
int openocd_main(int argc, char *argv[])
if (util_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
if (util_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
- if (ioutil_init(cmd_ctx) != ERROR_OK)
- return EXIT_FAILURE;
-
if (rtt_init() != ERROR_OK)
return EXIT_FAILURE;
if (rtt_init() != ERROR_OK)
return EXIT_FAILURE;
@@
-355,13
+357,15
@@
int openocd_main(int argc, char *argv[])
flash_free_all_banks();
gdb_service_free();
flash_free_all_banks();
gdb_service_free();
+ arm_tpiu_swo_cleanup_all();
server_free();
unregister_all_commands(cmd_ctx, NULL);
server_free();
unregister_all_commands(cmd_ctx, NULL);
+ help_del_all_commands(cmd_ctx);
/* free all DAP and CTI objects */
/* free all DAP and CTI objects */
- dap_cleanup_all();
arm_cti_cleanup_all();
arm_cti_cleanup_all();
+ dap_cleanup_all();
adapter_quit();
adapter_quit();
@@
-373,9
+377,9
@@
int openocd_main(int argc, char *argv[])
rtt_exit();
free_config();
rtt_exit();
free_config();
- if (
ERROR_FAIL == ret
)
+ if (
ret == ERROR_FAIL
)
return EXIT_FAILURE;
return EXIT_FAILURE;
- else if (
ERROR_OK != ret
)
+ else if (
ret != ERROR_OK
)
exit_on_signal(ret);
return ret;
exit_on_signal(ret);
return ret;