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

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.c (moved) (moved from uspace/drv/uhci/pci.c ) (3 diffs)

uspace/drv/uhci-hcd/pci.c

@@ -34 +34 @@
  * PCI related functions needed by the UHCI driver.
  */
-#include "uhci.h"
 #include <errno.h>
 #include <assert.h>
 #include <devman.h>
 #include <device/hw_res.h>
+
+#include "pci.h"
 
 /** Get address of registers and IRQ for given device.
@@ -116 +117 @@
         rc = EOK;
 leave:
-        ipc_hangup(parent_phone);
+        async_hangup(parent_phone);
 
         return rc;
@@ -125 +126 @@
  */
 
+/**
+ * @}
+ */