Changes in uspace/drv/bus/usb/uhci/utils/malloc32.h [fbcdeb8:af2b806] in mainline

File:

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

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

@@ -54 +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));
 }
 /*----------------------------------------------------------------------------*/
-/** DMA malloc simulator
+/** Physical mallocator simulator
  *
  * @param[in] size Size of the required memory space
- * @return Address of the aligned and big enough memory place, NULL on failure.
+ * @return Address of the alligned and big enough memory place, NULL on failure.
  */
-static inline void * malloc32(size_t size)
-{
+static inline void * malloc32(size_t size) {
         /* This works only when the host has less than 4GB of memory as
          * physical address needs to fit into 32 bits */
@@ -85 +83 @@
 }
 /*----------------------------------------------------------------------------*/
-/** DMA malloc simulator
+/** Physical mallocator simulator
  *
  * @param[in] addr Address of the place allocated by malloc32
  */
-static inline void free32(void *addr)
-        { free(addr); }
+static inline void free32(void *addr) {
+        if (!addr)
+                return;
+        free(addr);
+}
 /*----------------------------------------------------------------------------*/
 /** Create 4KB page mapping
@@ -98 +99 @@
 static inline void * get_page(void)
 {
-        void *address = as_area_create((void *) -1, UHCI_REQUIRED_PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE);
-        if (address == (void *) -1)
+        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;
 }