Changeset 00aece0 in mainline for uspace/drv/bus/usb/ohci/utils/malloc32.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.

File:

• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (4 diffs)

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

@@ -41 +41 @@
 #include <as.h>
 
+/* Generic TDs and EDs require 16byte alignment,
+ * Isochronous TD require 32byte alignment,
+ * buffers do not have to be aligned.
+ */
+#define OHCI_ALIGN 32
+
 /** Get physical address translation
  *
@@ -46 +52 @@
  * @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)
 {
         uintptr_t result;
         int ret = as_get_physical_mapping(addr, &result);
-
+        
         if (ret != EOK)
                 return 0;
-        return (result | ((uintptr_t)addr & 0xfff));
+        
+        return result;
 }
 /*----------------------------------------------------------------------------*/
@@ -62 +69 @@
  */
 static inline void * malloc32(size_t size)
-        { return memalign(size, size); }
+        { return memalign(OHCI_ALIGN, size); }
 /*----------------------------------------------------------------------------*/
 /** Physical mallocator simulator
@@ -69 +76 @@
  */
 static inline void free32(void *addr)
-        { if (addr) free(addr); }
+        { free(addr); }
 #endif
 /**