Changeset 4687fcd4 in mainline for uspace/drv/uhci/uhci.c

Timestamp:

2011-01-29T10:19:04Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

72e19f50

Parents:

67a1b78 (diff), a09128c (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:

Changes from devel, break stuff.

File:

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

uspace/drv/uhci/uhci.c

@@ -13 +13 @@
 static int uhci_debug_checker(void *arg);
 
-int uhci_init(device_t *device, void *regs)
+int uhci_init(device_t *device, void *regs, size_t reg_size)
 {
         assert(device);
@@ -40 +40 @@
         /* allow access to hc control registers */
         regs_t *io;
-        ret = pio_enable(regs, sizeof(regs_t), (void**)&io);
+        assert(reg_size >= sizeof(regs_t));
+        ret = pio_enable(regs, reg_size, (void**)&io);
         CHECK_RET_FREE_INSTANCE("Failed to gain access to registers at %p.\n", io);
         instance->registers = io;