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

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

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>
-
-#define NAME "uhci"
-
-usbhc_iface_t uhci_iface;
+#include <driver.h>
 
 int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
@@ -48 +44 @@
  * @}
  */
+