Changeset 6843a9c in mainline for uspace/drv/bus/usb/ohci/res.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/drv/bus/usb/ohci/res.h (moved) (moved from uspace/drv/bus/usb/ohci/pci.h ) (1 diff)

uspace/drv/bus/usb/ohci/res.h

@@ -32 +32 @@
  * PCI related functions needed by OHCI driver.
  */
-#ifndef DRV_OHCI_PCI_H
-#define DRV_OHCI_PCI_H
+#ifndef DRV_OHCI_RES_H
+#define DRV_OHCI_RES_H
 
 #include <ddf/driver.h>
 
-int pci_get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
-int pci_enable_interrupts(ddf_dev_t *);
-int pci_disable_legacy(ddf_dev_t *);
+int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
+int enable_interrupts(const ddf_dev_t *);
 
 #endif