Changeset 948911d in mainline for uspace/lib/drv

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/lib/drv

Files:

• generic/driver.c (modified) (3 diffs)
• generic/remote_nic.c (modified) (2 diffs)
• include/ddf/driver.h (modified) (1 diff)
• include/ops/nic.h (modified) (2 diffs)

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)
 {
@@ -460 +450 @@
                 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:
@@ -1016 +1002 @@
          * incoming connections.
          */
-        rc = devman_driver_register(driver->name, driver_connection);
+        async_set_client_connection(driver_connection);
+        rc = devman_driver_register(driver->name);
         if (rc != EOK) {
                 printf("Error: Failed to register driver with device manager "

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);
+        
+        nic_device_id_t device_id = (nic_device_id_t) IPC_GET_ARG2(*call);
+        
+        int rc = nic_iface->callback_create(dev, device_id);
         async_answer_0(callid, rc);
 }
@@ -1194 +1201 @@
  */
 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,

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/drv/include/ops/nic.h

@@ -37 +37 @@
 #define LIBDRV_OPS_NIC_H_
 
-#include <net/packet.h>
 #include <ipc/services.h>
-#include <net/device.h>
+#include <nic/nic.h>
 #include <sys/time.h>
 
@@ -46 +45 @@
 typedef struct nic_iface {
         /** Mandatory methods */
-        int (*send_message)(ddf_fun_t *, packet_id_t);
-        int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t);
+        int (*send_frame)(ddf_fun_t *, void *, size_t);
+        int (*callback_create)(ddf_fun_t *, nic_device_id_t);
         int (*get_state)(ddf_fun_t *, nic_device_state_t *);
         int (*set_state)(ddf_fun_t *, nic_device_state_t);