From: megacz <adam@megacz.com>
Date: Mon, 6 Apr 2009 18:46:38 +0000 (-0700)
Subject: DDR2: remember to check if out_empty before attempting an operation
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4990447485393a2e57505ba9ca60fed8fa14e68e;p=fleet.git

DDR2: remember to check if out_empty before attempting an operation
---

diff --git a/ships/DDR2.ship b/ships/DDR2.ship
index afebc99..4689e4e 100644
--- a/ships/DDR2.ship
+++ b/ships/DDR2.ship
@@ -206,7 +206,7 @@ always @(posedge clk) begin
       end
     end else if (app_wdf_afull || app_af_afull) begin
       /* wait */
-    end else if (`inAddrWrite_full && `inDataWrite_full) begin
+    end else if (`inAddrWrite_full && `inDataWrite_full && `out_empty) begin
       `drain_inDataWrite
       `drain_inAddrWrite
       app_wdf_data   <= inDataWrite_d;
@@ -218,7 +218,7 @@ always @(posedge clk) begin
       out_d          <= { 1'b1, 37'b0 };
       mask           <= 8'b00000000;
       `fill_out
-    end else if (`inAddrRead_full) begin
+    end else if (`inAddrRead_full && `out_empty) begin
       `drain_inAddrRead
       app_af_addr    <= { inAddrRead_d, 2'b00 };
       app_af_cmd     <= 3'b001;