Changeset a09128c in mainline for uspace/drv/uhci/main.c

Timestamp:

2011-01-28T21:43:12Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0c3beeb, 4687fcd4, c2772b8

Parents:

c113056 (diff), 632ed68 (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: Doc update, usbkbd is usbhid, PCI I/O regs

Renamed usbkbd driver to usbhid.

Implemented ticket 46 (Get addresses of I/O registers from PCI).

Add some Doxygen groups (for usbhid driver and usbinfo application).

File:

• uspace/drv/uhci/main.c (modified) (2 diffs)

uspace/drv/uhci/main.c

@@ -30 +30 @@
 #include <usb/debug.h>
 #include <errno.h>
+#include <str_error.h>
 #include <driver.h>
 #include "uhci.h"
@@ -55 +56 @@
         usb_dprintf(NAME, 1, "uhci_add_device() called\n");
         device->ops = &uhci_ops;
+
+        uintptr_t io_reg_base;
+        size_t io_reg_size;
+        int irq;
+
+        int rc = pci_get_my_registers(device,
+            &io_reg_base, &io_reg_size, &irq);
+
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to get I/O registers addresses: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
+            io_reg_base, io_reg_size, irq);
 
         /*