From cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Mon, 9 Nov 2009 23:56:52 -0800
Subject: use COMMAND_HANDLER macro to define all commands

---
 src/server/gdb_server.c    | 12 ++++++------
 src/server/server.c        |  3 +--
 src/server/tcl_server.c    |  3 +--
 src/server/telnet_server.c |  6 ++----
 4 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/server')

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 21b58d0e..c0c5d775 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2249,7 +2249,7 @@ int gdb_init(void)
 	return ERROR_OK;
 }
 
-static int handle_gdb_sync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_sync_command)
 {
 	if (argc != 0)
 	{
@@ -2269,12 +2269,12 @@ static int handle_gdb_sync_command(struct command_context_s *cmd_ctx, char *cmd,
 }
 
 /* daemon configuration command gdb_port */
-static int handle_gdb_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_port_command)
 {
 	return server_port_command(cmd_ctx, cmd, args, argc, &gdb_port);
 }
 
-static int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_memory_map_command)
 {
 	if (argc == 1)
 	{
@@ -2295,7 +2295,7 @@ static int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char
 	return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
-static int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_flash_program_command)
 {
 	if (argc == 1)
 	{
@@ -2316,7 +2316,7 @@ static int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, c
 	return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
-static int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_report_data_abort_command)
 {
 	if (argc == 1)
 	{
@@ -2338,7 +2338,7 @@ static int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ct
 }
 
 /* gdb_breakpoint_override */
-static int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_gdb_breakpoint_override_command)
 {
 	if (argc == 0)
 	{
diff --git a/src/server/server.c b/src/server/server.c
index 05018694..c000b7c2 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -534,8 +534,7 @@ int server_quit(void)
 }
 
 /* tell the server we want to shut down */
-static int handle_shutdown_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_shutdown_command)
 {
 	shutdown_openocd = 1;
 
diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 2e93e361..3410ca91 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -170,8 +170,7 @@ int tcl_init(void)
 	return retval;
 }
 
-static int handle_tcl_port_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_tcl_port_command)
 {
 	return server_port_command(cmd_ctx, cmd, args, argc, &tcl_port);
 }
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index b77deff1..c409ec0a 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -606,14 +606,12 @@ int telnet_init(char *banner)
 }
 
 /* daemon configuration command telnet_port */
-static int handle_telnet_port_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_telnet_port_command)
 {
 	return server_port_command(cmd_ctx, cmd, args, argc, &telnet_port);
 }
 
-static int handle_exit_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_exit_command)
 {
 	return ERROR_COMMAND_CLOSE_CONNECTION;
 }
-- 
cgit v1.2.3