Changeset 886

Timestamp:

Nov 16, 2014, 12:49:58 PM (10 years ago)

Author:

cfuguet

Message:

reconf: introduce a dspin_router_config.h interface file

• This file contains the possible configuration values for the p_blackhole_pos port. It is meant to b used by software to configure, through the reconf:vci_xicu, the NoC routers.

Location:

branches/reconfiguration/modules/dspin_router

Files:

• caba/metadata/dspin_router.sd (modified) (1 diff)
• caba/source/include/dspin_router.h (modified) (1 diff)
• caba/source/src/dspin_router.cpp (modified) (2 diffs)
• include (added)
• include/soclib (added)
• include/soclib/dspin_router_config.h (added)

branches/reconfiguration/modules/dspin_router/caba/metadata/dspin_router.sd

@@ -2 +2 @@
 
 Module('caba:reconf:dspin_router',
-        classname = 'soclib::caba::DspinRouter',
-        tmpl_parameters = [ parameter.Int('flit_width'), ],
-        header_files = ['../source/include/dspin_router.h',],
-        implementation_files = ['../source/src/dspin_router.cpp',],
-        ports = [
-                Port('caba:bit_in', 'p_resetn', auto = 'resetn'),
-                Port('caba:clock_in', 'p_clk', auto = 'clock'),
-            Port('caba:dspin_output', 'p_out', 5, dspin_data_size = parameter.Reference('flit_width')),
-            Port('caba:dspin_input', 'p_in', 5, dspin_data_size = parameter.Reference('flit_width')),
-        ],
-        instance_parameters = [
-            parameter.Int('x'),
-            parameter.Int('y'),
-            parameter.Int('x_width'),
-            parameter.Int('y_width'),
-            parameter.Int('in_fifo_depth'),
-            parameter.Int('out_fifo_depth'),
+    classname = 'soclib::caba::DspinRouter',
+    tmpl_parameters = [ parameter.Int('flit_width')],
+    header_files = ['../source/include/dspin_router.h'],
+    implementation_files = ['../source/src/dspin_router.cpp'],
+    interface_files = ['../../include/soclib/dspin_router_config.h'],
+    ports = [
+        Port('caba:bit_in', 'p_resetn', auto = 'resetn'),
+        Port('caba:clock_in', 'p_clk', auto = 'clock'),
+        Port('caba:dspin_output', 'p_out', 5, dspin_data_size = parameter.Reference('flit_width')),
+        Port('caba:dspin_input', 'p_in', 5, dspin_data_size = parameter.Reference('flit_width')),
+    ],
+    instance_parameters = [
+        parameter.Int('x'),
+        parameter.Int('y'),
+        parameter.Int('x_width'),
+        parameter.Int('y_width'),
+        parameter.Int('in_fifo_depth'),
+        parameter.Int('out_fifo_depth'),
         parameter.Bool('broadcast_supported'),
-        ],
-        uses = [
-            Uses('caba:base_module'),
-            Uses('caba:generic_fifo'),
-        ],
+    ],
+    uses = [
+        Uses('caba:base_module'),
+        Uses('caba:generic_fifo'),
+    ],
 )
+
+# vim: ts=4 : sts=4 : sw=4 : et

branches/reconfiguration/modules/dspin_router/caba/source/include/dspin_router.h

@@ -82 +82 @@
         INFSM_REQ_FOURTH,
         INFSM_ALLOC_FOURTH,
-    };
-
-    // Black-Hole position
-    enum
-    {
-        BH_NONE,
-        BH_N,
-        BH_NE,
-        BH_E,
-        BH_SE,
-        BH_S,
-        BH_SW,
-        BH_W,
-        BH_NW
     };
 

branches/reconfiguration/modules/dspin_router/caba/source/src/dspin_router.cpp

@@ -41 +41 @@
 
 #include "../include/dspin_router.h"
+#include "dspin_router_config.h"
 
 namespace soclib { namespace caba {
@@ -250 +251 @@
         if ( p_blackhole_pos != NULL )
         {
-            if (p_blackhole_pos->read() != BH_NONE)
+            if ( p_blackhole_pos->read() != BH_NONE )
             {
                 return recovery_route(xdest, ydest);