Changeset f4f866c in mainline for uspace/lib/net/netif/netif_remote.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/net/netif/netif_remote.c (moved) (moved from uspace/lib/netif/generic/netif_remote.c ) (2 diffs)

uspace/lib/net/netif/netif_remote.c

@@ -28 +28 @@
 
 /** @addtogroup netif
- *  @{
+ * @{
  */
 
 /** @file
- *  Network interface module interface implementation for standalone remote modules.
- *  @see netif_interface.h
+ * Network interface module interface implementation for remote modules.
  */
 
@@ -43 +42 @@
 #include <packet/packet_client.h>
 #include <net_device.h>
-#include <netif_interface.h>
+#include <netif_remote.h>
 #include <netif_messages.h>
 
-int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data){
-        return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, address, data);
+int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
+    measured_string_ref *address, char **data)
+{
+        return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,
+            address, data);
 }
 
-int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io){
+int netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io)
+{
         return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, io);
 }
 
-int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender){
-        return generic_send_msg(netif_phone, NET_NETIF_SEND, device_id, packet_get_id(packet), sender, 0);
+int netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet,
+    services_t sender)
+{
+        return generic_send_msg_remote(netif_phone, NET_NETIF_SEND, device_id,
+            packet_get_id(packet), sender, 0);
 }
 
-int netif_start_req(int netif_phone, device_id_t device_id){
+int netif_start_req_remote(int netif_phone, device_id_t device_id)
+{
         return async_req_1_0(netif_phone, NET_NETIF_START, device_id);
 }
 
-int netif_stop_req(int netif_phone, device_id_t device_id){
+int netif_stop_req_remote(int netif_phone, device_id_t device_id)
+{
         return async_req_1_0(netif_phone, NET_NETIF_STOP, device_id);
 }
 
-int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats){
-        aid_t message_id;
+int netif_stats_req_remote(int netif_phone, device_id_t device_id,
+    device_stats_ref stats)
+{
+        if (!stats)
+                return EBADMEM;
+        
+        aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS,
+            (ipcarg_t) device_id, NULL);
+        async_data_read_start(netif_phone, stats, sizeof(*stats));
+        
         ipcarg_t result;
-
-        if(! stats){
-                return EBADMEM;
-        }
-        message_id = async_send_1(netif_phone, NET_NETIF_STATS, (ipcarg_t) device_id, NULL);
-        async_data_read_start(netif_phone, stats, sizeof(*stats));
         async_wait_for(message_id, &result);
+        
         return (int) result;
 }
 
-int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver){
+int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me,
+    async_client_conn_t receiver)
+{
         return bind_service(service, device_id, me, 0, receiver);
 }