FPGA-Fleet updates

[fleet.git] / src / edu / berkeley / fleet / slipway / inbox.v

diff --git a/src/edu/berkeley/fleet/slipway/inbox.v b/src/edu/berkeley/fleet/slipway/inbox.v
index a5bf7fe..5e041a5 100644 (file)
--- a/src/edu/berkeley/fleet/slipway/inbox.v
+++ b/src/edu/berkeley/fleet/slipway/inbox.v
@@ -14,9 +14,9 @@ module inbox(clk,
   input  [(`PACKET_WIDTH-1):0] fabric_in_d;
   `output(fabric_out_r,  fabric_out_r_, fabric_out_a,   [(`PACKET_WIDTH-1):0],       fabric_out_d_)
   `defreg(fabric_out_d_,                                [(`PACKET_WIDTH-1):0],       fabric_out_d)
-  `output(ship_r,         ship_r_,        ship_a,        [(`DATAWIDTH-1):0],          ship_d_)
+  `output(ship_r,         ship_r_,        ship_a,       [(`PACKET_WIDTH-1):0],       ship_d_)
   reg [(`PACKET_WIDTH-1):0] ship_d;
-  assign ship_d_ = `packet_data(ship_d);
+  assign ship_d_ = { `packet_dest(ship_d), `packet_data(ship_d) };
 
   `input(instr_r,        instr_a,       instr_a_,       [(`INSTRUCTION_WIDTH-1):0],  instr_d)
 
@@ -45,5 +45,6 @@ module inbox(clk,
   fifo4 dfifo(clk, fabric_in_r,  fabric_in_a_,  fabric_in_d,
                    fabric_in_r0, fabric_in_a0_, fabric_in_d0);
 
+  `define extra `packet_dest(`data_out_d) = `packet_dest(fabric_in_d0);
   `include "box.inc"
 endmodule