Changeset 233e68d in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-02-23T18:28:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e9e58ea3

Parents:

deece2f (diff), a9c674e0 (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:

Devel changes

File:

• uspace/drv/usbhid/main.c (modified) (9 diffs)

uspace/drv/usbhid/main.c

@@ -36 +36 @@
  */
 
-#include <driver.h>
+#include <ddf/driver.h>
 #include <ipc/driver.h>
 #include <ipc/kbd.h>
@@ -72 +72 @@
 };
 
-static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);
-static device_ops_t keyboard_ops = {
+static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static ddf_dev_ops_t keyboard_ops = {
         .default_handler = default_connection_handler
 };
@@ -85 +85 @@
  * @param icall Call data.
  */
-void default_connection_handler(device_t *dev,
+void default_connection_handler(ddf_fun_t *fun,
     ipc_callid_t icallid, ipc_call_t *icall)
 {
@@ -413 +413 @@
 }
 
-static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
+static usb_hid_dev_kbd_t *usbkbd_init_device(ddf_dev_t *dev)
 {
         int rc;
@@ -554 +554 @@
         }
 
-        device_t *dev = (device_t *)arg;
+        ddf_dev_t *dev = (ddf_dev_t *)arg;
 
         // initialize device (get and process descriptors, get address, etc.)
@@ -568 +568 @@
 }
 
-static int usbkbd_add_device(device_t *dev)
+static int usbkbd_add_device(ddf_dev_t *dev)
 {
         /* For now, fail immediately. */
@@ -590 +590 @@
 
         /*
+         * Create default function.
+         */
+        // FIXME - check for errors
+        ddf_fun_t *kbd_fun = ddf_fun_create(dev, fun_exposed, "keyboard");
+        assert(kbd_fun != NULL);
+        kbd_fun->ops = &keyboard_ops;
+
+        int rc = ddf_fun_bind(kbd_fun);
+        assert(rc == EOK);
+        rc = ddf_fun_add_to_class(kbd_fun, "keyboard");
+        assert(rc == EOK);
+
+        /*
          * Create new fibril for handling this keyboard
          */
@@ -599 +612 @@
         fibril_add_ready(fid);
 
-        dev->ops = &keyboard_ops;
-
-        add_device_to_class(dev, "keyboard");
+        //dev->ops = &keyboard_ops;
+        (void)keyboard_ops;
+
+        //add_device_to_class(dev, "keyboard");
 
         /*
@@ -621 +635 @@
 {
         usb_log_enable(USB_LOG_LEVEL_INFO, "usbhid");
-        return driver_main(&kbd_driver);
+        return ddf_driver_main(&kbd_driver);
 }