Changeset cfb79747 in mainline for uspace/lib/drv/generic/remote_nic.c

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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/drv/generic/remote_nic.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_nic.c

@@ -63 +63 @@
 }
 
-static void remote_nic_connect_to_nil(ddf_fun_t *dev, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        nic_iface_t *nic_iface = (nic_iface_t *) iface;
-        assert(nic_iface->connect_to_nil);
-        
-        services_t nil_service = (services_t) IPC_GET_ARG2(*call);
-        nic_device_id_t device_id = (nic_device_id_t) IPC_GET_ARG3(*call);
-        
-        int rc = nic_iface->connect_to_nil(dev, nil_service, device_id);
+static void remote_nic_callback_create(ddf_fun_t *dev, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        nic_iface_t *nic_iface = (nic_iface_t *) iface;
+        assert(nic_iface->callback_create);
+        
+        int rc = nic_iface->callback_create(dev);
         async_answer_0(callid, rc);
 }
@@ -1203 +1200 @@
 static remote_iface_func_ptr_t remote_nic_iface_ops[] = {
         &remote_nic_send_frame,
-        &remote_nic_connect_to_nil,
+        &remote_nic_callback_create,
         &remote_nic_get_state,
         &remote_nic_set_state,