Changeset 948911d in mainline for uspace/srv

Timestamp:

2012-01-24T02:27:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (1 diff)
• bd/file_bd/file_bd.c (modified) (1 diff)
• bd/gxe_bd/gxe_bd.c (modified) (1 diff)
• bd/part/guid_part/guid_part.c (modified) (1 diff)
• bd/part/mbr_part/mbr_part.c (modified) (1 diff)
• bd/rd/rd.c (modified) (1 diff)
• devman/devman.c (modified) (2 diffs)
• devman/main.c (modified) (3 diffs)
• hid/console/console.c (modified) (1 diff)
• hid/fb/fb.c (modified) (1 diff)
• hid/input/Makefile (modified) (2 diffs)
• hid/input/generic/input.c (modified) (8 diffs)
• hid/input/include/mouse.h (modified) (1 diff)
• hid/input/include/mouse_proto.h (modified) (1 diff)
• hid/input/port/chardev.c (modified) (1 diff)
• hid/input/port/chardev_mouse.c (deleted)
• hid/input/proto/adb.c (modified) (1 diff)
• hid/input/proto/mousedev.c (modified) (1 diff)
• hid/input/proto/ps2.c (deleted)
• hid/remcons/Makefile (added)
• hid/remcons/remcons.c (added)
• hid/remcons/remcons.h (added)
• hid/remcons/telnet.h (added)
• hid/remcons/user.c (added)
• hid/remcons/user.h (added)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)
• hw/bus/cuda_adb/cuda_adb.c (modified) (1 diff)
• hw/char/i8042/i8042.c (deleted)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (1 diff)
• loc/loc.c (modified) (8 diffs)
• net/cfg/e1k.nic (modified) (1 diff)
• net/cfg/lo.nic (modified) (1 diff)
• net/cfg/ne2k.nic (modified) (1 diff)
• net/net/Makefile (modified) (1 diff)
• net/net/net.c (modified) (13 diffs)
• net/net/net.h (modified) (3 diffs)
• net/nil/eth/eth.c (modified) (11 diffs)
• net/nil/eth/eth.h (modified) (2 diffs)
• net/nil/nildummy/nildummy.c (modified) (12 diffs)
• net/nil/nildummy/nildummy.h (modified) (2 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -245 +245 @@
         void *vaddr;
         int rc;
-
-        rc = loc_server_register(NAME, ata_bd_connection);
+        
+        async_set_client_connection(ata_bd_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");

uspace/srv/bd/file_bd/file_bd.c

@@ -141 +141 @@
         int rc;
         long img_size;
-
-        rc = loc_server_register(NAME, file_bd_connection);
+        
+        async_set_client_connection(file_bd_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -125 +125 @@
         int rc, i;
         char name[16];
-
-        rc = loc_server_register(NAME, gxe_bd_connection);
+        
+        async_set_client_connection(gxe_bd_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");

uspace/srv/bd/part/guid_part/guid_part.c

@@ -164 +164 @@
 
         /* Register server with location service. */
-        rc = loc_server_register(NAME, gpt_connection);
+        async_set_client_connection(gpt_connection);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf(NAME ": Unable to register server.\n");

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -214 +214 @@
 
         /* Register server with location service. */
-        rc = loc_server_register(NAME, mbr_connection);
+        async_set_client_connection(mbr_connection);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf(NAME ": Unable to register server.\n");

uspace/srv/bd/rd/rd.c

@@ -235 +235 @@
             (void *) addr_phys, size);
         
-        ret = loc_server_register(NAME, rd_connection);
+        async_set_client_connection(rd_connection);
+        ret = loc_server_register(NAME);
         if (ret < 0) {
                 printf("%s: Unable to register driver (%d)\n", NAME, ret);

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:
@@ -803 +800 @@
         default:
                 dev->state = DEVICE_INVALID;
+                break;
         }
         

uspace/srv/devman/main.c

@@ -1309 +1309 @@
 
         /*
-         * !!! devman_connection ... as the device manager is not a real loc
-         * driver (it uses a completely different ipc protocol than an ordinary
-         * loc driver) forwarding a connection from client to the devman by
-         * location service would not work.
+         * Caution: As the device manager is not a real loc
+         * driver (it uses a completely different IPC protocol
+         * than an ordinary loc driver), forwarding a connection
+         * from client to the devman by location service will
+         * not work.
          */
-        loc_server_register(NAME, devman_connection);
+        loc_server_register(NAME);
         
         return true;
@@ -1325 +1326 @@
         if (log_init(NAME, LVL_WARN) != EOK) {
                 printf(NAME ": Error initializing logging subsystem.\n");
-                return -1;
-        }
-
-        if (!devman_init()) {
-                log_msg(LVL_ERROR, "Error while initializing service.");
                 return -1;
         }
@@ -1338 +1334 @@
         async_set_client_connection(devman_connection);
 
+        if (!devman_init()) {
+                log_msg(LVL_ERROR, "Error while initializing service.");
+                return -1;
+        }
+
         /* Register device manager at naming service. */
         if (service_register(SERVICE_DEVMAN) != EOK) {

uspace/srv/hid/console/console.c

@@ -825 +825 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf("%s: Unable to register server (%s)\n", NAME,

uspace/srv/hid/fb/fb.c

@@ -987 +987 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register driver (%d)\n", NAME, rc);

uspace/srv/hid/input/Makefile

@@ -43 +43 @@
         port/adb_mouse.c \
         port/chardev.c \
-        port/chardev_mouse.c \
         port/gxemul.c \
         port/msim.c \
@@ -52 +51 @@
         proto/adb.c \
         proto/mousedev.c \
-        proto/ps2.c \
         ctl/apple.c \
         ctl/gxe_fb.c \

uspace/srv/hid/input/generic/input.c

@@ -39 +39 @@
 #include <adt/list.h>
 #include <bool.h>
+#include <fibril_synch.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
@@ -83 +84 @@
 async_sess_t *irc_sess = NULL;
 
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
+
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
 {
@@ -172 +175 @@
 
 /** Mouse pointer has moved. */
-void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy)
+void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy, int dz)
 {
         async_exch_t *exch = async_exchange_begin(client_sess);
-        async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+        if (dx || dy)
+                async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+        if (dz) {
+                // TODO: Implement proper wheel support
+                keycode_t code = dz > 0 ? KC_UP : KC_DOWN;
+                for (int i = 0; i < 3; ++i) {
+                        async_msg_4(exch, INPUT_EVENT_KEY, KEY_PRESS, code, 0, 0);
+                }
+                async_msg_4(exch, INPUT_EVENT_KEY, KEY_RELEASE, code, 0, 0);
+        }
         async_exchange_end(exch);
 }
@@ -397 +409 @@
          * them automatically.
          */
-#if defined(UARCH_amd64)
-        kbd_add_dev(&chardev_port, &pc_ctl);
-#endif
 #if defined(UARCH_arm32) && defined(MACHINE_gta02)
         kbd_add_dev(&chardev_port, &stty_ctl);
@@ -411 +420 @@
 #if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
         kbd_add_dev(&pl050_port, &pc_ctl);
-#endif
-#if defined(UARCH_ia32)
-        kbd_add_dev(&chardev_port, &pc_ctl);
-#endif
-#if defined(MACHINE_i460GX)
-        kbd_add_dev(&chardev_port, &pc_ctl);
 #endif
 #if defined(MACHINE_ski)
@@ -450 +453 @@
          * them automatically.
          */
-#if defined(UARCH_amd64)
-        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
-#endif
-#if defined(UARCH_ia32)
-        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
-#endif
-#if defined(MACHINE_i460GX)
-        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
-#endif
 #if defined(UARCH_ppc32)
         mouse_add_dev(&adb_mouse_port, &adb_proto);
@@ -602 +596 @@
         int rc;
         
+        fibril_mutex_lock(&discovery_lock);
+        
         rc = dev_check_new_kbdevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
+        }
         
         rc = dev_check_new_mousedevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
-
+        }
+        
+        fibril_mutex_unlock(&discovery_lock);
+        
         return EOK;
 }
@@ -658 +660 @@
         
         /* Register driver */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf("%s: Unable to register server (%d)\n", NAME, rc);

uspace/srv/hid/input/include/mouse.h

@@ -62 +62 @@
 
 extern void mouse_push_data(mouse_dev_t *, sysarg_t);
-extern void mouse_push_event_move(mouse_dev_t *, int, int);
+extern void mouse_push_event_move(mouse_dev_t *, int, int, int);
 extern void mouse_push_event_button(mouse_dev_t *, int, int);
 

uspace/srv/hid/input/include/mouse_proto.h

@@ -48 +48 @@
 
 extern mouse_proto_ops_t adb_proto;
-extern mouse_proto_ops_t ps2_proto;
 extern mouse_proto_ops_t mousedev_proto;
 

uspace/srv/hid/input/port/chardev.c

@@ -63 +63 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "char/ps2a",
         "char/s3c24ser"
 };

uspace/srv/hid/input/proto/adb.c

@@ -82 +82 @@
         
         if (dx != 0 || dy != 0)
-                mouse_push_event_move(mouse_dev, dx, dy);
+                mouse_push_event_move(mouse_dev, dx, dy, 0);
 }
 

uspace/srv/hid/input/proto/mousedev.c

@@ -91 +91 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case MOUSEEV_MOVE_EVENT:
-                        mouse_push_event_move(mousedev->mouse_dev, IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        mouse_push_event_move(mousedev->mouse_dev,
+                            IPC_GET_ARG1(call), IPC_GET_ARG2(call),
+                            IPC_GET_ARG3(call));
                         retval = EOK;
                         break;
                 case MOUSEEV_BUTTON_EVENT:
-                        mouse_push_event_button(mousedev->mouse_dev, IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        mouse_push_event_button(mousedev->mouse_dev,
+                            IPC_GET_ARG1(call), IPC_GET_ARG2(call));
                         retval = EOK;
                         break;

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -85 +85 @@
 
         printf(NAME ": S3C24xx touchscreen driver\n");
-
-        rc = loc_server_register(NAME, s3c24xx_ts_connection);
+        
+        async_set_client_connection(s3c24xx_ts_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -154 +154 @@
         }
 
-        rc = loc_server_register(NAME, cuda_connection);
+        async_set_client_connection(cuda_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register server.\n");

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -79 +79 @@
         printf(NAME ": S3C24xx on-chip UART driver\n");
 
-        rc = loc_server_register(NAME, s3c24xx_uart_connection);
+        async_set_client_connection(s3c24xx_uart_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register server.\n");

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);
@@ -86 +92 @@
 
 static FIBRIL_MUTEX_INITIALIZE(callback_sess_mutex);
-static async_sess_t *callback_sess = NULL;
+static LIST_INITIALIZE(callback_sess_list);
 
 service_id_t loc_create_id(void)
@@ -608 +614 @@
         size_t act_size;
         loc_service_t *svc;
+        char *fqn;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -625 +632 @@
         }
         
-        act_size = str_size(svc->name);
+        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);
         if (act_size > size) {
+                free(fqn);
                 fibril_mutex_unlock(&services_list_mutex);
                 async_answer_0(callid, EOVERFLOW);
@@ -633 +648 @@
         }
         
-        sysarg_t retval = async_data_read_finalize(callid, svc->name,
+        sysarg_t retval = async_data_read_finalize(callid, fqn,
             min(size, act_size));
+        free(fqn);
         
         fibril_mutex_unlock(&services_list_mutex);
@@ -790 +806 @@
 }
 
-/** Find ID for category specified by name.
- *
- * On success, answer will contain EOK int retval and service ID in arg1.
+/** Create callback connection.
+ *
+ * Create callback connection which will be used to send category change
+ * events.
+ *
+ * On success, answer will contain EOK int retval.
  * On failure, error code will be sent in retval.
- *
  */
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        async_sess_t *cb_sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        cb_sess_t *cb_sess;
+        
+        cb_sess = calloc(1, sizeof(cb_sess_t));
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);
@@ -804 +824 @@
         }
         
+        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);
-        if (callback_sess != NULL) {
-                fibril_mutex_unlock(&callback_sess_mutex);
-                async_answer_0(iid, EEXIST);
-                return;
-        }
-        
-        callback_sess = cb_sess;
+        list_append(&cb_sess->cb_sess_list, &callback_sess_list);
         fibril_mutex_unlock(&callback_sess_mutex);
         
@@ -820 +844 @@
 {
         fibril_mutex_lock(&callback_sess_mutex);
-
-        if (callback_sess != NULL) {
-                async_exch_t *exch = async_exchange_begin(callback_sess);
+        
+        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);
                 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=/hw/pci0/00:03.0/port0
+HWPATH=devices/\hw\pci0\00:03.0\port0
 NIL=eth
 IL=ip

uspace/srv/net/cfg/lo.nic

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

uspace/srv/net/cfg/ne2k.nic

@@ -3 +3 @@
 NAME=ne2k
 
-HWPATH=/hw/pci0/00:01.0/ne2k/port0
+HWPATH=devices/\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
+EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBNIC_PREFIX)/include \
+    -I$(LIBDRV_PREFIX)/include
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

uspace/srv/net/net/net.c

@@ -2 +2 @@
  * Copyright (c) 2009 Lukas Mejdrech
  * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +42 @@
 #include <stdio.h>
 #include <str.h>
-#include <devman.h>
 #include <str_error.h>
 #include <ns.h>
@@ -56 +56 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
+#include <fibril_synch.h>
+#include <loc.h>
+#include <nic.h>
 #include <nil_remote.h>
 #include <net_interface.h>
@@ -73 +76 @@
 GENERIC_CHAR_MAP_IMPLEMENT(measured_strings, measured_string_t);
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
+LIST_INITIALIZE(netif_list);
+
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
 
 /** Add the configured setting to the configuration map.
@@ -287 +293 @@
  *
  */
-static int init_device(netif_t *netif, devman_handle_t handle)
+static int init_device(netif_t *netif, service_id_t sid)
 {
         printf("%s: Initializing device '%s'\n", NAME, netif->name);
         
-        netif->handle = handle;
-        netif->sess = devman_device_connect(EXCHANGE_SERIALIZE, netif->handle,
+        netif->sid = sid;
+        netif->sess = loc_service_connect(EXCHANGE_SERIALIZE, netif->sid,
             IPC_FLAG_BLOCKING);
         if (netif->sess == NULL) {
@@ -337 +343 @@
                     strtol((const char *) setting->value, NULL, 10) : 0;
                 rc = nil_device_req(netif->nil->sess, netif->id,
-                    netif->handle, mtu);
+                    netif->sid, mtu);
                 if (rc != EOK) {
                         printf("%s: Unable to start network interface layer\n",
@@ -359 +365 @@
                 break;
         default:
+                printf("%s: Unknown service\n", NAME);
                 return ENOENT;
         }
         
         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_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)
+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);
                 return EINVAL;
+        }
         
         int index = char_map_find(&net_globals.netif_hwpaths,
             (uint8_t *) hwpath, 0);
-        if (index == CHAR_MAP_NULL)
+        
+        if (index == CHAR_MAP_NULL) {
+                printf("%s: Service '%s' not found in map.\n", NAME, hwpath);
+                free(hwpath);
                 return ENOENT;
+        }
+        
+        free(hwpath);
         
         netif_t *netif = netifs_get_index(&net_globals.netifs, index);
@@ -382 +401 @@
                 return ENOENT;
         
-        rc = init_device(netif, handle);
+        rc = init_device(netif, sid);
         if (rc != EOK)
                 return rc;
@@ -391 +410 @@
         
         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;
@@ -479 +481 @@
                 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;
@@ -528 +526 @@
                 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;
+
+        fibril_mutex_lock(&discovery_lock);
+
+        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);
+        fibril_mutex_unlock(&discovery_lock);
+        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();
 }
 
@@ -573 +638 @@
                                 continue;
                         
-                        netif->handle = -1;
+                        netif->sid = -1;
                         netif->sess = NULL;
                         
@@ -697 +762 @@
         }
         
+        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>
@@ -41 +42 @@
 #include <adt/module_map.h>
 #include <net/packet.h>
-#include <devman.h>
 
 #define NAME  "net"
@@ -96 +96 @@
         
         /** Serving network interface driver module index. */
-        devman_handle_t handle;  /**< Handle for devman */
+        service_id_t sid;  /**< Service ID */
         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>
@@ -169 +170 @@
 INT_MAP_IMPLEMENT(eth_protos, eth_proto_t);
 
-int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state)
+static void eth_nic_cb_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
+
+static int eth_device_state(nic_device_id_t device_id, sysarg_t state)
 {
         int index;
@@ -226 +230 @@
  *
  * @param[in] device_id New device identifier.
- * @param[in] handle    Device driver handle.
+ * @param[in] sid       NIC service ID.
  * @param[in] mtu       Device maximum transmission unit.
  *
@@ -234 +238 @@
  *
  */
-static int eth_device_message(nic_device_id_t device_id, devman_handle_t handle,
+static int eth_device_message(nic_device_id_t device_id, service_id_t sid,
     size_t mtu)
 {
@@ -259 +263 @@
         device = eth_devices_find(&eth_globals.devices, device_id);
         if (device) {
-                if (device->handle != handle) {
+                if (device->sid != sid) {
                         printf("Device %d already exists\n", device->device_id);
                         fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -298 +302 @@
 
         device->device_id = device_id;
-        device->handle = handle;
+        device->sid = sid;
         device->flags = 0;
         if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags)))
@@ -335 +339 @@
         
         /* Bind the device driver */
-        device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
+        device->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid,
             IPC_FLAG_BLOCKING);
         if (device->sess == NULL) {
@@ -343 +347 @@
         }
         
-        nic_connect_to_nil(device->sess, SERVICE_ETHERNET, device_id);
+        rc = nic_callback_create(device->sess, device_id,
+            eth_nic_cb_connection, NULL);
+        if (rc != EOK) {
+                fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+                async_hangup(device->sess);
+                free(device);
+                return EIO;
+        }
         
         /* Get hardware address */
@@ -362 +373 @@
         }
         
-        printf("%s: Device registered (id: %d, handle: %zu: mtu: %zu, "
+        printf("%s: Device registered (id: %d, sid: %zu: mtu: %zu, "
             "mac: " PRIMAC ", flags: 0x%x)\n", NAME,
-            device->device_id, device->handle, device->mtu,
+            device->device_id, device->sid, device->mtu,
             ARGSMAC(device->addr.address), device->flags);
 
@@ -802 +813 @@
                         next = tmp;
                 } else {
+                        nic_send_frame(device->sess, packet_get_data(next),
+                            packet_get_data_length(next));
                         next = pq_next(next);
                 }
         } while (next);
         
-        /* Send packet queue */
-        if (packet)
-                nic_send_message(device->sess, packet_get_id(packet));
+        pq_release_remote(eth_globals.net_sess, packet_get_id(packet));
         
         fibril_rwlock_read_unlock(&eth_globals.devices_lock);
         return EOK;
+}
+
+static int eth_received(nic_device_id_t device_id)
+{
+        void *data;
+        size_t size;
+        int rc;
+        
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK) {
+                printf("%s: data_write_accept() failed\n", NAME);
+                return rc;
+        }
+        
+        packet_t *packet = packet_get_1_remote(eth_globals.net_sess, size);
+        if (packet == NULL)
+                return ENOMEM;
+        
+        void *pdata = packet_suffix(packet, size);
+        memcpy(pdata, data, size);
+        free(data);
+        
+        return nil_received_msg_local(device_id, packet);
 }
 
@@ -921 +955 @@
                 
                 return EOK;
-        case NET_NIL_DEVICE_STATE:
-                nil_device_state_msg_local(IPC_GET_DEVICE(*call), IPC_GET_STATE(*call));
-                async_answer_0(callid, EOK);
-                return EOK;
-        case NET_NIL_RECEIVED:
-                rc = packet_translate_remote(eth_globals.net_sess, &packet,
-                    IPC_GET_ARG2(*call));
-                if (rc == EOK)
-                        rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet);
-                
-                async_answer_0(callid, (sysarg_t) rc);
-                return rc;
-        case NET_NIL_ADDR_CHANGED:
-                rc = eth_addr_changed(IPC_GET_DEVICE(*call));
-                async_answer_0(callid, (sysarg_t) rc);
-                return rc;
         }
         
         return ENOTSUP;
+}
+
+static void eth_nic_cb_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        int rc;
+        
+        async_answer_0(iid, EOK);
+        
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
+                switch (IPC_GET_IMETHOD(call)) {
+                case NIC_EV_DEVICE_STATE:
+                        rc = eth_device_state(IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                case NIC_EV_RECEIVED:
+                        rc = eth_received(IPC_GET_ARG1(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                case NIC_EV_ADDR_CHANGED:
+                        rc = eth_addr_changed(IPC_GET_ARG1(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
+                }
+        }
 }
 

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 */
-        devman_handle_t handle;
+        service_id_t sid;
         /** Driver session. */
         async_sess_t *sess;

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

@@ -2 +2 @@
  * Copyright (c) 2009 Lukas Mejdrech
  * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +54 @@
 #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"
@@ -69 +70 @@
 DEVICE_MAP_IMPLEMENT(nildummy_devices, nildummy_device_t);
 
-int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state)
+static void nildummy_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
+
+static int nildummy_device_state(nic_device_id_t device_id, sysarg_t state)
 {
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
@@ -78 +82 @@
         
         return EOK;
+}
+
+static int nildummy_addr_changed(nic_device_id_t device_id)
+{
+        return ENOTSUP;
 }
 
@@ -115 +124 @@
  */
 static int nildummy_device_message(nic_device_id_t device_id,
-    devman_handle_t handle, size_t mtu)
+    service_id_t sid, size_t mtu)
 {
         fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
@@ -123 +132 @@
             nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (device) {
-                if (device->handle != handle) {
+                if (device->sid != sid) {
                         printf("Device %d exists, handles do not match\n",
                             device->device_id);
@@ -158 +167 @@
         
         device->device_id = device_id;
-        device->handle = handle;
+        device->sid = sid;
         if (mtu > 0)
                 device->mtu = mtu;
@@ -165 +174 @@
         
         /* Bind the device driver */
-        device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
+        device->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid,
             IPC_FLAG_BLOCKING);
         if (device->sess == NULL) {
@@ -173 +182 @@
         }
         
-        nic_connect_to_nil(device->sess, SERVICE_NILDUMMY, device_id);
+        int rc = nic_callback_create(device->sess, device_id,
+            nildummy_nic_cb_conn, NULL);
+        if (rc != EOK) {
+                async_hangup(device->sess);
+                
+                return ENOENT;
+        }
         
         /* Get hardware address */
-        int rc = nic_get_address(device->sess, &device->addr);
+        rc = nic_get_address(device->sess, &device->addr);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
@@ -345 +360 @@
     services_t sender)
 {
+        packet_t *p;
+        
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
         
@@ -354 +371 @@
         }
         
-        /* Send packet queue */
-        if (packet)
-                nic_send_message(device->sess, packet_get_id(packet));
+        p = packet;
+        do {
+                nic_send_frame(device->sess, packet_get_data(p),
+                    packet_get_data_length(p));
+                p = pq_next(p);
+        } while (p != NULL);
+        
+        pq_release_remote(nildummy_globals.net_sess, packet_get_id(packet));
         
         fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
         
         return EOK;
+}
+
+static int nildummy_received(nic_device_id_t device_id)
+{
+        void *data;
+        size_t size;
+        int rc;
+
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK)
+                return rc;
+
+        packet_t *packet = packet_get_1_remote(nildummy_globals.net_sess, size);
+        if (packet == NULL)
+                return ENOMEM;
+
+        void *pdata = packet_suffix(packet, size);
+        memcpy(pdata, data, size);
+        free(pdata);
+
+        return nil_received_msg_local(device_id, packet);
 }
 
@@ -417 +460 @@
                 *answer_count = 1;
                 return rc;
-        case NET_NIL_DEVICE_STATE:
-                rc = nil_device_state_msg_local(IPC_GET_DEVICE(*call),
-                    IPC_GET_STATE(*call));
-                async_answer_0(callid, (sysarg_t) rc);
-                return rc;
-        
-        case NET_NIL_RECEIVED:
-                rc = packet_translate_remote(nildummy_globals.net_sess, &packet,
-                    IPC_GET_ARG2(*call));
-                if (rc == EOK)
-                        rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet);
-                
-                async_answer_0(callid, (sysarg_t) rc);
-                return rc;
         }
         
         return ENOTSUP;
 }
+
+static void nildummy_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        int rc;
+        
+        async_answer_0(iid, EOK);
+        
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
+                switch (IPC_GET_IMETHOD(call)) {
+                case NIC_EV_DEVICE_STATE:
+                        rc = nildummy_device_state(IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                case NIC_EV_RECEIVED:
+                        rc = nildummy_received(IPC_GET_ARG1(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                case NIC_EV_ADDR_CHANGED:
+                        rc = nildummy_addr_changed(IPC_GET_ARG1(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
+                }
+        }
+}
+
 
 int main(int argc, char *argv[])

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 driver handle. */
-        devman_handle_t handle;
+        /** Device service ID. */
+        service_id_t sid;
         /** Driver session. */
         async_sess_t *sess;