X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fecosboard.c;h=91780a98b9f310ac8fa2522823baf6c1d75fcb86;hp=0b1bf36ee6d5dea99b7392df2255e5562046aecd;hb=f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1;hpb=8d8937f1a68e1b050b92f91b1d264bf4bd3af489

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 0b1bf36ee6..91780a98b9 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -93,7 +93,7 @@ struct tftpd_fileops fileops =
 	(int (*)(const char *, int))open,
 	close,
 	(int (*)(int, const void *, int))write,
-	( int (*)(int, void *, int))read
+	(int (*)(int, void *, int))read
 };
 
 #endif
@@ -148,7 +148,6 @@ void start_profile(void)
 }
 #endif
 
-extern int eth0_up;
 static FILE *log;
 
 static char reboot_stack[2048];
@@ -254,7 +253,7 @@ void copyfile(char *name2, char *name1);
 void copydir(char *name, char *destdir);
 
 #if 0
-MTAB_ENTRY( romfs_mte1,
+MTAB_ENTRY(romfs_mte1,
 		"/rom",
 		"romfs",
 		"",
@@ -296,18 +295,16 @@ void format(void)
 	}
 
 	cyg_io_flash_getconfig_erase_t e;
-	void *err_addr;
 	len = sizeof(e);
 
 	e.offset = 0;
 	e.len = ds.dev_size;
-	e.err_address = &err_addr;
 
 	diag_printf("Formatting 0x%08x bytes\n", (int)ds.dev_size);
 	err = cyg_io_get_config(handle, CYG_IO_GET_CONFIG_FLASH_ERASE, &e, &len);
 	if (err != ENOERR)
 	{
-		diag_printf("Flash erase error %d offset 0x%p\n", err, err_addr);
+		diag_printf("Flash erase error %d offset 0x%08x\n", err, e.err_address);
 		reboot();
 	}
 
@@ -633,9 +630,9 @@ static void zylinjtag_uart(cyg_addrword_t data)
 #ifdef CYGPKG_PROFILE_GPROF
 		start_profile();
 #endif
-		int actual = 0;
-		int actual2 = 0;
-		int pos, pos2;
+		size_t actual = 0;
+		size_t actual2 = 0;
+		size_t pos, pos2;
 		pos = 0;
 		pos2 = 0;
 		cur = 0;
@@ -668,9 +665,11 @@ static void zylinjtag_uart(cyg_addrword_t data)
 			if (actual2 <= 0)
 			{
 				memset(backwardBuffer, 's', sizeof(backwardBuffer));
-				actual2 = read(serHandle, backwardBuffer,
+				int t;
+				t = read(serHandle, backwardBuffer,
 						sizeof(backwardBuffer));
-				if (actual2 < 0)
+				actual2 = t;
+				if (t < 0)
 				{
 					if (errno != EAGAIN)
 					{
@@ -681,8 +680,8 @@ static void zylinjtag_uart(cyg_addrword_t data)
 				pos2 = 0;
 			}
 
-			int x = actual2;
-			int y = 0;
+			size_t x = actual2;
+			size_t y = 0;
 			if (actual2 > 0)
 			{
 				int written = write(session, backwardBuffer + pos2, actual2);
@@ -976,13 +975,13 @@ int main(int argc, char *argv[])
 	}
 
 	mkdir(zylin_config_dir, 0777);
-	char *dirname=alloc_printf("%s/target", zylin_config_dir);
+	char *dirname = alloc_printf("%s/target", zylin_config_dir);
 	mkdir(dirname, 0777);
 	free(dirname);
-	dirname=alloc_printf("%s/board", zylin_config_dir);
+	dirname = alloc_printf("%s/board", zylin_config_dir);
 	mkdir(dirname, 0777);
 	free(dirname);
-	dirname=alloc_printf("%s/event", zylin_config_dir);
+	dirname = alloc_printf("%s/event", zylin_config_dir);
 	mkdir(dirname, 0777);
 	free(dirname);
 
@@ -1037,7 +1036,7 @@ int main(int argc, char *argv[])
 	if (logAllToSerial)
 	{
 		diag_printf(
-				 "%s/logserial=1 => sending log output to serial port using \"debug_level 3\" as default.\n", zylin_config_dir);
+				 "%s/logserial = 1 => sending log output to serial port using \"debug_level 3\" as default.\n", zylin_config_dir);
 		command_run_line(cmd_ctx, "debug_level 3");
 	}
 
@@ -1131,7 +1130,7 @@ static int tftpfs_fo_lseek(struct CYG_FILE_TAG *fp, off_t *apos, int whence);
 // For simplicity we use _FILESYSTEM synchronization for all accesses since
 // we should never block in any filesystem operations.
 #if 1
-FSTAB_ENTRY( tftpfs_fste, "tftpfs", 0,
+FSTAB_ENTRY(tftpfs_fste, "tftpfs", 0,
 		CYG_SYNCMODE_NONE,
 		tftpfs_mount,
 		tftpfs_umount,
@@ -1152,7 +1151,7 @@ FSTAB_ENTRY( tftpfs_fste, "tftpfs", 0,
 // mtab entry.
 // This defines a single ROMFS loaded into ROM at the configured address
 //
-// MTAB_ENTRY(	rom_mte,	// structure name
+// MTAB_ENTRY(rom_mte,	// structure name
 // 		"/rom",		// mount point
 // 		"romfs",	// FIlesystem type
 // 		"",		// hardware device
@@ -1460,8 +1459,8 @@ static int logfs_fo_close(struct CYG_FILE_TAG *fp);
 // This defines the entry in the filesystem table.
 // For simplicity we use _FILESYSTEM synchronization for all accesses since
 // we should never block in any filesystem operations.
-FSTAB_ENTRY( logfs_fste, "logfs", 0,
-		CYG_SYNCMODE_FILE_FILESYSTEM|CYG_SYNCMODE_IO_FILESYSTEM,
+FSTAB_ENTRY(logfs_fste, "logfs", 0,
+		CYG_SYNCMODE_FILE_FILESYSTEM | CYG_SYNCMODE_IO_FILESYSTEM,
 		logfs_mount,
 		logfs_umount,
 		logfs_open,