From: Joshua Wise <joshua@nyus.joshuawise.com>
Date: Mon, 28 Apr 2008 09:47:33 +0000 (-0400)
Subject: Compiles
X-Git-Url: http://git.joshuawise.com/fpgaboy.git/commitdiff_plain/09c1936c32d74947896338a1c57270b2918656f8?ds=inline;hp=6ba4cfea4b24fdd898e90ebd55e95ad43d5d21d4

Compiles
---

diff --git a/CoreTop.ucf b/CoreTop.ucf
index 2f73107..7943b6d 100644
--- a/CoreTop.ucf
+++ b/CoreTop.ucf
@@ -47,4 +47,7 @@ NET "g<2>" LOC = "p6";
 NET "g<1>" LOC = "p8";
 NET "g<0>" LOC = "n8";
 NET "b<1>" LOC = "u4";
-NET "b<0>" LOC = "u5";
\ No newline at end of file
+NET "b<0>" LOC = "u5";
+
+NET "soundl" LOC = "l15" | SLEW = "fast";
+NET "soundr" LOC = "k12" | SLEW = "fast";
\ No newline at end of file
diff --git a/Soundcore.v b/Soundcore.v
index 172ed4f..16d6067 100644
--- a/Soundcore.v
+++ b/Soundcore.v
@@ -44,7 +44,7 @@ module Soundcore(
 		snd_data_r <= (pwmcnt <= right_snd) ? 1 : 0;
 	end
 
-	Sound1(
+	Sound1 s1(
 		.core_clk(core_clk),
 		.wr(wr),
 		.rd(rd),
@@ -56,7 +56,7 @@ module Soundcore(
 		.snd_data(sndout1)
 	);
 	
-	Sound2(
+	Sound2 s2(
 		.core_clk(core_clk),
 		.wr(wr),
 		.rd(rd),
diff --git a/System.v b/System.v
index caa6ae3..dc70cc0 100644
--- a/System.v
+++ b/System.v
@@ -93,7 +93,8 @@ module CoreTop(
 	output wire [7:0] seven,
 	output wire hs, vs,
 	output wire [2:0] r, g,
-	output wire [1:0] b);
+	output wire [1:0] b,
+	output wire soundl, soundr);
 	
 	wire xtalb, clk, vgaclk;
 	IBUFG iclkbuf(.O(xtalb), .I(xtal));
@@ -227,6 +228,15 @@ module CoreTop(
 		.buttons(0),
 		.master(irq),
 		.jaddr(jaddr));
+	
+	Soundcore sound(
+		.core_clk(clk),
+		.rd(rd),
+		.wr(wr),
+		.addr(addr),
+		.data(data),
+		.snd_data_l(soundl),
+		.snd_data_r(soundr));
 endmodule
 
 module TestBench();
diff --git a/bootrom.asm b/bootrom.asm
index 3cdf0e9..cd76097 100644
--- a/bootrom.asm
+++ b/bootrom.asm
@@ -185,4 +185,8 @@ boot:	jr .running	; $0100
 .running:
 	ld a, $FF
 	ld [$FF51], A
-.diq:	jr .diq
+.diq:	ld A, [$FF51]
+	cp 0
+	jr z, .diq
+	jp $0000
+