imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: cleanup src/ directory 

Change-Id: Ia6ed99ce75625ad6ef5e0d3c3bbdc1c1bec21df3
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/407
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2012-01-27 16:44:06 +00:00
parent dd4247dba5
commit 250dc58056
5 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hello.c
View File

@ -25,16 +25,13 @@
COMMAND_HANDLER(handle_foo_command) COMMAND_HANDLER(handle_foo_command)
{ {
if (CMD_ARGC < 1 || CMD_ARGC > 2) if (CMD_ARGC < 1 || CMD_ARGC > 2)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
uint32_t address; uint32_t address;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
const char *msg = "<unchanged>"; const char *msg = "<unchanged>";
if (CMD_ARGC == 2) if (CMD_ARGC == 2) {
{
bool enable; bool enable;
COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable); COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
msg = enable ? "enable" : "disable"; msg = enable ? "enable" : "disable";
@ -49,7 +46,7 @@ static bool foo_flag;
COMMAND_HANDLER(handle_flag_command) COMMAND_HANDLER(handle_flag_command)
{ {
return CALL_COMMAND_HANDLER(handle_command_parse_bool, return CALL_COMMAND_HANDLER(handle_command_parse_bool,
&foo_flag, "foo flag"); &foo_flag, "foo flag");
} }
static const struct command_registration foo_command_handlers[] = { static const struct command_registration foo_command_handlers[] = {
@ -80,15 +77,11 @@ static const struct command_registration foo_command_handlers[] = {
static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name) static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
{ {
if (CMD_ARGC > 1) if (CMD_ARGC > 1)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} if (1 == CMD_ARGC) {
if (1 == CMD_ARGC)
{
*sep = " "; *sep = " ";
*name = CMD_ARGV[0]; *name = CMD_ARGV[0];
} } else
else
*sep = *name = ""; *sep = *name = "";
return ERROR_OK; return ERROR_OK;

2
src/hello.h
View File

@ -28,4 +28,4 @@ struct command_registration;
*/ */
extern const struct command_registration hello_command_handlers[]; extern const struct command_registration hello_command_handlers[];
#endif // OPENOCD_HELLO_H #endif /* OPENOCD_HELLO_H */

1
src/main.c
View File

@ -18,7 +18,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif

39
src/openocd.c
View File

@ -47,38 +47,35 @@
#include <strings.h> #include <strings.h>
#endif #endif
#define OPENOCD_VERSION \ #define OPENOCD_VERSION \
"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
/* Give scripts and TELNET a way to find out what version this is */ /* Give scripts and TELNET a way to find out what version this is */
static int jim_version_command(Jim_Interp *interp, int argc, static int jim_version_command(Jim_Interp *interp, int argc,
Jim_Obj * const *argv) Jim_Obj * const *argv)
{ {
if (argc > 2) if (argc > 2)
{
return JIM_ERR; return JIM_ERR;
}
const char *str = ""; const char *str = "";
char * version_str; char *version_str;
version_str = OPENOCD_VERSION; version_str = OPENOCD_VERSION;
if (argc == 2) if (argc == 2)
str = Jim_GetString(argv[1], NULL); str = Jim_GetString(argv[1], NULL);
if (strcmp("git", str) == 0) if (strcmp("git", str) == 0)
{
version_str = GITVERSION; version_str = GITVERSION;
}
Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1)); Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
return JIM_OK; return JIM_OK;
} }
static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv) static int log_target_callback_event_handler(struct target *target,
enum target_event event,
void *priv)
{ {
switch (event) switch (event) {
{
case TARGET_EVENT_GDB_START: case TARGET_EVENT_GDB_START:
target->display = 0; target->display = 0;
break; break;
@ -86,8 +83,7 @@ static int log_target_callback_event_handler(struct target *target, enum target_
target->display = 1; target->display = 1;
break; break;
case TARGET_EVENT_HALTED: case TARGET_EVENT_HALTED:
if (target->display) if (target->display) {
{
/* do not display information when debugger caused the halt */ /* do not display information when debugger caused the halt */
target_arch_state(target); target_arch_state(target);
} }
@ -117,7 +113,7 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
int retval; int retval;
static int initialized = 0; static int initialized;
if (initialized) if (initialized)
return ERROR_OK; return ERROR_OK;
@ -127,8 +123,8 @@ COMMAND_HANDLER(handle_init_command)
if (ERROR_OK != retval) if (ERROR_OK != retval)
return ERROR_FAIL; return ERROR_FAIL;
if ((retval = adapter_init(CMD_CTX)) != ERROR_OK) retval = adapter_init(CMD_CTX);
{ if (retval != ERROR_OK) {
/* we must be able to set up the debug adapter */ /* we must be able to set up the debug adapter */
return retval; return retval;
} }
@ -251,11 +247,9 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
&mflash_register_commands, &mflash_register_commands,
NULL NULL
}; };
for (unsigned i = 0; NULL != command_registrants[i]; i++) for (unsigned i = 0; NULL != command_registrants[i]; i++) {
{
int retval = (*command_registrants[i])(cmd_ctx); int retval = (*command_registrants[i])(cmd_ctx);
if (ERROR_OK != retval) if (ERROR_OK != retval) {
{
command_done(cmd_ctx); command_done(cmd_ctx);
return NULL; return NULL;
} }
@ -263,7 +257,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
LOG_DEBUG("command registration: complete"); LOG_DEBUG("command registration: complete");
LOG_OUTPUT(OPENOCD_VERSION "\n" LOG_OUTPUT(OPENOCD_VERSION "\n"
"Licensed under GNU GPL v2\n"); "Licensed under GNU GPL v2\n");
global_cmd_ctx = cmd_ctx; global_cmd_ctx = cmd_ctx;
@ -292,8 +286,7 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
if (ERROR_OK != ret) if (ERROR_OK != ret)
return EXIT_FAILURE; return EXIT_FAILURE;
if (init_at_startup) if (init_at_startup) {
{
ret = command_run_line(cmd_ctx, "init"); ret = command_run_line(cmd_ctx, "init");
if (ERROR_OK != ret) if (ERROR_OK != ret)
return EXIT_FAILURE; return EXIT_FAILURE;

4
src/openocd.h
View File

@ -21,7 +21,7 @@
#ifndef OPENOCD_H #ifndef OPENOCD_H
#define OPENOCD_H #define OPENOCD_H
/** /**
* Different applications can define this entry point to override * Different applications can define this entry point to override
* the default openocd main function. On most systems, this will be * the default openocd main function. On most systems, this will be
* defined in src/openocd.c. * defined in src/openocd.c.
@ -31,7 +31,7 @@
*/ */
int openocd_main(int argc, char *argv[]); int openocd_main(int argc, char *argv[]);
/// provides a hard-coded command environment setup /** provides a hard-coded command environment setup */
extern const char openocd_startup_tcl[]; extern const char openocd_startup_tcl[];
#endif #endif