Changeset eaa0c3f in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2012-01-21T23:55:03Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c38e417

Parents:

86c71de (diff), e98fe28c (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 with mainline

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (5 diffs)

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,
-    devman_handle_t handle, size_t mtu)
+    service_id_t sid, 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->handle != handle) {
+                if (device->sid != sid) {
                         printf("Device %d exists, handles do not match\n",
                             device->device_id);
@@ -158 +158 @@
         
         device->device_id = device_id;
-        device->handle = handle;
+        device->sid = sid;
         if (mtu > 0)
                 device->mtu = mtu;
@@ -165 +165 @@
         
         /* 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) {