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

Timestamp:

2011-10-13T13:20:26Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3a5506a

Parents:

cff3fb6 (diff), 22a2b763 (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 initial USB unplug support.

Support device_remove and device_gone in libusbdev.
usbhub and uhcirh try to unbind and destroy functions of attached devices.
add unplug support for usbhub driver (only works on empty hubs as there is no support in other drivers).

Drivers to go:

usbmid
usbflbk
usbhid
usbmast
usbmouse

Tested on:

qemu UHCI and emulated hub,
ICH8 hw and Alcor Micro Corp. USB Hub

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