lots of changes to Marina test code, mostly for scan chain counters

[fleet.git] / ships / DDR2.ship

diff --git a/ships/DDR2.ship b/ships/DDR2.ship
index ab67070..4689e4e 100644 (file)
--- 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;
@@ -215,10 +215,10 @@ always @(posedge clk) begin
       app_af_wren    <= 1;
       app_wdf_wren   <= 1;
       burst_count    <= 7;
-      out_d          <= { phy_init_done /*1'b1*/, 37'b0 };
+      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;