Changeset 92574f4 in mainline for uspace/drv/uhci-hcd/pci.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/drv/uhci-hcd/pci.h (moved) (moved from uspace/drv/uhci/uhci.h ) (2 diffs)

uspace/drv/uhci-hcd/pci.h

@@ -33 +33 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_UHCI_H
-#define DRV_UHCI_UHCI_H
+#ifndef DRV_UHCI_PCI_H
+#define DRV_UHCI_PCI_H
 
-#include <usbhc_iface.h>
+#include <ddf/driver.h>
 
-#define NAME "uhci"
-
-usbhc_iface_t uhci_iface;
-
-int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
+int pci_get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
+int pci_enable_interrupts(ddf_dev_t *);
 
 #endif
@@ -48 +45 @@
  * @}
  */
+