Changeset eb1a2f4 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-02-22T23:30:56Z (13 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/usbhub/usbhub.c (modified) (8 diffs)

uspace/drv/usbhub/usbhub.c

@@ -33 +33 @@
  */
 
-#include <driver.h>
+#include <ddf/driver.h>
 #include <bool.h>
 #include <errno.h>
@@ -52 +52 @@
 #include "usb/classes/classes.h"
 
-static device_ops_t hub_device_ops = {
+static ddf_dev_ops_t hub_device_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };
@@ -79 +79 @@
  */
 static int usb_hub_init_communication(usb_hub_info_t * hub){
+        usb_log_debug("Initializing hub USB communication (hub->device->handle=%zu).\n", hub->device->handle);
         int opResult;
         opResult = usb_device_connection_initialize_from_device(
@@ -88 +89 @@
                 return opResult;
         }
+        usb_log_debug("Initializing USB wire abstraction.\n");
         opResult = usb_hc_connection_initialize_from_device(&hub->connection,
                         hub->device);
@@ -95 +97 @@
                 return opResult;
         }
+        usb_log_debug("Initializing default control pipe.\n");
         opResult = usb_endpoint_pipe_initialize_default_control(&hub->endpoints.control,
             &hub->device_connection);
@@ -222 +225 @@
  * @return pointer to created structure or NULL in case of error
  */
-usb_hub_info_t * usb_create_hub_info(device_t * device) {
+usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device) {
         usb_hub_info_t* result = usb_new(usb_hub_info_t);
         result->device = device;
@@ -291 +294 @@
  * @return
  */
-int usb_add_hub_device(device_t *dev) {
+int usb_add_hub_device(ddf_dev_t *dev) {
         dprintf(USB_LOG_LEVEL_INFO, "add_hub_device(handle=%d)", (int) dev->handle);
 
-        dev->ops = &hub_device_ops;
+        //dev->ops = &hub_device_ops;
+        (void) hub_device_ops;
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev);
@@ -450 +454 @@
         //??
     opResult = usb_device_register_child_in_devman(new_device_address,
-            hub->connection.hc_handle, hub->device, &child_handle);
+            hub->connection.hc_handle, hub->device, &child_handle,
+            NULL, NULL, NULL);
 
         if (opResult != EOK) {