- Fixes '=' whitespace

[fw/openocd] / src / ecosboard.c

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 0b1bf36ee6d5dea99b7392df2255e5562046aecd..df92ce8c1400401aae9c853d501c4b3b5e107c1e 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -148,7 +148,6 @@ void start_profile(void)
 }
 #endif
 
-extern int eth0_up;
 static FILE *log;
 
 static char reboot_stack[2048];
@@ -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");
        }