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

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.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.
@@ -48 +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)
@@ -116 +117 @@
         rc = EOK;
 leave:
-        ipc_hangup(parent_phone);
+        async_hangup(parent_phone);
 
         return rc;
 }
+/*----------------------------------------------------------------------------*/
+int pci_enable_interrupts(ddf_dev_t *device)
+{
+        int parent_phone = devman_parent_device_connect(device->handle,
+            IPC_FLAG_BLOCKING);
+        bool enabled = hw_res_enable_interrupt(parent_phone);
+        return enabled ? EOK : EIO;
+}
+/**
+ * @}
+ */
 
 /**
  * @}
  */
-