removing GenericIOType, sorting out function names

diff --git a/src/test_bsv/pinmux.bsv b/src/test_bsv/pinmux.bsv
index 688e7a43819f3736d6cdcbd01b60264fd4e49d8f..45e01b3b07f124c33a9e771eb206490dde5b1888 100644 (file)
--- a/src/test_bsv/pinmux.bsv
+++ b/src/test_bsv/pinmux.bsv
@@ -142,16 +142,16 @@ package pinmux;
       // TODO: this needs to stop using GenericIOType and
       // set the output (and only the output) as a wire
        // output muxer for cell idx 0
-      cell0_mux_out=wrcell0_mux==0?gpioa_a0_io_out:
-                       wrcell0_mux==1?uart0_tx_io:
+      cell0_mux_out=wrcell0_mux==0?wrgpioa_a0_out:
+                       wrcell0_mux==1?wruart0_tx_out:
                        0;
 
       // TODO: here is needed something which sets a new
       // wire, cell0_mux_outen
       cell0_mux_outen=
-            wrcell0_mux==0?gpioa_a0_io.output_en: // gpio bi-directional
-                       wrcell0_mux==1?gpioa_a0_io.output_en: // i think....
-                       0; // not sure.... 3rd entry is blank... might as well be 0
+            wrcell0_mux==0?wrgpioa_a0_outen: // bi-directional
+                       wrcell0_mux==1?wrgpioa_a0_out_en: // i think....
+                       0;
 
       rule assign_wrgpioa_a0_in_on_cell0(wrcell0_mux==0);
         wrgpioa_a0_in<=cell0_mux_in;
@@ -160,16 +160,16 @@ package pinmux;
       // TODO: this needs to stop using GenericIOType and
       // set the output (and only the output) as a wire
       // output muxer for cell idx 1
-      cell1_mux_out=wrcell1_mux==0?gpioa_a1_io:
-                       wrcell1_mux==1?uart0_rx_io: // oink?? this is an input!!
-                       twi0_sda_io;
+      cell1_mux_out=wrcell1_mux==0?wrgpioa_a1_out:
+                       wrcell1_mux==1?0: // uart0_rx is an input
+                       wrtwi0_sda_out;
 
       // TODO: here is needed something which sets a new
       // wire, cell1_mux_outen
       cell1_mux_outen=
-            wrcell1_mux==0?gpioa_a1_io.output_en: // gpio bi-directional
-                       wrcell1_mux==1?uart0_rx_io: // oink?? this is an input!!
-                       twi0_sda_io.output_en; // this one's bi-directional
+            wrcell1_mux==0?gpioa_a1_outen: // bi-directional
+                       wrcell1_mux==1?0: // uart0_rx is an input
+                       wrtwi0_sda_out_en; // bi-directional
 
       rule assign_wrgpioa_a1_in_on_cell1(wrcell1_mux==0);
         wrgpioa_a1_in<=cell1_mux_in;
@@ -189,16 +189,16 @@ package pinmux;
       // set the output (and only the output) as a wire
       // output muxer for cell idx 2
       cell2_mux_out=
-            wrcell2_mux==0?gpioa_a2_io:
+            wrcell2_mux==0?wrgpioa_a2_out:
                        wrcell2_mux==1?0:
-                       twi0_scl_io;
+                       wrtwi0_scl_out;
 
       // TODO: here is needed something which sets a new
       // wire, cell2_mux_outen
       cell2_mux_outen=
-            wrcell2_mux==0?gpioa_a2_io.output_en:
+            wrcell2_mux==0?wrgpioa_a2_outen: // bi-directional
                        wrcell2_mux==1?0:
-                       twi0_scl_io.output_en;
+                       wrtwi0_scl_outen; // bi-directional
 
 
       rule assign_wrgpioa_a2_in_on_cell2(wrcell2_mux==0);