Changeset eb1a2f4 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-02-22T23:30:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3b5d1535, a9c674e0

Parents:

dbe25f1 (diff), 664af708 (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 (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

• drivers uses ddf_dev_t and ddf_fun_t
• different signatures of many library functions
• several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
  • will repair and clean later
• maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

• the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
• merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

• hub driver will not work (no function created)

GOOD NEWS:

• QEMU keyboard seems to work with QEMU 0.13 and 0.14
• we are up-to-date with mainline again

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);
 }