Updating mio to new packet format

aolofsson · May 15, 2016 · e607155 · e607155
1 parent 363a5cf
commit e607155
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/mio/hdl/mio.v b/src/mio/hdl/mio.v
@@ -15,8 +15,7 @@ module mio (/*AUTOARG*/
    parameter  NMIO    = 8;        // IO width
    parameter  AW      = 32;       // address width
    parameter  MPW     = 128;      // mio packet width (>PW)  
-
-   localparam PW      = 2*AW+40;  // emesh packet width
+   parameter  PW      = 2*AW+40;  // emesh packet width
    parameter  DEF_CFG = 0;        // Default config   
    parameter  DEF_CLK = 0;        // Default clock
    parameter  TARGET  = "GENERIC";// GENERIC,XILINX,ALTERA,GENERIC,ASIC
@@ -102,6 +101,7 @@ module mio (/*AUTOARG*/
     */
 
    mio_regs  #(.AW(AW),
+	       .PW(PW),
 	       .DEF_CFG(DEF_CFG),
 	       .DEF_CLK(DEF_CLK))	       
    mio_regs (.dmode			(),
@@ -220,6 +220,7 @@ module mio (/*AUTOARG*/
     );
     */
    mio_if  #(.AW(AW),
+	     .PW(PW),
 	     .MPW(MPW))
    mio_if (
 	   /*AUTOINST*/

diff --git a/src/mio/hdl/mio_if.v b/src/mio/hdl/mio_if.v
@@ -15,7 +15,7 @@ module mio_if (/*AUTOARG*/
 
    //parameters
    parameter  AW  = 32;            // address width
-   parameter  PW  = 2*AW +40;      // emesh packet width
+   parameter  PW  = 104;           // emesh packet width
    parameter  MPW = 128;           // mio packet width  (> PW) 
 
    // reset, clk, config
@@ -87,7 +87,8 @@ module mio_if (/*AUTOARG*/
    //#################################################
 
    // parse packet
-   packet2emesh #(.AW(AW))
+   packet2emesh #(.AW(AW),
+		  .PW(PW))
    pe2 (.packet_in		(rx_packet_in[PW-1:0]),
 	/*AUTOINST*/
 	// Outputs
@@ -133,7 +134,8 @@ module mio_if (/*AUTOARG*/
                                         srcaddr_in[AW-1:0];
 
    //Construct outgoing packet
-   emesh2packet #(.AW(AW))
+   emesh2packet #(.AW(AW),
+		  .PW(PW))
    e2p (/*AUTOINST*/
 	// Outputs
 	.packet_out			(packet_out[PW-1:0]),

diff --git a/src/mio/hdl/mio_regs.v b/src/mio/hdl/mio_regs.v
@@ -12,7 +12,7 @@ module mio_regs (/*AUTOARG*/
    // parameters
    parameter   N         = 8;                      // number of I/O pins  
    parameter   AW        = 32;                     // address width
-   localparam  PW        = 2*AW+40;                // packet width
+   parameter   PW        = 2*AW+40;                // packet width
    parameter   DEF_CFG   = 0;                      // reset MIO_CONFI value
    parameter   DEF_CLK   = 0;                      // reset MIO_CLKDIV value
    localparam  DEF_RISE0 = 0;                      // 0 degrees
@@ -88,7 +88,8 @@ module mio_regs (/*AUTOARG*/
    //# DECODE
    //#####################################
 
-   packet2emesh #(.AW(AW))
+   packet2emesh #(.AW(AW),
+		  .PW(PW))
    p2e (/*AUTOINST*/
 	// Outputs
 	.write_in			(write_in),