adjust ships to use fill/drain/full/empty macros

[fleet.git] / ships / Video.ship

diff --git a/ships/Video.ship b/ships/Video.ship
index ec54993..34e0a26 100644 (file)
--- a/ships/Video.ship
+++ b/ships/Video.ship
@@ -93,16 +93,14 @@ data  in:    inData
       `reset
     end else begin
       `flush
+      `cleanup
       vga_pixel_a <= vga_pixel_r;
 
-      if (!inData_r_ && inData_a) inData_a <= 0;
-      if (!inX_r_    && inX_a)    inX_a <= 0;
-      if (!inY_r_    && inY_a)    inY_a <= 0;
-      if (inX_r && !inX_a && inY_r && !inY_a && inData_r && !inData_a) begin
+      if (`inX_full && `inY_full && `inData_full) begin
          we <= 1;
-         inX_a <= 1;
-         inY_a <= 1;
-         inData_a <= 1;
+         `drain_inX
+         `drain_inY
+         `drain_inData
       end else begin
          we <= 0;
       end