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

Timestamp:

2011-02-28T13:04:21Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0b5644c, 494eaf7, 51b46f2

Parents:

81c508c (diff), dced52a (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:

hc and rh work

Support for low speed devices
RH iospace obtained from parent hc driver
proper hc initialization
Debug messages reworked
intelpci adressspace size fix (read the warning)

File:

• uspace/drv/uhci-hcd/pci.c (modified) (4 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_debug2("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_debug2("Found io: %llx %zu.\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;
@@ -127 +125 @@
             IPC_FLAG_BLOCKING);
         bool enabled = hw_res_enable_interrupt(parent_phone);
+        async_hangup(parent_phone);
         return enabled ? EOK : EIO;
 }