X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fecosboard.c;h=38f32525abad8d94bf22563f6f0994f24f43a0a7;hp=4af38e8556c6fcac92da576bdaa27e3d70817b5a;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=a02411a15f24a9e1f0ac893e631c6a520adfdab8

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 4af38e8556..38f32525ab 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -114,8 +114,8 @@ static bool writeLog = true;
 char hwaddr[512];
 
 
-extern flash_driver_t *flash_drivers[];
-extern target_type_t *target_types[];
+extern struct flash_driver *flash_drivers[];
+extern struct target_type *target_types[];
 
 #ifdef CYGPKG_PROFILE_GPROF
 #include <cyg/profile/profile.h>
@@ -229,7 +229,7 @@ void reboot_port(void)
 	cyg_thread_resume(zylinjtag_reboot_port_thread_handle);
 }
 
-int configuration_output_handler(struct command_context_s *context,
+int configuration_output_handler(struct command_context *context,
 		const char* line)
 {
 	diag_printf("%s", line);
@@ -237,7 +237,7 @@ int configuration_output_handler(struct command_context_s *context,
 	return ERROR_OK;
 }
 
-int zy1000_configuration_output_handler_log(struct command_context_s *context,
+int zy1000_configuration_output_handler_log(struct command_context *context,
 		const char* line)
 {
 	LOG_USER_N("%s", line);
@@ -247,7 +247,7 @@ int zy1000_configuration_output_handler_log(struct command_context_s *context,
 
 #ifdef CYGPKG_PROFILE_GPROF
 
-int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int eCosBoard_handle_eCosBoard_profile_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc)
 {
 	command_print(cmd_ctx, "Profiling started");
 	start_profile();
@@ -258,7 +258,7 @@ int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx
 
 externC void phi_init_all_network_interfaces(void);
 
-command_context_t *cmd_ctx;
+struct command_context *cmd_ctx;
 
 static bool webRunning = false;
 
@@ -474,7 +474,6 @@ static int zylinjtag_Jim_Command_reboot(Jim_Interp *interp, int argc,
 	return JIM_OK;
 }
 
-
 static void zylinjtag_startNetwork(void)
 {
 	// Bring TCP/IP up immediately before we're ready to accept commands.
@@ -591,6 +590,7 @@ static void print_exception_handler(cyg_addrword_t data, cyg_code_t exception,
 
 }
 
+#ifdef CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION
 static void setHandler(cyg_code_t exception)
 {
 	cyg_exception_handler_t *old_handler;
@@ -599,6 +599,7 @@ static void setHandler(cyg_code_t exception)
 	cyg_exception_set_handler(exception, print_exception_handler, 0,
 			&old_handler, &old_data);
 }
+#endif
 
 static cyg_thread zylinjtag_uart_thread_object;
 static cyg_handle_t zylinjtag_uart_thread_handle;
@@ -625,6 +626,9 @@ void setNoDelay(int session, int flag)
 #endif
 }
 
+#define TEST_TCPIP() 0
+
+#if TEST_TCPIP
 struct
 {
 	int req;
@@ -633,6 +637,7 @@ struct
 	int actual2;
 } tcpipSent[512 * 1024];
 int cur;
+#endif
 
 static void zylinjtag_uart(cyg_addrword_t data)
 {
@@ -697,7 +702,9 @@ static void zylinjtag_uart(cyg_addrword_t data)
 		size_t pos, pos2;
 		pos = 0;
 		pos2 = 0;
+#if TEST_TCPIP
 		cur = 0;
+#endif
 		for (;;)
 		{
 			fd_set write_fds;
@@ -742,7 +749,6 @@ static void zylinjtag_uart(cyg_addrword_t data)
 				pos2 = 0;
 			}
 
-			size_t x = actual2;
 			size_t y = 0;
 			if (actual2 > 0)
 			{
@@ -772,7 +778,6 @@ static void zylinjtag_uart(cyg_addrword_t data)
 				actual += t;
 			}
 
-			int x2 = actual;
 			int y2 = 0;
 			if (actual > 0)
 			{
@@ -798,6 +803,7 @@ static void zylinjtag_uart(cyg_addrword_t data)
 				}
 				y2 = written;
 			}
+#if TEST_TCPIP
 			if (cur < 1024)
 			{
 				tcpipSent[cur].req = x;
@@ -806,11 +812,12 @@ static void zylinjtag_uart(cyg_addrword_t data)
 				tcpipSent[cur].actual2 = y2;
 				cur++;
 			}
-
+#endif
 		}
 		closeSession: close(session);
 		close(serHandle);
 
+#if TEST_TCPIP
 		int i;
 		for (i = 0; i < 1024; i++)
 		{
@@ -818,6 +825,7 @@ static void zylinjtag_uart(cyg_addrword_t data)
 					tcpipSent[i].req2, tcpipSent[i].actual2);
 
 		}
+#endif
 	}
 	close(fd);
 
@@ -832,7 +840,7 @@ void startUart(void)
 	cyg_thread_resume(zylinjtag_uart_thread_handle);
 }
 
-int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd,
+int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
 		char **args, int argc)
 {
 	static int current_baud = 38400;
@@ -916,7 +924,7 @@ bool logAllToSerial = false;
 int boolParam(char *var);
 
 
-command_context_t *setup_command_handler(void);
+struct command_context *setup_command_handler(void);
 
 static const char *zylin_config_dir="/config/settings";
 
@@ -928,7 +936,7 @@ static int add_default_dirs(void)
 	return ERROR_OK;
 }
 
-int ioutil_init(struct command_context_s *cmd_ctx);
+int ioutil_init(struct command_context *cmd_ctx);
 
 int main(int argc, char *argv[])
 {
@@ -1060,7 +1068,7 @@ int main(int argc, char *argv[])
 	add_default_dirs();
 
 	/* initialize commandline interface */
-	command_context_t * cmd_ctx;
+	struct command_context * cmd_ctx;
 	cmd_ctx = setup_command_handler();
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);