Changes in uspace/drv/uhci-hcd/utils/malloc32.h [fb2de0a:aeca5a3] in mainline

File:

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

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

@@ -41 +41 @@
 #include <as.h>
 
+#include "slab.h"
+
 #define UHCI_STRCUTURES_ALIGNMENT 16
 #define UHCI_REQUIRED_PAGE_SIZE 4096
@@ -57 +59 @@
         uintptr_t result;
         const int ret = as_get_physical_mapping(addr, &result);
+        assert(ret == EOK);
+
         if (ret != EOK)
                 return 0;
@@ -68 +72 @@
  */
 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 */
-
-        /* If we need more than one page there is no guarantee that the
-         * memory will be continuous */
-        if (size > PAGE_SIZE)
-                return NULL;
-        /* Calculate alignment to make sure the block won't cross page
-         * boundary */
-        size_t alignment = UHCI_STRCUTURES_ALIGNMENT;
-        while (alignment < size)
-                alignment *= 2;
-        return memalign(alignment, size);
+        if (size <= SLAB_ELEMENT_SIZE)
+                return slab_malloc_g();
+        usb_log_warning("Requested %zu bytes, current allocator can't handle "
+            "that amount, pray that the standard malloc will suffice.", size);
+        return memalign(UHCI_STRCUTURES_ALIGNMENT, size);
 }
 /*----------------------------------------------------------------------------*/
@@ -90 +86 @@
         if (!addr)
                 return;
+        if (slab_in_range_g(addr))
+                return slab_free_g(addr);
         free(addr);
 }
@@ -100 +98 @@
 {
         void *free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
+        assert(free_address); /* TODO: remove this assert */
         if (free_address == 0)
                 return NULL;