Changeset c6588ce in mainline for uspace/drv/bus/usb/ohci/res.c

Timestamp:

2012-05-05T08:12:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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.

File:

• uspace/drv/bus/usb/ohci/res.c (moved) (moved from uspace/drv/bus/usb/ohci/pci.c ) (4 diffs)

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

@@ -38 +38 @@
 #include <errno.h>
 #include <assert.h>
-#include <as.h>
 #include <devman.h>
-#include <ddi.h>
-#include <libarch/ddi.h>
 #include <device/hw_res_parsed.h>
 
 #include <usb/debug.h>
-#include <pci_dev_iface.h>
 
-#include "pci.h"
+#include "res.h"
 
 /** Get address of registers and IRQ for given device.
@@ -57 +53 @@
  * @return Error code.
  */
-int pci_get_my_registers(ddf_dev_t *dev,
+int get_my_registers(const ddf_dev_t *dev,
     uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
 {
@@ -98 +94 @@
  * @return Error code.
  */
-int pci_enable_interrupts(ddf_dev_t *device)
+int enable_interrupts(const ddf_dev_t *device)
 {
         async_sess_t *parent_sess =
@@ -106 +102 @@
                 return ENOMEM;
         
-        bool enabled = hw_res_enable_interrupt(parent_sess);
+        const bool enabled = hw_res_enable_interrupt(parent_sess);
         async_hangup(parent_sess);