Flop the clock polarity of the LCDC around.

[fpgaboy.git] / LCDC.v

diff --git a/LCDC.v b/LCDC.v
index 86154433f0322641cfea4e00bbb5cc51e5b3f369..f951d3a15ba7ea5af16709d6d7dd8b3446397009 100644 (file)
--- a/LCDC.v
+++ b/LCDC.v
@@ -78,7 +78,7 @@ module LCDC(
        
        assign lcdvs = (posy == 153) && (posx == 2) && rLCDC[7];
        assign lcdhs = (posx == 2) && rLCDC[7];
-       assign lcdclk = clk4 && rLCDC[7];
+       assign lcdclk = clk4;
        
        wire [2:0] lcdr_ = display ? {pixdata[1] ? 3'b111 : 3'b000} : 3'b000;
        wire [2:0] lcdg_ = display ? {pixdata[0] ? 3'b111 : 3'b000} : 3'b000;
@@ -88,7 +88,7 @@ module LCDC(
        assign lcdcirq = (rSTAT[3] & mode00irq) | (rSTAT[4] & mode01irq) | (rSTAT[5] & mode10irq) | (rSTAT[6] & lycirq);
        assign vblankirq = (posx == 0 && posy == 153);
        
-       always @(posedge clk4)
+       always @(negedge clk4)
        begin
                if (posx == 455) begin
                        posx <= 0;
@@ -145,7 +145,8 @@ module LCDC(
        reg [7:0] tileno;
        wire [10:0] tileaddr = {tileno, vypos[2:0]};
        reg [7:0] tilehigh, tilelow;
-       assign pixdata = {tilehigh[7-vxpos[2:0]], tilelow[7-vxpos[2:0]]};
+       wire [1:0] prepal = {tilehigh[7-vxpos[2:0]], tilelow[7-vxpos[2:0]]};
+       assign pixdata = {rBGP[{prepal,1'b1}],rBGP[{prepal,1'b0}]};
        
        wire decode_tiledata = (addr >= 16'h8000) && (addr <= 16'h97FF);
        wire decode_bgmap1 = (addr >= 16'h9800) && (addr <= 16'h9BFF);
@@ -153,14 +154,14 @@ module LCDC(
        wire [9:0] bgmapaddr_in = vraminuse ? bgmapaddr : addr[9:0];
        wire [11:0] tileaddr_in = vraminuse ? tileaddr : addr[12:1];
        
-       always @(negedge clk)
+       always @(posedge clk)
                if ((vraminuse && ((posx == 2) || (vxpos[2:0] == 3'b111))) || decode_bgmap1) begin
                        tileno <= bgmap1[bgmapaddr_in];
                        if (wr && decode_bgmap1 && ~vraminuse)
                                bgmap1[bgmapaddr_in] <= data;
                end
        
-       always @(negedge clk)
+       always @(posedge clk)
                if ((vraminuse && ((posx == 3) || (vxpos[2:0] == 3'b000))) || decode_tiledata) begin
                        tilehigh <= tiledatahigh[tileaddr_in];
                        tilelow <= tiledatalow[tileaddr_in];
@@ -189,7 +190,7 @@ module LCDC(
                         8'bzzzzzzzz) :
                8'bzzzzzzzz;
   
-       always @(negedge clk)
+       always @(posedge clk)
        begin
                if (wr)
                        case (addr)