Changeset 25696fea in mainline for uspace/drv/bus/usb/uhci/utils/malloc32.h

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (2 diffs)

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -62 +62 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Physical mallocator simulator
+/** DMA malloc simulator
  *
  * @param[in] size Size of the required memory space
- * @return Address of the alligned and big enough memory place, NULL on failure.
+ * @return Address of the aligned and big enough memory place, NULL on failure.
  */
-static inline void * malloc32(size_t size) {
+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 */
@@ -83 +84 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Physical mallocator simulator
+/** DMA malloc simulator
  *
  * @param[in] addr Address of the place allocated by malloc32
  */
-static inline void free32(void *addr) {
-        if (!addr)
-                return;
-        free(addr);
-}
+static inline void free32(void *addr)
+        { free(addr); }
 /*----------------------------------------------------------------------------*/
 /** Create 4KB page mapping