Changeset 6843a9c in mainline for uspace/drv/bus/usb/ohci/utils/malloc32.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:

• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (2 diffs)

uspace/drv/bus/usb/ohci/utils/malloc32.h

@@ -37 +37 @@
 #include <assert.h>
 #include <malloc.h>
+#include <unistd.h>
 #include <errno.h>
 #include <mem.h>
@@ -56 +57 @@
         uintptr_t result;
         int ret = as_get_physical_mapping(addr, &result);
-
+        
         if (ret != EOK)
                 return 0;
-        return (result | ((uintptr_t)addr & 0xfff));
+        
+        return result;
 }
 /*----------------------------------------------------------------------------*/