Changes in / [eaa0c3f:86c71de] in mainline

Location:

uspace

Files:

• app/trace/trace.c (modified) (1 diff)
• drv/char/ps2mouse/ps2mouse.c (modified) (4 diffs)
• drv/char/ps2mouse/ps2mouse.h (modified) (1 diff)
• drv/char/xtkbd/xtkbd.c (modified) (3 diffs)
• drv/char/xtkbd/xtkbd.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (1 diff)
• lib/c/include/ipc/net.h (modified) (1 diff)
• lib/c/include/ipc/net_net.h (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (2 diffs)
• lib/drv/include/ddf/driver.h (modified) (1 diff)
• lib/net/generic/net_remote.c (modified) (1 diff)
• lib/net/include/net_interface.h (modified) (1 diff)
• lib/net/include/nil_remote.h (modified) (1 diff)
• lib/net/nil/nil_remote.c (modified) (2 diffs)
• lib/nic/include/nic.h (modified) (1 diff)
• lib/nic/include/nic_driver.h (modified) (1 diff)
• lib/nic/src/nic_driver.c (modified) (7 diffs)
• lib/nic/src/nic_impl.c (modified) (2 diffs)
• srv/devman/devman.c (modified) (2 diffs)
• srv/loc/loc.c (modified) (8 diffs)
• srv/net/cfg/e1k.nic (modified) (1 diff)
• srv/net/cfg/lo.nic (modified) (1 diff)
• srv/net/cfg/ne2k.nic (modified) (1 diff)
• srv/net/net/Makefile (modified) (1 diff)
• srv/net/net/net.c (modified) (12 diffs)
• srv/net/net/net.h (modified) (3 diffs)
• srv/net/nil/eth/eth.c (modified) (7 diffs)
• srv/net/nil/eth/eth.h (modified) (2 diffs)
• srv/net/nil/nildummy/nildummy.c (modified) (5 diffs)
• srv/net/nil/nildummy/nildummy.h (modified) (2 diffs)

uspace/app/trace/trace.c

@@ -623 +623 @@
 error:
         loader_abort(ldr);
+        free(ldr);
         return NULL;
 }

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -116 +116 @@
         assert(mouse);
         assert(dev);
-        mouse->client_sess = NULL;
+        mouse->input_sess = NULL;
         mouse->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
             dev->handle, IPC_FLAG_BLOCKING);
@@ -218 +218 @@
 
                 async_exch_t *exch =
-                    async_exchange_begin(mouse->client_sess);
+                    async_exchange_begin(mouse->input_sess);
                 if (!exch) {
                         ddf_msg(LVL_ERROR,
-                            "Failed creating exchange.");
+                            "Failed to create input exchange.");
                         continue;
                 }
@@ -277 +277 @@
 
                 async_exch_t *exch =
-                    async_exchange_begin(mouse->client_sess);
+                    async_exchange_begin(mouse->input_sess);
                 if (!exch) {
                         ddf_msg(LVL_ERROR,
-                            "Failed creating exchange.");
+                            "Failed to create input exchange.");
                         continue;
                 }
@@ -386 +386 @@
                 if (sess == NULL) {
                         ddf_msg(LVL_WARN,
-                            "Failed creating client callback session");
+                            "Failed to create start input session");
                         async_answer_0(icallid, EAGAIN);
                         break;
                 }
-                if (mouse->client_sess == NULL) {
-                        mouse->client_sess = sess;
-                        ddf_msg(LVL_DEBUG, "Set client session");
+                if (mouse->input_sess == NULL) {
+                        mouse->input_sess = sess;
+                        ddf_msg(LVL_DEBUG, "Set input session");
                         async_answer_0(icallid, EOK);
                 } else {
-                        ddf_msg(LVL_ERROR, "Client session already set");
+                        ddf_msg(LVL_ERROR, "Input session already set");
                         async_answer_0(icallid, ELIMIT);
                 }

uspace/drv/char/ps2mouse/ps2mouse.h

@@ -43 +43 @@
         ddf_fun_t *mouse_fun;      /**< Mouse function. */
         async_sess_t *parent_sess; /**< Connection to device providing data. */
-        async_sess_t *client_sess;  /**< Callback connection to client. */
+        async_sess_t *input_sess;  /**< Callback connection to consumer. */
         fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
 } ps2_mouse_t;

uspace/drv/char/xtkbd/xtkbd.c

@@ -206 +206 @@
         assert(kbd);
         assert(dev);
-        kbd->client_sess = NULL;
+        kbd->input_sess = NULL;
         kbd->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
             dev->handle, IPC_FLAG_BLOCKING);
@@ -296 +296 @@
                 if (key != 0) {
                         async_exch_t *exch =
-                            async_exchange_begin(kbd->client_sess);
+                            async_exchange_begin(kbd->input_sess);
                         if (!exch) {
                                 ddf_msg(LVL_ERROR,
-                                    "Failed creating exchange.");
+                                    "Failed to create input exchange.");
                                 continue;
                         }
@@ -352 +352 @@
                 if (sess == NULL) {
                         ddf_msg(LVL_WARN,
-                            "Failed creating callback session");
+                            "Failed to create start input session");
                         async_answer_0(icallid, EAGAIN);
                         break;
                 }
-                if (kbd->client_sess == NULL) {
-                        kbd->client_sess = sess;
-                        ddf_msg(LVL_DEBUG, "Set client session");
+                if (kbd->input_sess == NULL) {
+                        kbd->input_sess = sess;
+                        ddf_msg(LVL_DEBUG, "Set input session");
                         async_answer_0(icallid, EOK);
                 } else {
-                        ddf_msg(LVL_ERROR, "Client session already set");
+                        ddf_msg(LVL_ERROR, "Input session already set");
                         async_answer_0(icallid, ELIMIT);
                 }

uspace/drv/char/xtkbd/xtkbd.h

@@ -43 +43 @@
         ddf_fun_t *kbd_fun;        /**< Keyboard function. */
         async_sess_t *parent_sess; /**< Connection to device providing data. */
-        async_sess_t *client_sess; /**< Callback connection to client. */
+        async_sess_t *input_sess;  /**< Callback connection to consumer. */
         fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
 } xt_kbd_t;

uspace/lib/c/include/ipc/devman.h

@@ -146 +146 @@
 typedef enum {
         DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
+        DRIVER_DEV_ADDED,
         DRIVER_DEV_REMOVE,
         DRIVER_DEV_GONE,

uspace/lib/c/include/ipc/net.h

@@ -305 +305 @@
  *
  */
-#define IPC_GET_DEVICE_HANDLE(call)  ((service_id_t) IPC_GET_ARG2(call))
+#define IPC_GET_DEVICE_HANDLE(call)  ((devman_handle_t) IPC_GET_ARG2(call))
 
 /** Return the device driver service message argument.

uspace/lib/c/include/ipc/net_net.h

@@ -54 +54 @@
         NET_NET_GET_DEVICES_COUNT,
         /** Return names and device IDs of all devices */
-        NET_NET_GET_DEVICES
+        NET_NET_GET_DEVICES,
+        /** Notify the networking service about a ready device */
+        NET_NET_DRIVER_READY
 } net_messages;
 

uspace/lib/drv/generic/driver.c

@@ -303 +303 @@
 }
 
+static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fibril_mutex_lock(&devices_mutex);
+        ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall));
+        fibril_mutex_unlock(&devices_mutex);
+        
+        if (dev != NULL && driver->driver_ops->device_added != NULL)
+                driver->driver_ops->device_added(dev);
+}
+
 static void driver_dev_remove(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -450 +460 @@
                 case DRIVER_DEV_ADD:
                         driver_dev_add(callid, &call);
+                        break;
+                case DRIVER_DEV_ADDED:
+                        async_answer_0(callid, EOK);
+                        driver_dev_added(callid, &call);
                         break;
                 case DRIVER_DEV_REMOVE:

uspace/lib/drv/include/ddf/driver.h

@@ -145 +145 @@
         /** Ask driver to offline a specific function */
         int (*fun_offline)(ddf_fun_t *);
+
+        /**
+         * Notification that the device was succesfully added.
+         * The driver can do any blocking operation without
+         * blocking the device manager.
+         *
+         * XXX REMOVE THIS
+         */
+        void (*device_added)(ddf_dev_t *dev);
 } driver_ops_t;
 

uspace/lib/net/generic/net_remote.c

@@ -167 +167 @@
 }
 
+int net_driver_ready(async_sess_t *sess, devman_handle_t handle)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_1_0(exch, NET_NET_DRIVER_READY, handle);
+        async_exchange_end(exch);
+        
+        return rc;
+}
+
 /** @}
  */

uspace/lib/net/include/net_interface.h

@@ -52 +52 @@
 extern int net_get_devices_req(async_sess_t *, measured_string_t **, size_t *,
     uint8_t **);
+extern int net_driver_ready(async_sess_t *, devman_handle_t);
 extern async_sess_t *net_connect_module(void);
 

uspace/lib/net/include/nil_remote.h

@@ -34 +34 @@
 #define __NET_NIL_REMOTE_H__
 
-#include <ipc/loc.h>
 #include <net/device.h>
 #include <net/packet.h>

uspace/lib/net/nil/nil_remote.c

@@ -36 +36 @@
  */
 
-#include <ipc/loc.h>
 #include <nil_remote.h>
 #include <generic.h>
@@ -124 +123 @@
 
 int nil_device_req(async_sess_t *sess, nic_device_id_t device_id,
-    service_id_t sid, size_t mtu)
+    devman_handle_t handle, size_t mtu)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         int rc = async_req_3_0(exch, NET_NIL_DEVICE, (sysarg_t) device_id,
-            (sysarg_t) sid, (sysarg_t) mtu);
+            (sysarg_t) handle, (sysarg_t) mtu);
         async_exchange_end(exch);
         return rc;

uspace/lib/nic/include/nic.h

@@ -219 +219 @@
 extern void nic_set_poll_handlers(nic_t *,
         poll_mode_change_handler, poll_request_handler);
+
+/* Functions called in device_added */
+extern int nic_ready(nic_t *);
 
 /* General driver functions */

uspace/lib/nic/include/nic_driver.h

@@ -80 +80 @@
         /** Device's default MAC address (assigned the first time, used in STOP) */
         nic_address_t default_mac;
+        /** Session to SERVICE_NETWORKING */
+        async_sess_t *net_session;
         /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */
         async_sess_t *nil_session;

uspace/lib/nic/src/nic_driver.c

@@ -49 +49 @@
 #include <devman.h>
 #include <ddf/interrupt.h>
+#include <net_interface.h>
 #include <ops/nic.h>
 #include <errno.h>
@@ -88 +89 @@
     nic_iface_t *iface)
 {
+        if (driver_ops) {
+                if (!driver_ops->device_added)
+                        driver_ops->device_added = nic_device_added_impl;
+        }
+
         if (dev_ops) {
                 if (!dev_ops->open)
@@ -423 +429 @@
 
 /**
- * Connect to IRC service. This function should be called only from
+ * Connect to the NET and IRQ services. This function should be called only from
  * the add_device handler, thus no locking is required.
  *
@@ -430 +436 @@
  * @return EOK          If connection was successful.
  * @return EINVAL       If the IRC service cannot be determined.
- * @return EREFUSED     If IRC service cannot be connected.
+ * @return EREFUSED     If NET or IRC service cannot be connected.
  */
 int nic_connect_to_services(nic_t *nic_data)
 {
+        /* NET service */
+        nic_data->net_session = service_connect_blocking(EXCHANGE_SERIALIZE,
+                SERVICE_NETWORKING, 0, 0);
+        if (nic_data->net_session == NULL)
+                return errno;
+        
         /* IRC service */
         sysarg_t apic;
@@ -450 +462 @@
         
         return EOK;
+}
+
+/** Notify the NET service that the device is ready
+ *
+ * @param nic NICF structure
+ *
+ * @return EOK on success
+ *
+ */
+int nic_ready(nic_t *nic)
+{
+        fibril_rwlock_read_lock(&nic->main_lock);
+        
+        async_sess_t *session = nic->net_session;
+        devman_handle_t handle = nic->dev->handle;
+        
+        fibril_rwlock_read_unlock(&nic->main_lock);
+        
+        if (session == NULL)
+                return EINVAL;
+        
+        return net_driver_ready(session, handle);
 }
 
@@ -692 +726 @@
         nic_data->device_id = NIC_DEVICE_INVALID_ID;
         nic_data->state = NIC_STATE_STOPPED;
+        nic_data->net_session = NULL;
         nic_data->nil_session = NULL;
         nic_data->irc_session = NULL;
@@ -746 +781 @@
  */
 static void nic_destroy(nic_t *nic_data) {
+        if (nic_data->net_session != NULL) {
+                async_hangup(nic_data->net_session);
+        }
+
         if (nic_data->nil_session != NULL) {
                 async_hangup(nic_data->nil_session);

uspace/lib/nic/src/nic_impl.c

@@ -85 +85 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->nil_session == NULL || nic_data->device_id < 0) {
+                if (nic_data->nil_session == NULL || nic_data->net_session == NULL
+                    || nic_data->device_id < 0) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;
@@ -804 +805 @@
 }
 
+/** Default implementation of the device_added method
+ *
+ * Just calls nic_ready.
+ *
+ * @param dev
+ *
+ */
+void nic_device_added_impl(ddf_dev_t *dev)
+{
+        nic_ready((nic_t *) dev->driver_data);
+}
+
 /**
  * Default handler for unknown methods (outside of the NIC interface).

uspace/srv/devman/devman.c

@@ -794 +794 @@
         case EOK:
                 dev->state = DEVICE_USABLE;
+                exch = async_exchange_begin(drv->sess);
+                async_msg_1(exch, DRIVER_DEV_ADDED, dev->handle);
+                async_exchange_end(exch);
                 break;
         case ENOENT:
@@ -800 +803 @@
         default:
                 dev->state = DEVICE_INVALID;
-                break;
         }
         

uspace/srv/loc/loc.c

@@ -56 +56 @@
 #define NULL_SERVICES  256
 
-/** Callback session */
-typedef struct {
-        link_t cb_sess_list;
-        async_sess_t *sess;
-} cb_sess_t;
-
 LIST_INITIALIZE(services_list);
 LIST_INITIALIZE(namespaces_list);
@@ -92 +86 @@
 
 static FIBRIL_MUTEX_INITIALIZE(callback_sess_mutex);
-static LIST_INITIALIZE(callback_sess_list);
+static async_sess_t *callback_sess = NULL;
 
 service_id_t loc_create_id(void)
@@ -614 +608 @@
         size_t act_size;
         loc_service_t *svc;
-        char *fqn;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -632 +625 @@
         }
         
-        if (asprintf(&fqn, "%s/%s", svc->namespace->name, svc->name) < 0) {
-                fibril_mutex_unlock(&services_list_mutex);
-                async_answer_0(callid, ENOMEM);
-                async_answer_0(iid, ENOMEM);
-                return;
-        }
-        
-        act_size = str_size(fqn);
+        act_size = str_size(svc->name);
         if (act_size > size) {
-                free(fqn);
                 fibril_mutex_unlock(&services_list_mutex);
                 async_answer_0(callid, EOVERFLOW);
@@ -648 +633 @@
         }
         
-        sysarg_t retval = async_data_read_finalize(callid, fqn,
+        sysarg_t retval = async_data_read_finalize(callid, svc->name,
             min(size, act_size));
-        free(fqn);
         
         fibril_mutex_unlock(&services_list_mutex);
@@ -806 +790 @@
 }
 
-/** Create callback connection.
- *
- * Create callback connection which will be used to send category change
- * events.
- *
- * On success, answer will contain EOK int retval.
+/** Find ID for category specified by name.
+ *
+ * On success, answer will contain EOK int retval and service ID in arg1.
  * On failure, error code will be sent in retval.
+ *
  */
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        cb_sess_t *cb_sess;
-        
-        cb_sess = calloc(1, sizeof(cb_sess_t));
+        async_sess_t *cb_sess = async_callback_receive(EXCHANGE_SERIALIZE);
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);
@@ -824 +804 @@
         }
         
-        async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
-        if (sess == NULL) {
-                free(cb_sess);
-                async_answer_0(iid, ENOMEM);
-                return;
-        }
-        
-        cb_sess->sess = sess;
-        link_initialize(&cb_sess->cb_sess_list);
-        
         fibril_mutex_lock(&callback_sess_mutex);
-        list_append(&cb_sess->cb_sess_list, &callback_sess_list);
+        if (callback_sess != NULL) {
+                fibril_mutex_unlock(&callback_sess_mutex);
+                async_answer_0(iid, EEXIST);
+                return;
+        }
+        
+        callback_sess = cb_sess;
         fibril_mutex_unlock(&callback_sess_mutex);
         
@@ -844 +820 @@
 {
         fibril_mutex_lock(&callback_sess_mutex);
-        
-        list_foreach(callback_sess_list, link) {
-                cb_sess_t *cb_sess;
-                
-                cb_sess = list_get_instance(link, cb_sess_t, cb_sess_list);
-                
-                async_exch_t *exch = async_exchange_begin(cb_sess->sess);
+
+        if (callback_sess != NULL) {
+                async_exch_t *exch = async_exchange_begin(callback_sess);
                 async_msg_0(exch, LOC_EVENT_CAT_CHANGE);
                 async_exchange_end(exch);
         }
-        
+
         fibril_mutex_unlock(&callback_sess_mutex);
 }

uspace/srv/net/cfg/e1k.nic

@@ -3 +3 @@
 NAME=e1k
 
-HWPATH=devices/\hw\pci0\00:03.0\port0
+HWPATH=/hw/pci0/00:03.0/port0
 NIL=eth
 IL=ip

uspace/srv/net/cfg/lo.nic

@@ -3 +3 @@
 NAME=lo
 
-HWPATH=devices/\virt\lo\port0
+HWPATH=/virt/lo/port0
 NIL=nildummy
 IL=ip

uspace/srv/net/cfg/ne2k.nic

@@ -3 +3 @@
 NAME=ne2k
 
-HWPATH=devices/\hw\pci0\00:01.0\ne2k\port0
+HWPATH=/hw/pci0/00:01.0/ne2k/port0
 NIL=eth
 IL=ip

uspace/srv/net/net/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 LIBS = $(LIBNET_PREFIX)/libnet.a
-EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBNIC_PREFIX)/include \
-    -I$(LIBDRV_PREFIX)/include
+EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

uspace/srv/net/net/net.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <str.h>
+#include <devman.h>
 #include <str_error.h>
 #include <ns.h>
@@ -55 +56 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <loc.h>
-#include <nic.h>
 #include <nil_remote.h>
 #include <net_interface.h>
@@ -74 +73 @@
 GENERIC_CHAR_MAP_IMPLEMENT(measured_strings, measured_string_t);
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
-LIST_INITIALIZE(netif_list);
 
 /** Add the configured setting to the configuration map.
@@ -289 +287 @@
  *
  */
-static int init_device(netif_t *netif, service_id_t sid)
+static int init_device(netif_t *netif, devman_handle_t handle)
 {
         printf("%s: Initializing device '%s'\n", NAME, netif->name);
         
-        link_initialize(&netif->netif_list);
-        
-        netif->sid = sid;
-        netif->sess = loc_service_connect(EXCHANGE_SERIALIZE, netif->sid,
+        netif->handle = handle;
+        netif->sess = devman_device_connect(EXCHANGE_SERIALIZE, netif->handle,
             IPC_FLAG_BLOCKING);
         if (netif->sess == NULL) {
@@ -341 +337 @@
                     strtol((const char *) setting->value, NULL, 10) : 0;
                 rc = nil_device_req(netif->nil->sess, netif->id,
-                    netif->sid, mtu);
+                    netif->handle, mtu);
                 if (rc != EOK) {
                         printf("%s: Unable to start network interface layer\n",
@@ -367 +363 @@
         
         printf("%s: Activating device '%s'\n", NAME, netif->name);
-        list_append(&netif->netif_list, &netif_list);
         return nic_set_state(netif->sess, NIC_STATE_ACTIVE);
 }
 
-static int net_nic_ready(service_id_t sid)
-{
-        int rc;
-        char *hwpath;
-        
-        rc = loc_service_get_name(sid, &hwpath);
-        if (rc != EOK) {
-                printf("%s: Failed getting name of service '%u'\n",
-                    NAME, (unsigned) sid);
+static int net_port_ready(devman_handle_t handle)
+{
+        char hwpath[MAX_PATH_LENGTH];
+        int rc = devman_fun_get_path(handle, hwpath, MAX_PATH_LENGTH);
+        if (rc != EOK)
                 return EINVAL;
-        }
         
         int index = char_map_find(&net_globals.netif_hwpaths,
             (uint8_t *) hwpath, 0);
-        
-        if (index == CHAR_MAP_NULL) {
-                printf("%s: Service '%s' not found in map.\n", NAME, hwpath);
-                free(hwpath);
+        if (index == CHAR_MAP_NULL)
                 return ENOENT;
-        }
-        
-        free(hwpath);
         
         netif_t *netif = netifs_get_index(&net_globals.netifs, index);
@@ -398 +382 @@
                 return ENOENT;
         
-        rc = init_device(netif, sid);
+        rc = init_device(netif, handle);
         if (rc != EOK)
                 return rc;
@@ -407 +391 @@
         
         netif->il->usage++;
+        
+        return EOK;
+}
+
+static int net_driver_ready_local(devman_handle_t handle)
+{
+        devman_handle_t *funs;
+        size_t count;
+        int rc = devman_dev_get_functions(handle, &funs, &count);
+        if (rc != EOK)
+                return rc;
+        
+        for (size_t i = 0; i < count; i++) {
+                rc = net_port_ready(funs[i]);
+                if (rc != EOK)
+                        return rc;
+        }
         
         return EOK;
@@ -478 +479 @@
                 net_free_devices(strings, count);
                 return rc;
+        case NET_NET_DRIVER_READY:
+                rc = net_driver_ready_local(IPC_GET_ARG1(*call));
+                *answer_count = 0;
+                return rc;
         default:
                 return ENOTSUP;
@@ -523 +528 @@
                 answer_call(callid, res, &answer, count);
         }
-}
-
-static int nic_check_new(void)
-{
-        category_id_t nic_cat;
-        service_id_t *svcs;
-        size_t count, i;
-        bool already_known;
-        int rc;
-
-        rc = loc_category_get_id(DEVICE_CATEGORY_NIC, &nic_cat, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Failed resolving category '%s'.\n", NAME,
-                    DEVICE_CATEGORY_NIC);
-                return ENOENT;
-        }
-
-        rc = loc_category_get_svcs(nic_cat, &svcs, &count);
-        if (rc != EOK) {
-                printf("%s: Failed getting list of NIC devices.\n", NAME);
-                return EIO;
-        }
-
-        for (i = 0; i < count; i++) {
-                already_known = false;
-
-                list_foreach(netif_list, link) {
-                        netif_t *netif = list_get_instance(link, netif_t, netif_list);
-                        if (netif->sid == svcs[i]) {
-                                already_known = true;
-                                break;
-                        }
-                }
-
-                if (!already_known) {
-                        rc = net_nic_ready(svcs[i]);
-                        if (rc != EOK) {
-                                printf("%s: Failed adding NIC device #%u.\n",
-                                    NAME, (unsigned) svcs[i]);
-                        }
-                }
-        }
-
-        free(svcs);
-        return EOK;
-}
-
-static void cat_change_cb(void)
-{
-        (void) nic_check_new();
-}
-
-static int net_start_nic_discovery(void)
-{
-        int rc;
-
-        rc = loc_register_cat_change_cb(cat_change_cb);
-        if (rc != EOK) {
-                printf("%s: Failed registering callback for device discovery (%d).\n",
-                    NAME, rc);
-                return rc;
-        }
-
-        return nic_check_new();
 }
 
@@ -632 +573 @@
                                 continue;
                         
-                        netif->sid = -1;
+                        netif->handle = -1;
                         netif->sess = NULL;
                         
@@ -756 +697 @@
         }
         
-        rc = net_start_nic_discovery();
-        if (rc != EOK) {
-                printf("%s: Error starting NIC discovery\n", NAME);
-                pm_destroy();
-                return rc;
-        }
-        
         task_retval(0);
         async_manager();

uspace/srv/net/net/net.h

@@ -35 +35 @@
 #define NET_NET_H_
 
-#include <ipc/loc.h>
 #include <net/device.h>
 #include <adt/char_map.h>
@@ -42 +41 @@
 #include <adt/module_map.h>
 #include <net/packet.h>
+#include <devman.h>
 
 #define NAME  "net"
@@ -96 +96 @@
         
         /** Serving network interface driver module index. */
-        service_id_t sid;  /**< Service ID */
+        devman_handle_t handle;  /**< Handle for devman */
         async_sess_t *sess;      /**< Driver session. */
         
         module_t *nil;  /**< Serving link layer module index. */
         module_t *il;   /**< Serving internet layer module index. */
-        
-        link_t netif_list;
 } netif_t;
 

uspace/srv/net/nil/eth/eth.c

@@ -48 +48 @@
 #include <ipc/net.h>
 #include <ipc/services.h>
-#include <loc.h>
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -227 +226 @@
  *
  * @param[in] device_id New device identifier.
- * @param[in] sid       NIC service ID.
+ * @param[in] handle    Device driver handle.
  * @param[in] mtu       Device maximum transmission unit.
  *
@@ -235 +234 @@
  *
  */
-static int eth_device_message(nic_device_id_t device_id, service_id_t sid,
+static int eth_device_message(nic_device_id_t device_id, devman_handle_t handle,
     size_t mtu)
 {
@@ -260 +259 @@
         device = eth_devices_find(&eth_globals.devices, device_id);
         if (device) {
-                if (device->sid != sid) {
+                if (device->handle != handle) {
                         printf("Device %d already exists\n", device->device_id);
                         fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -299 +298 @@
 
         device->device_id = device_id;
-        device->sid = sid;
+        device->handle = handle;
         device->flags = 0;
         if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags)))
@@ -336 +335 @@
         
         /* Bind the device driver */
-        device->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid,
+        device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
             IPC_FLAG_BLOCKING);
         if (device->sess == NULL) {
@@ -363 +362 @@
         }
         
-        printf("%s: Device registered (id: %d, sid: %zu: mtu: %zu, "
+        printf("%s: Device registered (id: %d, handle: %zu: mtu: %zu, "
             "mac: " PRIMAC ", flags: 0x%x)\n", NAME,
-            device->device_id, device->sid, device->mtu,
+            device->device_id, device->handle, device->mtu,
             ARGSMAC(device->addr.address), device->flags);
 

uspace/srv/net/nil/eth/eth.h

@@ -41 +41 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <ipc/loc.h>
 #include <ipc/services.h>
 #include <net/device.h>
 #include <adt/measured_strings.h>
+#include <devman.h>
 
 /** Ethernet address length. */
@@ -224 +224 @@
         nic_device_id_t device_id;
         /** Device handle */
-        service_id_t sid;
+        devman_handle_t handle;
         /** Driver session. */
         async_sess_t *sess;

uspace/srv/net/nil/nildummy/nildummy.c

@@ -53 +53 @@
 #include <packet_remote.h>
 #include <packet_client.h>
+#include <devman.h>
 #include <device/nic.h>
-#include <loc.h>
 #include <nil_skel.h>
 #include "nildummy.h"
@@ -115 +115 @@
  */
 static int nildummy_device_message(nic_device_id_t device_id,
-    service_id_t sid, size_t mtu)
+    devman_handle_t handle, size_t mtu)
 {
         fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
@@ -123 +123 @@
             nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (device) {
-                if (device->sid != sid) {
+                if (device->handle != handle) {
                         printf("Device %d exists, handles do not match\n",
                             device->device_id);
@@ -158 +158 @@
         
         device->device_id = device_id;
-        device->sid = sid;
+        device->handle = handle;
         if (mtu > 0)
                 device->mtu = mtu;
@@ -165 +165 @@
         
         /* Bind the device driver */
-        device->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid,
+        device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
             IPC_FLAG_BLOCKING);
         if (device->sess == NULL) {

uspace/srv/net/nil/nildummy/nildummy.h

@@ -41 +41 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <ipc/loc.h>
 #include <ipc/services.h>
+#include <ipc/devman.h>
 #include <net/device.h>
 
@@ -78 +78 @@
         /** Device identifier. */
         nic_device_id_t device_id;
-        /** Device service ID. */
-        service_id_t sid;
+        /** Device driver handle. */
+        devman_handle_t handle;
         /** Driver session. */
         async_sess_t *sess;