Changeset 487 for soft/giet_vm/giet_libs/stdio.c

Timestamp:

Jan 8, 2015, 11:50:25 AM (10 years ago)

Author:

alain

Message:

1) Change the user sbt_barrier_init() prototype: the two (nclusters/ntasks) arguments
replace the single (ntasks) argument.
2) Introduce an explicit (channel) argument in all iuser access functions to the NIC component.
Previously, the channel registered in the task context was an implicit argument.
The channel is still registered in the task context for checking.

File:

• soft/giet_vm/giet_libs/stdio.c (modified) (3 diffs)

soft/giet_vm/giet_libs/stdio.c

@@ -541 +541 @@
 //////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////
-int giet_nic_rx_alloc()
+////////////////////////////////
+unsigned int giet_nic_rx_alloc()
 {
     int channel = sys_call( SYSCALL_NIC_ALLOC,
                             1, 
                             0, 0, 0 );
-    if ( channel < 0 ) giet_exit("error in giet_nic_tx_alloc()");
-
-    return channel;
-}
-
-///////////////////////
-int giet_nic_tx_alloc()
+    if ( channel < 0 ) giet_exit("error in giet_nic_rx_alloc()");
+
+    return (unsigned int)channel;
+}
+
+////////////////////////////////
+unsigned int giet_nic_tx_alloc()
 {
     int channel = sys_call( SYSCALL_NIC_ALLOC,
@@ -560 +560 @@
     if ( channel < 0 ) giet_exit("error in giet_nic_tx_alloc()");
 
-    return channel;
-}
-
-////////////////////////
-void giet_nic_rx_start()
+    return (unsigned int)channel;
+}
+
+//////////////////////////////////////////////
+void giet_nic_rx_start( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_START,
                    1,
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_rx_start()");
-}
-
-////////////////////////
-void giet_nic_tx_start()
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_rx_start()");
+}
+
+//////////////////////////////////////////////
+void giet_nic_tx_start( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_START,
                    0, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_tx_start()");
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_tx_start()");
 }
 
@@ -599 +601 @@
 }
 
-///////////////////////
-void giet_nic_rx_stop()
+/////////////////////////////////////////////
+void giet_nic_rx_stop( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_STOP,
                    1, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_rx_stop()");
-}
-
-///////////////////////
-void giet_nic_tx_stop()
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_rx_stop()");
+}
+
+/////////////////////////////////////////////
+void giet_nic_tx_stop( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_STOP,
                    0, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_tx_stop()");
-}
-
-////////////////////////
-void giet_nic_rx_stats()
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_tx_stop()");
+}
+
+//////////////////////////////////////////////
+void giet_nic_rx_stats( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_STATS,
                    1, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_rx_stats()");
-}
-
-////////////////////////
-void giet_nic_tx_stats()
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_rx_stats()");
+}
+
+//////////////////////////////////////////////
+void giet_nic_tx_stats( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_STATS,
                    0, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_tx_stats()");
-}
-
-////////////////////////
-void giet_nic_rx_clear()
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_tx_stats()");
+}
+
+//////////////////////////////////////////////
+void giet_nic_rx_clear( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_CLEAR,
                    1, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_rx_clear()");
-}
-
-////////////////////////
-void giet_nic_tx_clear()
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_rx_clear()");
+}
+
+//////////////////////////////////////////////
+void giet_nic_tx_clear( unsigned int channel )
 {
     if ( sys_call( SYSCALL_NIC_CLEAR,
                    0, 
-                   0, 0, 0 ) ) giet_exit("error in giet_nic_tx_clear()");
+                   channel,
+                   0, 0 ) ) giet_exit("error in giet_nic_tx_clear()");
 }