Add ability to hard reset user device

Fix initial size of serial and terminal windows

2 files changed, 10 insertions, 1 deletions

diff --git a/fpga/gpmc/xilinx/common/main.v b/fpga/gpmc/xilinx/common/main.v
index cd811fa..bf6e023 100644
--- a/fpga/gpmc/xilinx/common/main.v
+++ b/fpga/gpmc/xilinx/common/main.v
@@ -58,10 +58,15 @@ module main(
 	output reg sixteen_bit_io_mode,
 
 	input [3:0] sseg_mux,
-	input [7:0] sseg_data);
+	input [7:0] sseg_data,
+
+	output userdevice_reset);
 
 	parameter RAM_ADDR_BITS = 15;
 
+	reg userdevice_reset_reg;
+	assign userdevice_reset = ~userdevice_reset_reg;
+
 	assign host_serial_txd = userlogic_serial_rxd;
 	assign userlogic_serial_txd = host_serial_rxd;
 
@@ -394,6 +399,7 @@ module main(
 			// 0x0b: Number of address bits of DSP RAM (read only)
 			// 0x0c: User device control
 			//       Bit 0: User logic reset
+			//       Bit 1: User device reset
 			// 0x20 - 0x3f: LCD data area
 			// 0x4000 - 0x7fff: Logic analyzer data area (read only)
 			if (gpmc_wen_reg == 1'b0) begin
@@ -420,6 +426,7 @@ module main(
 						end
 						12: begin
 							userlogic_reset = gpmc_data_reg[0];
+							userdevice_reset_reg = gpmc_data_reg[1];
 						end
 						default: begin
 							// Do nothing
@@ -503,6 +510,7 @@ module main(
 						end
 						12: begin
 							gpmc_data_out[0] = userlogic_reset;
+							gpmc_data_out[1] = userdevice_reset_reg;
 							gpmc_data_out[7:1] = 0;
 						end
 						default: begin
diff --git a/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf b/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf
index 1cece62..8d5384f 100644
--- a/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf
+++ b/fpga/gpmc/xilinx/numato/spartan6/xc6slx9/main.ucf
@@ -42,6 +42,7 @@ NET "userproc_start"  LOC = "K16" | SLEW = FAST | IOSTANDARD = "LVCMOS33";
 NET "userproc_done"  LOC = "L13" | IOSTANDARD = "LVCMOS33";
 NET "userlogic_reset" LOC = "E13" | SLEW = FAST | IOSTANDARD = "LVCMOS33";
 NET "userlogic_clock" LOC = "F13" | IOSTANDARD = "LVCMOS33";
+NET "userdevice_reset" LOC = "D17" | SLEW = FAST | DRIVE = 24 | IOSTANDARD = "LVCMOS33";
 
 NET "userlogic_serial_txd" LOC = "C14" | SLEW = FAST | IOSTANDARD = "LVCMOS33";
 NET "userlogic_serial_rxd" LOC = "D14" | IOSTANDARD = "LVCMOS33";