bitq: fix warning now that out_value is const

[openocd] / src / ecosboard.c

diff --git a/src/ecosboard.c b/src/ecosboard.c
index 2a9950d6c9f9d4ec504f007b27009f7b311e2ccf..f7523545a10e2676308b638b2f05043ba6669a75 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -32,6 +32,7 @@
 #include <openocd.h>
 
 #include <helper/time_support.h>
+
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53,33 +54,15 @@
 #include <cyg/athttpd/cgi.h>
 #include <cyg/athttpd/forms.h>
 #include <cyg/discover/discover.h>
-#include <cyg/hal/hal_diag.h>
-#include <cyg/kernel/kapi.h>
-#include <cyg/io/serialio.h>
 #include <cyg/io/io.h>
+#include <cyg/io/serialio.h>
 #include <netinet/tcp.h>
-#include "rom.h"
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <ifaddrs.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <stdio.h>
+#include <cyg/hal/hal_diag.h>
 
-#include <openocd.h>
+#include "rom.h"
 
 #ifdef CYGPKG_HAL_NIOS2
+#include <cyg/hal/io.h>
 #define ZY1000_SER_DEV "/dev/uart_0"
 #else
 #define ZY1000_SER_DEV "/dev/ser0"
@@ -163,7 +146,14 @@ static void zylinjtag_reboot(cyg_addrword_t data)
        diag_printf("Unmounting /config..\n");
        umount("/config");
        diag_printf("Rebooting..\n");
+#ifdef CYGPKG_HAL_NIOS2
+       /* This will reboot & reconfigure the FPGA from the bootloader
+        * and on.
+        */
+       IOWR(REMOTE_UPDATE_BASE, 0x20, 0x1);
+#else
        HAL_PLATFORM_RESET();
+#endif
 }
 static cyg_thread zylinjtag_thread_object;
 static cyg_handle_t zylinjtag_thread_handle;
@@ -857,7 +847,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
        static int current_baud = 38400;
        if (argc == 1)
        {
-               command_print(cmd_ctx, "%d", current_baud);
+               Jim_SetResult(interp, Jim_NewIntObj(interp, current_baud));
                return JIM_OK;
        }
        else if (argc != 2)
@@ -893,8 +883,8 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
                baud = CYGNUM_SERIAL_BAUD_230400;
                break;
        default:
-               command_print(cmd_ctx, "unsupported baudrate");
-               return ERROR_INVALID_ARGUMENTS;
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "unsupported baudrate", -1));
+               return JIM_ERR;
        }
 
        cyg_serial_info_t buf;
@@ -907,7 +897,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
        err = cyg_io_lookup(ZY1000_SER_DEV, &serial_handle);
        if (err != ENOERR)
        {
-               LOG_ERROR("Could not open serial port\n");
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "Could not open serial port", -1));
                return JIM_ERR;
        }
 
@@ -917,7 +907,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
                        &len);
        if (err != ENOERR)
        {
-               LOG_ERROR("Failed to get serial port settings %d", err);
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to get serial port settings", -1));
                return JIM_ERR;
        }
        buf.baud = baud;
@@ -926,7 +916,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
                        &len);
        if (err != ENOERR)
        {
-               LOG_ERROR("Failed to set serial port settings %d", err);
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to set serial port settings", -1));
                return JIM_ERR;
        }
 
@@ -966,7 +956,11 @@ int main(int argc, char *argv[])
 
        diag_init_putc(_zylinjtag_diag_write_char);
        // We want this in the log.
-       diag_printf("Zylin ZY1000.\n");
+#ifdef CYGPKG_HAL_NIOS2
+       diag_printf("Zylin ZY1000 PCB revc.\n");
+#else
+       diag_printf("Zylin ZY1000 PCB revb.\n");
+#endif
 
        err = mount("", "/ram", "ramfs");
        if (err < 0)
@@ -1005,6 +999,20 @@ int main(int argc, char *argv[])
 
        copydir("/rom", "/ram/cgi");
 
+#ifdef CYGPKG_HAL_NIOS2
+       cyg_flashaddr_t err_address;
+#define UNCACHED_EXT_FLASH_BASE (0x80000000 + EXT_FLASH_BASE)
+       /* The revc flash is locked upon reset, unlock it */
+#ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING
+       if ((err = flash_unlock((void *) UNCACHED_EXT_FLASH_BASE, EXT_FLASH_SPAN,
+                       (void **) &err_address)) != 0)
+       {
+               diag_printf("Error: could not unlock flash\n");
+       }
+#endif
+#endif
+
+
        err = mount("/dev/flash1", "/config", "jffs2");
        if (err < 0)
        {
@@ -1093,7 +1101,7 @@ int main(int argc, char *argv[])
                        NULL, NULL);
 #endif
 
-       Jim_CreateCommand(httpstate.jim_interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
+       Jim_CreateCommand(httpstate.jim_interp, "zy1000_uart", zylinjtag_Jim_Command_uart, NULL, NULL);
 
 
        log_init();