X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fecosboard.c;h=0805e6fcb93c2c88c5db1d606750cef2dc39021e;hb=00937cd049706ee4c13514c9898ac14f9c232e79;hp=f6e040fac3a26961059a5fca828c9db9cadd0134;hpb=630fc86ee339aa400f58fe80cbc5a1926eb3ef39;p=openocd.git

diff --git a/src/ecosboard.c b/src/ecosboard.c
index f6e040fac3..0805e6fcb9 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -500,6 +500,10 @@ static void zylinjtag_startNetwork(void)
 
 	cyg_httpd_init_tcl_interpreter();
 
+	// Kludge! Why can't I do this from httpd.c??? I get linker errors...
+	// some of that --start/end-group stuff?
+    Jim_InitStaticExtensions(httpstate.jim_interp);
+
 	Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log,
 			NULL, NULL);
 	Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
@@ -1277,6 +1281,7 @@ struct Tftp
 	cyg_uint8 *mem;
 	int actual;
 	char *server;
+	int port;
 	char *file;
 };
 
@@ -1333,6 +1338,15 @@ static int tftpfs_open(cyg_mtab_entry *mte, cyg_dir dir, const char *name,
 	strncpy(tftp->server, name, server - name);
 	tftp->server[server - name] = 0;
 
+	tftp->port = 0; /* default port 69 */
+	char *port;
+	port = strchr(tftp->server, ':');
+	if (port != NULL)
+	{
+		tftp->port = atoi(port + 1);
+		*port = 0;
+	}
+
 	tftp->file = strdup(server + 1);
 	if (tftp->file == NULL)
 	{
@@ -1350,7 +1364,7 @@ static int fetchTftp(struct Tftp *tftp)
 	if (!tftp->readFile)
 	{
 		int err;
-		tftp->actual = tftp_client_get(tftp->file, tftp->server, 0, tftp->mem,
+		tftp->actual = tftp_client_get(tftp->file, tftp->server, tftp->port, tftp->mem,
 				tftpMaxSize, TFTP_OCTET, &err);
 
 		if (tftp->actual < 0)