Changeset fb2de0a in mainline

Timestamp:

2011-05-25T18:02:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1889786, d208f3f

Parents:

fcbcaae9

Message:

Replace slab allocator with simple alignment trick

slab allocator removed

Location:

uspace/drv/uhci-hcd

Files:

• Makefile (modified) (1 diff)
• utils/malloc32.h (modified) (3 diffs)
• utils/slab.c (deleted)
• utils/slab.h (deleted)

uspace/drv/uhci-hcd/Makefile

@@ -48 +48 @@
         root_hub.c \
         hw_struct/transfer_descriptor.c \
-        utils/slab.c \
         pci.c \
         batch.c

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
@@ -70 +68 @@
  */
 static inline void * malloc32(size_t 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);
+        /* 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);
 }
 /*----------------------------------------------------------------------------*/
@@ -84 +90 @@
         if (!addr)
                 return;
-        if (slab_in_range_g(addr))
-                return slab_free_g(addr);
         free(addr);
 }