X-Git-Url: http://git.joshuawise.com/vterm.git/blobdiff_plain/01e9841e996c92ff90fc9ab21ee3da3e45fd67f7..HEAD:/VTerm.v

diff --git a/VTerm.v b/VTerm.v
index 2cd9f39..e9df92b 100644
--- a/VTerm.v
+++ b/VTerm.v
@@ -66,12 +66,19 @@ module VTerm(
 	
 	wire odata;
 	
+	wire [7:0] sertxdata;
+	wire sertxwr;
+	
+	wire [6:0] vcursx;
+	wire [4:0] vcursy;
+	
 	CharSet cs(cschar, csrow, csdata);
 	VideoRAM vram(clk25, vraddr + vscroll, vrdata, vwaddr, vwdata, vwr);
-	VDisplay dpy(clk25, x, y, vraddr, vrdata, cschar, csrow, csdata, odata);
+	VDisplay dpy(clk25, x, y, vraddr, vrdata, cschar, csrow, csdata, vcursx, vcursy, odata);
 	SerRX rx(clk25, serwr, serdata, serrx);
-	SerTX tx(clk25, 0, 0, sertx);
-	RXState rxsm(clk25, vwr, vwaddr, vwdata, vscroll, serwr, serdata);
+	SerTX tx(clk25, sertxwr, sertxdata, sertx);
+	RXState rxsm(clk25, vwr, vwaddr, vwdata, vscroll, vcursx, vcursy, serwr, serdata);
+	PS2 ps2(clk25, ps2c, ps2d, sertxwr, sertxdata);
 	
 	always @(posedge clk25) begin
 		red <= border ? 0 : {3{odata}};
@@ -153,6 +160,8 @@ module VDisplay(
 	output wire [7:0] cschar,
 	output wire [2:0] csrow,
 	input [7:0] csdata,
+	input [6:0] cursx,
+	input [4:0] cursy,
 	output reg data);
 
 	wire [7:0] col = x[11:3];
@@ -164,11 +173,17 @@ module VDisplay(
 	assign cschar = rchar;
 	assign csrow = y[2:0];
 	
+	reg [23:0] blinktime = 0;
+	
+	always @(posedge pixclk) blinktime <= blinktime + 1;
+	
+	wire curssel = (cursx == col) && (cursy == row) && blinktime[23];
+	
 	always @(posedge pixclk)
 		xdly <= x;
 	
 	always @(posedge pixclk)
-		data = ((xdly < 80 * 8) && (y < 25 * 8)) ? csdata[7 - xdly[2:0]] : 0;
+		data = ((xdly < 80 * 8) && (y < 25 * 8)) ? (csdata[7 - xdly[2:0]] ^ curssel) : 0;
 endmodule
 
 `define IN_CLK 25000000
@@ -274,6 +289,8 @@ module RXState(
 	output reg [10:0] vwaddr = 0,
 	output reg [7:0] vwdata = 0,
 	output reg [10:0] vscroll = 0,
+	output wire [6:0] vcursx,
+	output wire [4:0] vcursy,
 	input serwr,
 	input [7:0] serdata);
 
@@ -286,6 +303,9 @@ module RXState(
 	reg [6:0] x = 0;
 	reg [4:0] y = 0;
 	
+	assign vcursx = x;
+	assign vcursy = y;
+	
 	reg [10:0] clearstart = 0;
 	reg [10:0] clearend = 11'b11111111111;
 	
@@ -294,6 +314,7 @@ module RXState(
 		STATE_IDLE:	if (serwr) begin
 					if (serdata == 8'h0A) begin
 						state <= STATE_NEWLINE;
+						x <= 0;
 						vwr <= 0;
 					end else if (serdata == 8'h0D) begin
 						x <= 0;
@@ -305,6 +326,10 @@ module RXState(
 						y <= 0;
 						vscroll <= 0;
 						state <= STATE_CLEAR;
+					end else if (serdata == 8'h08) begin
+						if (x != 0)
+							x <= x - 1;
+						vwr <= 0;
 					end else begin
 						vwr <= 1;
 						vwaddr <= ({y,4'b0} + {y,6'b0} + {4'h0,x}) + vscroll;
@@ -340,3 +365,108 @@ module RXState(
 			end
 		endcase
 endmodule
+
+module PS2(
+	input pixclk,
+	input inclk,
+	input indata,
+	output reg wr,
+	output reg [7:0] data
+	);
+
+	reg [3:0] bitcount = 0;
+	reg [7:0] key = 0;
+	reg keyarrow = 0, keyup = 0, parity = 0;
+
+	
+	/* Clock debouncing */
+	reg lastinclk = 0;
+	reg [6:0] debounce = 0;
+	reg fixedclk = 0;
+	reg [11:0] resetcountdown = 0;
+	
+	reg [6:0] unshiftedrom [127:0];	initial $readmemh("scancodes.unshifted.hex", unshiftedrom);
+	reg [6:0] shiftedrom [127:0];	initial $readmemh("scancodes.shifted.hex", shiftedrom);
+	
+	reg mod_lshift = 0;
+	reg mod_rshift = 0;
+	reg mod_capslock = 0;
+	wire mod_shifted = (mod_lshift | mod_rshift) ^ mod_capslock;
+	
+	reg nd = 0;
+	reg lastnd = 0;
+	
+	always @(posedge pixclk) begin
+		if (inclk != lastinclk) begin
+			lastinclk <= inclk;
+			debounce <= 1;
+			resetcountdown <= 12'b111111111111;
+		end else if (debounce == 0) begin
+			fixedclk <= inclk;
+			resetcountdown <= resetcountdown - 1;
+		end else
+			debounce <= debounce + 1;
+		
+		if (nd ^ lastnd) begin
+			lastnd <= nd;
+			wr <= 1;
+		end else
+			wr <= 0;
+	end
+
+	always @(negedge fixedclk) begin
+		if (resetcountdown == 0)
+			bitcount <= 0;
+		else if (bitcount == 10) begin
+			bitcount <= 0;
+			if(parity != (^ key)) begin
+				if(keyarrow) begin
+					casex(key)
+						8'hF0: keyup <= 1;
+						8'hxx: keyarrow <= 0;
+					endcase
+				end
+				else begin
+					if(keyup) begin
+						keyup <= 0;
+						keyarrow <= 0;
+						casex (key)
+						8'h12: mod_lshift <= 0;
+						8'h59: mod_rshift <= 0;
+						endcase
+						// handle this? I don't fucking know
+					end
+					else begin
+						casex(key)
+							8'hE0: keyarrow <= 1;	// handle these? I don't fucking know
+							8'hF0: keyup <= 1;
+							8'h12: mod_lshift <= 1;
+							8'h59: mod_rshift <= 1;
+							8'h14: mod_capslock <= ~mod_capslock;
+							8'b0xxxxxxx: begin nd <= ~nd; data <= mod_shifted ? shiftedrom[key] : unshiftedrom[key]; end
+							8'b1xxxxxxx: begin /* AAAAAAASSSSSSSS */ end
+						endcase
+					end
+				end
+			end
+			else begin
+				keyarrow <= 0;
+				keyup <= 0;
+			end
+		end else
+			bitcount <= bitcount + 1;
+
+		case(bitcount)
+			1: key[0] <= indata;
+			2: key[1] <= indata;
+			3: key[2] <= indata;
+			4: key[3] <= indata;
+			5: key[4] <= indata;
+			6: key[5] <= indata;
+			7: key[6] <= indata;
+			8: key[7] <= indata;
+			9: parity <= indata;
+		endcase
+	end
+
+endmodule