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

Timestamp:

2011-08-07T11:21:44Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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) (4 diffs)

uspace/lib/net/netif/netif_skel.c

@@ -228 +228 @@
 }
 
+/** Register the device notification receiver,
+ *
+ * Register a network interface layer module as the device
+ * notification receiver.
+ *
+ * @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(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;
+        }
+        
+        netif_globals.nil_sess = sess;
+        
+        fibril_rwlock_write_unlock(&netif_globals.lock);
+        return EOK;
+}
+
 /** Process the netif module messages.
  *
@@ -257 +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:
@@ -358 +388 @@
  * messages in an infinite loop.
  *
- * @param[in] nil_service Network interface layer service.
- *
  * @return EOK on success.
  * @return Other error codes as defined for each specific module
@@ -365 +393 @@
  *
  */
-int netif_module_start(sysarg_t nil_service)
+int netif_module_start(void)
 {
         async_set_client_connection(netif_client_connection);
         
         netif_globals.sess = connect_to_service(SERVICE_NETWORKING);
-        netif_globals.nil_sess = connect_to_service(nil_service);
+        netif_globals.nil_sess = NULL;
         netif_device_map_initialize(&netif_globals.device_map);