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

Timestamp:

2011-09-16T14:50:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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 USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

File:

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

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

@@ -50 +50 @@
  * @return Physical address if exists, NULL otherwise.
  */
-static inline uintptr_t addr_to_phys(void *addr)
+static inline uintptr_t addr_to_phys(const void *addr)
 {
         if (addr == NULL)
@@ -102 +102 @@
         if (free_address == 0)
                 return NULL;
-        void *ret = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
+        void *address = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
                   AS_AREA_READ | AS_AREA_WRITE);
-        if (ret != free_address)
+        if (address != free_address)
                 return NULL;
-        return ret;
+        return address;
+}
+/*----------------------------------------------------------------------------*/
+static inline void return_page(void *page)
+{
+        if (page)
+                as_area_destroy(page);
 }