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

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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) (3 diffs)

uspace/lib/drv/generic/remote_nic.c

@@ -39 +39 @@
 #include <errno.h>
 #include <ipc/services.h>
-#include <adt/measured_strings.h>
 #include <sys/time.h>
 #include "ops/nic.h"
 
-static void remote_nic_send_message(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->send_message);
-        
-        packet_id_t packet_id = (packet_id_t) IPC_GET_ARG2(*call);
-        
-        int rc = nic_iface->send_message(dev, packet_id);
-        async_answer_0(callid, rc);
-}
-
-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_send_frame(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->send_frame);
+        
+        void *data;
+        size_t size;
+        int rc;
+        
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK) {
+                async_answer_0(callid, EINVAL);
+                return;
+        }
+        
+        rc = nic_iface->send_frame(dev, data, size);
+        async_answer_0(callid, rc);
+        free(data);
+}
+
+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);
 }
@@ -829 +834 @@
         
         uint16_t tag = (uint16_t) IPC_GET_ARG2(*call);
-        int add = (int) IPC_GET_ARG3(*call);
-        int strip = (int) IPC_GET_ARG4(*call);
+        bool add = (int) IPC_GET_ARG3(*call);
+        bool strip = (int) IPC_GET_ARG4(*call);
         
         int rc = nic_iface->vlan_set_tag(dev, tag, add, strip);
@@ -1194 +1199 @@
  */
 static remote_iface_func_ptr_t remote_nic_iface_ops[] = {
-        &remote_nic_send_message,
-        &remote_nic_connect_to_nil,
+        &remote_nic_send_frame,
+        &remote_nic_callback_create,
         &remote_nic_get_state,
         &remote_nic_set_state,