Commit 250dc580 authored by Spencer Oliver's avatar Spencer Oliver
Browse files

build: cleanup src/ directory



Change-Id: Ia6ed99ce75625ad6ef5e0d3c3bbdc1c1bec21df3
Signed-off-by: default avatarSpencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/407
Tested-by: jenkins
parent dd4247db
......@@ -25,16 +25,13 @@
COMMAND_HANDLER(handle_foo_command)
{
if (CMD_ARGC < 1 || CMD_ARGC > 2)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
uint32_t address;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
const char *msg = "<unchanged>";
if (CMD_ARGC == 2)
{
if (CMD_ARGC == 2) {
bool enable;
COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
msg = enable ? "enable" : "disable";
......@@ -49,7 +46,7 @@ static bool foo_flag;
COMMAND_HANDLER(handle_flag_command)
{
return CALL_COMMAND_HANDLER(handle_command_parse_bool,
&foo_flag, "foo flag");
&foo_flag, "foo flag");
}
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)
{
if (CMD_ARGC > 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
if (1 == CMD_ARGC)
{
if (1 == CMD_ARGC) {
*sep = " ";
*name = CMD_ARGV[0];
}
else
} else
*sep = *name = "";
return ERROR_OK;
......
......@@ -28,4 +28,4 @@ struct command_registration;
*/
extern const struct command_registration hello_command_handlers[];
#endif // OPENOCD_HELLO_H
#endif /* OPENOCD_HELLO_H */
......@@ -18,7 +18,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
......
......@@ -47,38 +47,35 @@
#include <strings.h>
#endif
#define OPENOCD_VERSION \
"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
#define OPENOCD_VERSION \
"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
/* Give scripts and TELNET a way to find out what version this is */
static int jim_version_command(Jim_Interp *interp, int argc,
Jim_Obj * const *argv)
Jim_Obj * const *argv)
{
if (argc > 2)
{
return JIM_ERR;
}
const char *str = "";
char * version_str;
char *version_str;
version_str = OPENOCD_VERSION;
if (argc == 2)
str = Jim_GetString(argv[1], NULL);
if (strcmp("git", str) == 0)
{
version_str = GITVERSION;
}
Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
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:
target->display = 0;
break;
......@@ -86,8 +83,7 @@ static int log_target_callback_event_handler(struct target *target, enum target_
target->display = 1;
break;
case TARGET_EVENT_HALTED:
if (target->display)
{
if (target->display) {
/* do not display information when debugger caused the halt */
target_arch_state(target);
}
......@@ -117,7 +113,7 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_COMMAND_SYNTAX_ERROR;
int retval;
static int initialized = 0;
static int initialized;
if (initialized)
return ERROR_OK;
......@@ -127,8 +123,8 @@ COMMAND_HANDLER(handle_init_command)
if (ERROR_OK != retval)
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 */
return retval;
}
......@@ -251,11 +247,9 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
&mflash_register_commands,
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);
if (ERROR_OK != retval)
{
if (ERROR_OK != retval) {
command_done(cmd_ctx);
return NULL;
}
......@@ -263,7 +257,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
LOG_DEBUG("command registration: complete");
LOG_OUTPUT(OPENOCD_VERSION "\n"
"Licensed under GNU GPL v2\n");
"Licensed under GNU GPL v2\n");
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)
return EXIT_FAILURE;
if (init_at_startup)
{
if (init_at_startup) {
ret = command_run_line(cmd_ctx, "init");
if (ERROR_OK != ret)
return EXIT_FAILURE;
......
......@@ -21,7 +21,7 @@
#ifndef OPENOCD_H
#define OPENOCD_H
/**
/**
* Different applications can define this entry point to override
* the default openocd main function. On most systems, this will be
* defined in src/openocd.c.
......@@ -31,7 +31,7 @@
*/
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[];
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment