Changeset eb1a2f4 in mainline for uspace/drv/uhci-hcd/uhci.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/drv/uhci-hcd/uhci.h (modified) (3 diffs)

uspace/drv/uhci-hcd/uhci.h

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <adt/list.h>
+#include <ddi.h>
 
 #include <usb/addrkeep.h>
@@ -97 +98 @@
         fid_t cleaner;
         fid_t debug_checker;
+
+        ddf_fun_t *ddf_instance;
 } uhci_t;
 
 /* init uhci specifics in device.driver_data */
-int uhci_init(uhci_t *instance, void *regs, size_t reg_size);
+int uhci_init(uhci_t *instance, ddf_dev_t *dev, void *regs, size_t reg_size);
 
 static inline void uhci_fini(uhci_t *instance) {};
@@ -108 +111 @@
 void uhci_interrupt(uhci_t *instance, uint16_t status);
 
-static inline uhci_t * dev_to_uhci(device_t *dev)
+static inline uhci_t * dev_to_uhci(ddf_dev_t *dev)
         { return (uhci_t*)dev->driver_data; }
+
+static inline uhci_t * fun_to_uhci(ddf_fun_t *fun)
+        { return (uhci_t*)fun->driver_data; }