Changeset eb1a2f4 in mainline for uspace/drv/uhci-rhd

Timestamp:

2011-02-22T23:30:56Z (15 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

Location:

uspace/drv/uhci-rhd

Files:

• main.c (modified) (5 diffs)
• port.c (modified) (2 diffs)
• port.h (modified) (3 diffs)
• root_hub.c (modified) (2 diffs)
• root_hub.h (modified) (2 diffs)

uspace/drv/uhci-rhd/main.c

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#include <driver.h>
+#include <ddf/driver.h>
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
@@ -44 +44 @@
 #define NAME "uhci-rhd"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        assert(dev);
-        assert(dev->driver_data);
+        assert(fun);
+        assert(fun->driver_data);
         assert(handle);
 
-        *handle = ((uhci_root_hub_t*)dev->driver_data)->hc_handle;
-        usb_log_debug("Answering HC handle: %d.\n", *handle);
+        *handle = ((uhci_root_hub_t*)fun->driver_data)->hc_handle;
 
         return EOK;
@@ -61 +60 @@
 };
 
-static device_ops_t uhci_rh_ops = {
+static ddf_dev_ops_t uhci_rh_ops = {
         .interfaces[USB_DEV_IFACE] = &uhci_rh_usb_iface,
 };
 
-static int uhci_rh_add_device(device_t *device)
+static int uhci_rh_add_device(ddf_dev_t *device)
 {
         if (!device)
@@ -71 +70 @@
 
         usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
-        device->ops = &uhci_rh_ops;
+
+        //device->ops = &uhci_rh_ops;
+        (void) uhci_rh_ops;
 
         uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
@@ -104 +105 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_ERROR, NAME);
-        return driver_main(&uhci_rh_driver);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        return ddf_driver_main(&uhci_rh_driver);
 }
 /**

uspace/drv/uhci-rhd/port.c

@@ -52 +52 @@
 int uhci_port_init(
   uhci_port_t *port, port_status_t *address, unsigned number,
-  unsigned usec, device_t *rh, int parent_phone)
+  unsigned usec, ddf_dev_t *rh, int parent_phone)
 {
         assert(port);
@@ -187 +187 @@
             USB_SPEED_FULL,
             new_device_enable_port, port->number, port,
-            &dev_addr, &port->attached_device);
+            &dev_addr, &port->attached_device, NULL, NULL, NULL);
         if (rc != EOK) {
                 usb_log_error("Failed adding new device on port %u: %s.\n",

uspace/drv/uhci-rhd/port.h

@@ -36 +36 @@
 
 #include <assert.h>
-#include <driver.h> /* device_t */
+#include <ddf/driver.h>
 #include <stdint.h>
 #include <usb/usbdevice.h>
@@ -48 +48 @@
         unsigned wait_period_usec;
         usb_hc_connection_t hc_connection;
-        device_t *rh;
+        ddf_dev_t *rh;
         devman_handle_t attached_device;
         fid_t checker;
@@ -55 +55 @@
 int uhci_port_init(
   uhci_port_t *port, port_status_t *address, unsigned number,
-  unsigned usec, device_t *rh, int parent_phone);
+  unsigned usec, ddf_dev_t *rh, int parent_phone);
 
 void uhci_port_fini(uhci_port_t *port);

uspace/drv/uhci-rhd/root_hub.c

@@ -34 +34 @@
 #include <errno.h>
 #include <stdint.h>
-
+#include <ddi.h>
+#include <devman.h>
 #include <usb/debug.h>
 
@@ -41 +42 @@
 
 int uhci_root_hub_init(
-  uhci_root_hub_t *instance, void *addr, size_t size, device_t *rh)
+  uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh)
 {
         assert(instance);

uspace/drv/uhci-rhd/root_hub.h

@@ -36 +36 @@
 
 #include <fibril.h>
-#include <driver.h> /* for device_t */
+#include <ddf/driver.h>
 
 #include "port.h"
@@ -50 +50 @@
 
 int uhci_root_hub_init(
-  uhci_root_hub_t *instance, void *addr, size_t size, device_t *rh);
+  uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh);
 
 int uhci_root_hub_fini(uhci_root_hub_t *instance);