X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fecosboard.c;h=f0ec433fd495bbb5259883c9891a475259a10175;hb=3a59ff8bda2c1c1bba36edc2c217de7d1c224d17;hp=757d4da90a009d770a9fd77eda99209479a474a4;hpb=26095d6612d60b470298e7136e7ffd6c74c9f371;p=openocd.git

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 757d4da90a..f0ec433fd4 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -119,6 +119,7 @@ void diag_write(char *buf, int len)
 static bool serialLog = true;
 static bool writeLog = true;
 
+char hwaddr[512];
 
 struct FastLoad
 {
@@ -1215,33 +1216,9 @@ zylinjtag_Jim_Command_mac(Jim_Interp *interp,
                                    int argc,
 		Jim_Obj * const *argv)
 {
-	int s;
-	struct ifreq ifr;
-	s = socket(AF_INET, SOCK_DGRAM, 0);
-	if (s >= 0)
-	{
-		strcpy(ifr.ifr_name, "eth0");
-		int res;
-		res = ioctl(s, SIOCGIFHWADDR, &ifr);
-		close(s);
-
-		if (res < 0)
-		{
-			return JIM_OK;
-		}
-	}
 
 	Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
 
-	char hwaddr[512];
-	sprintf(hwaddr, "%02x:%02x:%02x:%02x:%02x:%02x",
-			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[0],
-			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[1],
-			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[2],
-			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[3],
-			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[4],
-			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[5]);
-
 	Jim_AppendString(httpstate.jim_interp, tclOutput, hwaddr, strlen(hwaddr));
 
 	Jim_SetResult(interp, tclOutput);
@@ -1295,6 +1272,7 @@ zylinjtag_Jim_Command_ip(Jim_Interp *interp,
 
 extern Jim_Interp *interp;
 
+
 static void zylinjtag_startNetwork()
 {
 	// Bring TCP/IP up immediately before we're ready to accept commands.
@@ -1337,6 +1315,34 @@ static void zylinjtag_startNetwork()
 
 	diag_printf("Web server running\n");
 
+	int s;
+	struct ifreq ifr;
+	s = socket(AF_INET, SOCK_DGRAM, 0);
+	if (s >= 0)
+	{
+		strcpy(ifr.ifr_name, "eth0");
+		int res;
+		res = ioctl(s, SIOCGIFHWADDR, &ifr);
+		close(s);
+
+		if (res < 0)
+		{
+			diag_printf("Can't obtain MAC address\n");
+			reboot();
+		}
+	}
+
+	sprintf(hwaddr, "%02x:%02x:%02x:%02x:%02x:%02x",
+			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[0],
+			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[1],
+			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[2],
+			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[3],
+			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[4],
+			(int) ((unsigned char *) &ifr.ifr_hwaddr.sa_data)[5]);
+
+
+	discover_message=alloc_printf("ZY1000 Zylin JTAG debugger MAC %s", hwaddr);
+
 	discover_launch();
 }
 
@@ -1631,15 +1637,20 @@ void startUart(void)
 
 int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	if (argc != 1)
+	static int current_baud = 38400;
+	if (argc == 0)
+	{
+		command_print(cmd_ctx, "%d", current_baud);
+		return ERROR_OK;
+	} else if (argc != 1)
 	{
-		command_print(cmd_ctx, "usage: uart <baudrate>");
 		return ERROR_INVALID_ARGUMENTS;
 	}
 
-	int baud = atol(args[0]);
+	current_baud = atol(args[0]);
 
-	switch (baud)
+	int baud;
+	switch (current_baud)
 	{
 	case 9600:
 		baud = CYGNUM_SERIAL_BAUD_9600;