Changeset d15809b4 in mainline for uspace/drv/uhci-hcd/utils/malloc32.h

Timestamp:

2011-02-14T10:14:31Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

962ce100

Parents:

0d36c20 (diff), 45c01a1 (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 development/ changes

File:

• uspace/drv/uhci-hcd/utils/malloc32.h (modified) (2 diffs)

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -45 +45 @@
 #define UHCI_REQUIRED_PAGE_SIZE 4096
 
-static inline void * addr_to_phys(void *addr)
+static inline uintptr_t addr_to_phys(void *addr)
 {
         uintptr_t result;
@@ -51 +51 @@
 
         assert(ret == 0);
-        return (void*)(result | ((uintptr_t)addr & 0xfff));
+        return (result | ((uintptr_t)addr & 0xfff));
 }