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

Timestamp:

2011-05-19T15:20:48Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4939490

Parents:

df44fa2 (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:

Development changes.

File:

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

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup drvusbuhci
  * @{
  */
@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TRANSLATOR_H
-#define DRV_UHCI_TRANSLATOR_H
+#ifndef DRV_UHCI_UTILS_MALLOC32_H
+#define DRV_UHCI_UTILS_MALLOC32_H
 
 #include <assert.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);
 }