Changeset f51f193 in mainline for uspace/lib/net/netif/netif_skel.c

Timestamp:

2011-07-12T03:00:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (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_skel.c (modified) (16 diffs)

uspace/lib/net/netif/netif_skel.c

@@ -54 +54 @@
 #include <nil_remote.h>
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
 DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t);
 
@@ -64 +61 @@
 /** Probe the existence of the device.
  *
- * @param[in] netif_phone Network interface phone.
  * @param[in] device_id   Device identifier.
  * @param[in] irq         Device interrupt number.
@@ -74 +70 @@
  *
  */
-static int netif_probe_req_local(int netif_phone, device_id_t device_id,
-    int irq, void *io)
+static int netif_probe_req_local(device_id_t device_id, int irq, void *io)
 {
         fibril_rwlock_write_lock(&netif_globals.lock);
@@ -86 +81 @@
 /** Send the packet queue.
  *
- * @param[in] netif_phone Network interface phone.
  * @param[in] device_id   Device identifier.
  * @param[in] packet      Packet queue.
@@ -96 +90 @@
  *
  */
-static int netif_send_msg_local(int netif_phone, device_id_t device_id,
-    packet_t *packet, services_t sender)
+static int netif_send_msg_local(device_id_t device_id, packet_t *packet,
+    services_t sender)
 {
         fibril_rwlock_write_lock(&netif_globals.lock);
@@ -108 +102 @@
 /** Start the device.
  *
- * @param[in] netif_phone Network interface phone.
  * @param[in] device_id   Device identifier.
  *
@@ -118 +111 @@
  *
  */
-static int netif_start_req_local(int netif_phone, device_id_t device_id)
+static int netif_start_req_local(device_id_t device_id)
 {
         fibril_rwlock_write_lock(&netif_globals.lock);
@@ -131 +124 @@
         int result = netif_start_message(device);
         if (result > NETIF_NULL) {
-                int phone = device->nil_phone;
-                nil_device_state_msg(phone, device_id, result);
+                nil_device_state_msg(netif_globals.nil_sess, device_id, result);
                 fibril_rwlock_write_unlock(&netif_globals.lock);
                 return EOK;
@@ -144 +136 @@
 /** Stop the device.
  *
- * @param[in] netif_phone Network interface phone.
  * @param[in] device_id   Device identifier.
  *
@@ -154 +145 @@
  *
  */
-static int netif_stop_req_local(int netif_phone, device_id_t device_id)
+static int netif_stop_req_local(device_id_t device_id)
 {
         fibril_rwlock_write_lock(&netif_globals.lock);
@@ -167 +158 @@
         int result = netif_stop_message(device);
         if (result > NETIF_NULL) {
-                int phone = device->nil_phone;
-                nil_device_state_msg(phone, device_id, result);
+                nil_device_state_msg(netif_globals.nil_sess, device_id, result);
                 fibril_rwlock_write_unlock(&netif_globals.lock);
                 return EOK;
@@ -222 +212 @@
 void netif_pq_release(packet_id_t packet_id)
 {
-        pq_release_remote(netif_globals.net_phone, packet_id);
+        pq_release_remote(netif_globals.sess, packet_id);
 }
 
@@ -235 +225 @@
 packet_t *netif_packet_get_1(size_t content)
 {
-        return packet_get_1_remote(netif_globals.net_phone, content);
+        return packet_get_1_remote(netif_globals.sess, content);
 }
 
 /** Register the device notification receiver,
  *
- * Register a  network interface layer module as the device
+ * Register a network interface layer module as the device
  * notification receiver.
  *
- * @param[in] device_id Device identifier.
- * @param[in] phone     Network interface layer module phone.
- *
- * @return EOK on success.
- * @return ENOENT if there is no such device.
+ * @param[in] sess      Session to the network interface layer module.
+ *
+ * @return EOK on success.
  * @return ELIMIT if there is another module registered.
  *
  */
-static int register_message(device_id_t device_id, int phone)
-{
-        netif_device_t *device;
-        int rc = find_device(device_id, &device);
-        if (rc != EOK)
-                return rc;
-        
-        if (device->nil_phone >= 0)
+static int register_message(async_sess_t *sess)
+{
+        fibril_rwlock_write_lock(&netif_globals.lock);
+        if (netif_globals.nil_sess != NULL) {
+                fibril_rwlock_write_unlock(&netif_globals.lock);
                 return ELIMIT;
-        
-        device->nil_phone = phone;
+        }
+        
+        netif_globals.nil_sess = sess;
+        
+        fibril_rwlock_write_unlock(&netif_globals.lock);
         return EOK;
 }
@@ -294 +282 @@
                 return EOK;
         
+        async_sess_t *callback =
+            async_callback_receive_start(EXCHANGE_SERIALIZE, call);
+        if (callback)
+                return register_message(callback);
+        
         switch (IPC_GET_IMETHOD(*call)) {
         case NET_NETIF_PROBE:
-                return netif_probe_req_local(0, IPC_GET_DEVICE(*call),
+                return netif_probe_req_local(IPC_GET_DEVICE(*call),
                     NETIF_GET_IRQ(*call), NETIF_GET_IO(*call));
         
-        case IPC_M_CONNECT_TO_ME:
-                fibril_rwlock_write_lock(&netif_globals.lock);
-                
-                rc = register_message(IPC_GET_DEVICE(*call), IPC_GET_PHONE(*call));
-                
-                fibril_rwlock_write_unlock(&netif_globals.lock);
-                return rc;
-        
         case NET_NETIF_SEND:
-                rc = packet_translate_remote(netif_globals.net_phone, &packet,
+                rc = packet_translate_remote(netif_globals.sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
                 
-                return netif_send_msg_local(0, IPC_GET_DEVICE(*call), packet,
+                return netif_send_msg_local(IPC_GET_DEVICE(*call), packet,
                     IPC_GET_SENDER(*call));
         
         case NET_NETIF_START:
-                return netif_start_req_local(0, IPC_GET_DEVICE(*call));
+                return netif_start_req_local(IPC_GET_DEVICE(*call));
         
         case NET_NETIF_STATS:
@@ -343 +328 @@
         
         case NET_NETIF_STOP:
-                return netif_stop_req_local(0, IPC_GET_DEVICE(*call));
+                return netif_stop_req_local(IPC_GET_DEVICE(*call));
         
         case NET_NETIF_GET_ADDR:
@@ -412 +397 @@
         async_set_client_connection(netif_client_connection);
         
-        netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING);
+        netif_globals.sess = connect_to_service(SERVICE_NETWORKING);
+        netif_globals.nil_sess = NULL;
         netif_device_map_initialize(&netif_globals.device_map);