Changeset ca56afa in mainline for uspace/drv/uhci-hcd/pci.c

Timestamp:

2011-02-25T09:46:23Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d493ac17

Parents:

15b0432 (diff), a80849c (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 with /usb/development

File:

• uspace/drv/uhci-hcd/pci.c (modified) (2 diffs)

uspace/drv/uhci-hcd/pci.c

@@ -49 +49 @@
  * @return Error code.
  */
-int pci_get_my_registers(device_t *dev,
+int pci_get_my_registers(ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size,
     int *irq_no)
@@ -122 +122 @@
 }
 /*----------------------------------------------------------------------------*/
-int pci_enable_interrupts(device_t *device)
+int pci_enable_interrupts(ddf_dev_t *device)
 {
         int parent_phone = devman_parent_device_connect(device->handle,