X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/616eebe0bdb3166e9cfda312d6425910b2addf8f..5bac4cf0a60acac6826eb3215e1526d48ba8f7ac:/System.v

diff --git a/System.v b/System.v
index 996ec10..0afc090 100644
--- a/System.v
+++ b/System.v
@@ -26,14 +26,13 @@ module InternalRAM(
 	
 	wire decode = address[15:13] == 3'b110;
 	reg [7:0] odata;
-	wire idata = data;
 	assign data = (rd && decode) ? odata : 8'bzzzzzzzz;
 	
 	always @(negedge clk)
 	begin
-		if (decode)
-		begin
-			if (wr)
+		if (decode)	// This has to go this way. The only way XST knows how to do
+		begin				// block ram is chip select, write enable, and always
+			if (wr)		// reading. "else if rd" does not cut it ...
 				ram[address[12:0]] <= data;
 			odata <= ram[address[12:0]];
 		end
@@ -46,7 +45,7 @@ module Switches(
 	input clk,
 	input wr, rd,
 	input [7:0] switches,
-	output reg [7:0] ledout);
+	output reg [7:0] ledout = 0);
 	
 	wire decode = address == 16'hFF51;
 	reg [7:0] odata;
@@ -70,21 +69,24 @@ module CoreTop(
 	output wire [3:0] digits,
 	output wire [7:0] seven);
 	
-	wire clk;
-	//IBUFG ibuf (.O(clk), .I(iclk));
-	
+	wire clk;	
 	CPUDCM dcm (.CLKIN_IN(xtal), .CLKFX_OUT(clk));
 
 	wire [15:0] addr;	
 	wire [7:0] data;
 	wire wr, rd;
+	
+	wire irq, tmrirq;
+	wire [7:0] jaddr;
 
 	GBZ80Core core(
 		.clk(clk),
 		.busaddress(addr),
 		.busdata(data),
 		.buswr(wr),
-		.busrd(rd));
+		.busrd(rd),
+		.irq(irq),
+		.jaddr(jaddr));
 	
 	ROM rom(
 		.address(addr),
@@ -94,12 +96,11 @@ module CoreTop(
 		.rd(rd));
 	
 	AddrMon amon(
-    .addr(addr), 
-    .clk(clk), 
-    .digit(digits), 
-    .out(seven),
-	 .freeze(buttons[0])
-    );
+		.addr(addr), 
+		.clk(clk), 
+		.digit(digits), 
+		.out(seven),
+		.freeze(buttons[0]));
 	 
 	Switches sw(
 		.address(addr),
@@ -111,31 +112,58 @@ module CoreTop(
 		.switches(switches)
 		);
 
-	UART nouart (
-    .clk(clk), 
-    .wr(wr), 
-    .rd(rd), 
-    .addr(addr), 
-    .data(data), 
-    .serial(serio)
-    );
+	UART nouart (	/* no u */
+		.clk(clk), 
+		.wr(wr), 
+		.rd(rd), 
+		.addr(addr), 
+		.data(data), 
+		.serial(serio)
+		);
 
-  InternalRAM ram(
+	InternalRAM ram(
 		.address(addr),
 		.data(data),
 		.clk(clk),
 		.wr(wr),
-		.rd(rd));
+		.rd(rd)
+		);
+
+	Timer tmr(
+		.clk(clk),
+		.wr(wr),
+		.rd(rd),
+		.addr(addr),
+		.data(data),
+		.irq(tmrirq)
+		);
+	
+	Interrupt intr(
+		.clk(clk),
+		.rd(rd),
+		.wr(wr),
+		.addr(addr),
+		.data(data),
+		.vblank(0),
+		.lcdc(0),
+		.tovf(tmrirq),
+		.serial(0),
+		.buttons(0),
+		.master(irq),
+		.jaddr(jaddr));
 endmodule
 
 module TestBench();
-	reg clk = 0;
+	reg clk = 1;
 	wire [15:0] addr;
 	wire [7:0] data;
 	wire wr, rd;
 	
-//	wire [7:0] leds;
-//	wire [7:0] switches;
+	wire irq, tmrirq;
+	wire [7:0] jaddr;
+	
+	wire [7:0] leds;
+	wire [7:0] switches;
 	
 	always #10 clk <= ~clk;
 	GBZ80Core core(
@@ -143,7 +171,9 @@ module TestBench();
 		.busaddress(addr),
 		.busdata(data),
 		.buswr(wr),
-		.busrd(rd));
+		.busrd(rd),
+		.irq(irq),
+		.jaddr(jaddr));
 	
 	ROM rom(
 		.clk(clk),
@@ -168,12 +198,34 @@ module TestBench();
 		.rd(rd),
 		.serial(serio));
 	
-//	Switches sw(
-//		.clk(clk),
-//		.address(addr),
-//		.data(data),
-//		.wr(wr),
-//		.rd(rd),
-//		.switches(switches),
-//		.leds(leds));
+	Timer tmr(
+		.clk(clk),
+		.wr(wr),
+		.rd(rd),
+		.addr(addr),
+		.data(data),
+		.irq(tmrirq));
+	
+	Interrupt intr(
+		.clk(clk),
+		.rd(rd),
+		.wr(wr),
+		.addr(addr),
+		.data(data),
+		.vblank(0),
+		.lcdc(0),
+		.tovf(tmrirq),
+		.serial(0),
+		.buttons(0),
+		.master(irq),
+		.jaddr(jaddr));
+	
+	Switches sw(
+		.clk(clk),
+		.address(addr),
+		.data(data),
+		.wr(wr),
+		.rd(rd),
+		.switches(switches),
+		.ledout(leds));
 endmodule