Changeset eb1a2f4 in mainline for uspace/lib/drv/include/usbhc_iface.h

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/lib/drv/include/usbhc_iface.h (modified) (5 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -38 +38 @@
 #define LIBDRV_USBHC_IFACE_H_
 
-#include "driver.h"
+#include "ddf/driver.h"
 #include <usb/usb.h>
 #include <bool.h>
@@ -171 +171 @@
 
 /** Callback for outgoing transfer. */
-typedef void (*usbhc_iface_transfer_out_callback_t)(device_t *,
+typedef void (*usbhc_iface_transfer_out_callback_t)(ddf_fun_t *,
     int, void *);
 
 /** Callback for incoming transfer. */
-typedef void (*usbhc_iface_transfer_in_callback_t)(device_t *,
+typedef void (*usbhc_iface_transfer_in_callback_t)(ddf_fun_t *,
     int, size_t, void *);
 
 
 /** Out transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_out_t)(ddf_fun_t *, usb_target_t, size_t,
     void *, size_t,
     usbhc_iface_transfer_out_callback_t, void *);
@@ -188 +188 @@
 
 /** In transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_in_t)(ddf_fun_t *, usb_target_t, size_t,
     void *, size_t,
     usbhc_iface_transfer_in_callback_t, void *);
@@ -194 +194 @@
 /** USB host controller communication interface. */
 typedef struct {
-        int (*reserve_default_address)(device_t *, usb_speed_t);
-        int (*release_default_address)(device_t *);
-        int (*request_address)(device_t *, usb_speed_t, usb_address_t *);
-        int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
-        int (*release_address)(device_t *, usb_address_t);
+        int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
+        int (*release_default_address)(ddf_fun_t *);
+        int (*request_address)(ddf_fun_t *, usb_speed_t, usb_address_t *);
+        int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t);
+        int (*release_address)(ddf_fun_t *, usb_address_t);
 
         usbhc_iface_transfer_out_t interrupt_out;
@@ -206 +206 @@
         usbhc_iface_transfer_in_t bulk_in;
 
-        int (*control_write)(device_t *, usb_target_t,
+        int (*control_write)(ddf_fun_t *, usb_target_t,
             size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_out_callback_t, void *);
 
-        int (*control_read)(device_t *, usb_target_t,
+        int (*control_read)(ddf_fun_t *, usb_target_t,
             size_t,
             void *, size_t, void *, size_t,