Changes in uspace/drv/bus/usb/uhci/utils/malloc32.h [faba839:75f9dcd] in mainline

File:

• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (3 diffs)

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

@@ -36 +36 @@
 
 #include <assert.h>
-#include <unistd.h>
 #include <errno.h>
 #include <malloc.h>
@@ -55 +54 @@
         if (addr == NULL)
                 return 0;
-        
+
         uintptr_t result;
         const int ret = as_get_physical_mapping(addr, &result);
         if (ret != EOK)
                 return 0;
-        
-        return result;
+        return (result | ((uintptr_t)addr & 0xfff));
 }
 /*----------------------------------------------------------------------------*/
@@ -99 +97 @@
 static inline void * get_page(void)
 {
-        void *address = as_area_create(AS_AREA_ANY, UHCI_REQUIRED_PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE);
-        if (address == AS_MAP_FAILED)
+        void *free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
+        if (free_address == 0)
                 return NULL;
-        
+        void *address = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
+                  AS_AREA_READ | AS_AREA_WRITE);
+        if (address != free_address)
+                return NULL;
         return address;
 }