Index: trunk/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd
===================================================================
--- trunk/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd	(revision 422)
+++ trunk/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd	(revision 426)
@@ -9,13 +9,13 @@
 
         tmpl_parameters = [
-			parameter.Module('vci_param_int',
-                              default = 'caba:vci_param',
-                              cell_size = parameter.Reference('memc_cell_size_int')),
-            parameter.Module('vci_param_ext',
-                              default = 'caba:vci_param',
-                              cell_size = parameter.Reference('memc_cell_size_ext')),
+            parameter.Module('vci_param_int', default = 'caba:vci_param',
+                cell_size = parameter.Reference('memc_cell_size_int')
+            ),
+            parameter.Module('vci_param_ext', default = 'caba:vci_param',
+                cell_size = parameter.Reference('memc_cell_size_ext')
+            ),
             parameter.Int('dspin_in_width'),
             parameter.Int('dspin_out_width'),
-		],
+        ],
 
         header_files = [
@@ -26,6 +26,6 @@
         ],
 
-        implementation_files = [ 
-            '../source/src/vci_mem_cache.cpp' 
+        implementation_files = [
+            '../source/src/vci_mem_cache.cpp'
         ],
 
@@ -36,28 +36,34 @@
             Uses('caba:generic_fifo'),
             Uses('caba:generic_llsc_global_table'),
-			Uses('caba:dspin_dhccp_param')
+            Uses('caba:dspin_dhccp_param')
         ],
 
         ports = [
-            Port( 'caba:vci_target'   , 'p_vci_tgt' ),
-            Port( 'caba:dspin_input'  , 'p_dspin_in', dspin_data_size = 33 ),
-			Port( 'caba:dspin_output' , 'p_dspin_out', dspin_data_size = 40 ),
-            Port( 'caba:vci_initiator', 'p_vci_ixr' ),
-            Port( 'caba:bit_in'       , 'p_resetn'  , auto = 'resetn' ),
-            Port( 'caba:clock_in'     , 'p_clk'     , auto = 'clock'  ),
+            Port('caba:clock_in'     , 'p_clk'      , auto = 'clock' ),
+            Port('caba:bit_in'       , 'p_resetn'   , auto = 'resetn'),
+            Port('caba:vci_target'   , 'p_vci_tgt'),
+            Port('caba:vci_initiator', 'p_vci_ixr'),
+            Port('caba:dspin_input',
+                'p_dspin_in',
+                dspin_data_size = parameter.Reference('dspin_in_width')
+            ),
+            Port('caba:dspin_output',
+                'p_dspin_out',
+                dspin_data_size = parameter.Reference('dspin_out_width')
+            ),
         ],
 
         instance_parameters = [
-            parameter.Module( 'mtp', 'common:mapping_table' ),
-            parameter.Module( 'mtc', 'common:mapping_table' ),
-            parameter.Module( 'mtx', 'common:mapping_table' ),
-            parameter.IntTab( 'vci_ixr_index' ),
-            parameter.IntTab( 'vci_ini_index' ),
-            parameter.IntTab( 'vci_tgt_index' ),
-            parameter.IntTab( 'vci_tgt_index_cleanup '),
-            parameter.Int   ( 'nways' ),
-            parameter.Int   ( 'nsets' ),
-            parameter.Int   ( 'nwords' ),
-            parameter.Int   ( 'heap_size' ),
+            parameter.Module('mtp', 'common:mapping_table'),
+            parameter.Module('mtc', 'common:mapping_table'),
+            parameter.Module('mtx', 'common:mapping_table'),
+            parameter.IntTab('vci_ixr_index'),
+            parameter.IntTab('vci_ini_index'),
+            parameter.IntTab('vci_tgt_index'),
+            parameter.IntTab('vci_tgt_index_cleanup'),
+            parameter.Int   ('nways'),
+            parameter.Int   ('nsets'),
+            parameter.Int   ('nwords'),
+            parameter.Int   ('heap_size'),
         ],
 )