Changeset 2d33eb5 in mainline

Timestamp:

2011-02-25T20:21:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cabda7f

Parents:

013e4ca4

Message:

Use what we have found (even if it's 0)

add debug output

File:

• uspace/drv/uhci-hcd/pci.c (modified) (3 diffs)

uspace/drv/uhci-hcd/pci.c

@@ -38 +38 @@
 #include <devman.h>
 #include <device/hw_res.h>
+
+#include <usb/debug.h>
 
 #include "pci.h"
@@ -83 +85 @@
                                 irq = res->res.interrupt.irq;
                                 irq_found = true;
+                                usb_log_debug("Found interrupt: %d.\n", irq);
                                 break;
                         case IO_RANGE:
-                                io_address = (uintptr_t)
-                                    res->res.io_range.address;
+                                io_address = res->res.io_range.address;
                                 io_size = res->res.io_range.size;
+                                usb_log_debug("Found io: %x %d.\n",
+                                    res->res.io_range.address, res->res.io_range.size);
                                 io_found = true;
                                 break;
@@ -105 +109 @@
         }
 
-        if (io_reg_address != NULL) {
-                *io_reg_address = io_address;
-        }
-        if (io_reg_size != NULL) {
-                *io_reg_size = io_size;
-        }
-        if (irq_no != NULL) {
-                *irq_no = irq;
-        }
+        *io_reg_address = io_address;
+        *io_reg_size = io_size;
+        *irq_no = irq;
 
         rc = EOK;