Changeset 293de44 in mainline for uspace/drv/uhci-hcd/utils/malloc32.h

Timestamp:

2011-05-20T11:18:53Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c7c2443

Parents:

160b75e (diff), 7941bd6 (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) (1 diff)

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

@@ -74 +74 @@
         if (size <= SLAB_ELEMENT_SIZE)
                 return slab_malloc_g();
-        assert(false);
+        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);
 }