X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/a6b499da5fd2a834963cc05178e6b8044dc9129f..77ab69d7bb0902e6ebf0994159ed2205f8413e34:/System.v

diff --git a/System.v b/System.v
index 931e900..68de591 100644
--- a/System.v
+++ b/System.v
@@ -232,6 +232,7 @@ module CoreTop(
 	output wire cr_nADV, cr_nCE, cr_nOE, cr_nWE, cr_CRE, cr_nLB, cr_nUB, cr_CLK,
 	output wire [22:0] cr_A,
 	inout [15:0] cr_DQ,
+	input ps2c, ps2d,
 `endif
 	output wire hs, vs,
 	output wire [2:0] r, g,
@@ -256,6 +257,7 @@ module CoreTop(
 	IBUFG iclkbuf(.O(xtalb), .I(xtal));
 	CPUDCM dcm (.CLKIN_IN(xtalb), .CLKFX_OUT(clk));
 	pixDCM pixdcm (.CLKIN_IN(xtalb), .CLKFX_OUT(vgaclk));
+	wire [7:0] ps2buttons;
 `endif
 
 	wire [15:0] addr [1:0];
@@ -348,16 +350,31 @@ module CoreTop(
 		.vgag(g),
 		.vgab(b));
 
+	wire [7:0] sleds;
+`ifdef isim
+	assign leds = sleds;
+`else
+	assign leds = sleds | ps2buttons;
+`endif
 	Switches sw(
 		.clk(clk),
 		.address(addr[0]),
 		.data(data[0]),
 		.wr(wr[0]),
 		.rd(rd[0]),
-		.ledout(leds),
+		.ledout(sleds),
 		.switches(switches)
 		);
 	
+`ifdef isim
+`else
+	PS2Button ps2(
+		.inclk(ps2c),
+		.indata(ps2d),
+		.buttons(ps2buttons)
+		);
+`endif
+	
 	Buttons ass(
 		.core_clk(clk),
 		.addr(addr[0]),
@@ -365,7 +382,11 @@ module CoreTop(
 		.wr(wr[0]),
 		.rd(rd[0]),
 		.int(btnirq),
+	`ifdef isim
 		.buttons(switches)
+	`else
+		.buttons(ps2buttons)
+	`endif
 		);
 
 	AddrMon amon(