Changeset 291b8bc in mainline for uspace/drv/uhci-hcd/utils/malloc32.h

Timestamp:

2011-03-26T13:28:43Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f62468c

Parents:

889e8e3 (diff), c9f5e238 (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 development/ changes

File:

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

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

@@ -40 +40 @@
 #include <as.h>
 
+#include "slab.h"
+
 #define UHCI_STRCUTURES_ALIGNMENT 16
 #define UHCI_REQUIRED_PAGE_SIZE 4096
+
 
 /** Get physical address translation
@@ -54 +57 @@
 
         uintptr_t result;
-        int ret = as_get_physical_mapping(addr, &result);
+        const int ret = as_get_physical_mapping(addr, &result);
+        assert(ret == EOK);
 
         if (ret != EOK)
@@ -66 +70 @@
  * @return Address of the alligned and big enough memory place, NULL on failure.
  */
-static inline void * malloc32(size_t size)
-        { return memalign(UHCI_STRCUTURES_ALIGNMENT, size); }
+static inline void * malloc32(size_t size) {
+        if (size <= SLAB_ELEMENT_SIZE)
+                return slab_malloc_g();
+        assert(false);
+        return memalign(UHCI_STRCUTURES_ALIGNMENT, size);
+}
 /*----------------------------------------------------------------------------*/
 /** Physical mallocator simulator
@@ -73 +81 @@
  * @param[in] addr Address of the place allocated by malloc32
  */
-static inline void free32(void *addr)
-        { if (addr) free(addr); }
+static inline void free32(void *addr) {
+        if (!addr)
+                return;
+        if (slab_in_range_g(addr))
+                return slab_free_g(addr);
+        free(addr);
+}
 /*----------------------------------------------------------------------------*/
 /** Create 4KB page mapping
@@ -82 +95 @@
 static inline void * get_page(void)
 {
-        void * free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
-        assert(free_address);
+        void *free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
+        assert(free_address); /* TODO: remove this assert */
         if (free_address == 0)
                 return NULL;
-        void* ret =
-          as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
+        void *ret = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
                   AS_AREA_READ | AS_AREA_WRITE);
         if (ret != free_address)