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

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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 mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

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

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

@@ -92 +92 @@
  */
 static inline void free32(void *addr)
-        { free(addr); }
+{
+        free(addr);
+}
 
 /** Create 4KB page mapping
@@ -98 +100 @@
  * @return Address of the mapped page, NULL on failure.
  */
-static inline void * get_page(void)
+static inline void *get_page(void)
 {
-        void *address, *phys;
+        uintptr_t phys;
+        void *address;
+        
         const int ret = dmamem_map_anonymous(UHCI_REQUIRED_PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &address);
-        return ret == EOK ? address : NULL;
+            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
+            &address);
+        
+        return ((ret == EOK) ? address : NULL);
 }