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

uspace/drv/uhci-hcd/batch.c

@@ -51 +51 @@
 
 
-batch_t * batch_get(device_t *dev, usb_target_t target,
+batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
     dev_speed_t speed, char *buffer, size_t size,
@@ -128 +128 @@
         instance->buffer_size = size;
         instance->setup_size = setup_size;
-        instance->dev = dev;
+        instance->fun = fun;
         instance->arg = arg;
         instance->speed = speed;
@@ -291 +291 @@
             err, instance->transfered_size);
 
-        instance->callback_in(instance->dev,
+        instance->callback_in(instance->fun,
             err, instance->transfered_size,
             instance->arg);
@@ -303 +303 @@
         int err = instance->error;
         usb_log_info("Callback OUT(%d): %d.\n", instance->transfer_type, err);
-        instance->callback_out(instance->dev,
+        instance->callback_out(instance->fun,
             err, instance->arg);
 }
@@ -334 +334 @@
 {
         assert(instance);
-        uhci_t *hc = dev_to_uhci(instance->dev);
+        uhci_t *hc = fun_to_uhci(instance->fun);
         assert(hc);
         return uhci_schedule(hc, instance);