Changeset c8ca07e in mainline

Timestamp:

2011-01-29T06:33:09Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

621fdaa

Parents:

44d8853 (diff), 76b57734 (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:

Fixed (from Vojta): Use alignment and size in proper order (memalign)

Location:

uspace/drv/uhci

Files:

• uhci.h (modified) (1 diff)
• utils/malloc32.h (modified) (2 diffs)

uspace/drv/uhci/uhci.h

@@ -56 +56 @@
 
         uint16_t usbsts;
+#define UHCI_STATUS_HALTED (1 << 5)
+#define UHCI_STATUS_PROCESS_ERROR (1 << 4)
+#define UHCI_STATUS_SYSTEM_ERROR (1 << 3)
+#define UHCI_STATUS_RESUME (1 << 2)
+#define UHCI_STATUS_ERROR_INTERRUPT (1 << 1)
+#define UHCI_STATUS_INTERRUPT (1 << 0)
+
         uint16_t usbintr;
         uint16_t frnum;

uspace/drv/uhci/utils/malloc32.h

@@ -53 +53 @@
 static inline void * malloc32(size_t size)
 /* TODO: this is ugly */
-        { return memalign(size, 16); }
+        { return memalign(16, size); }
 
 static inline void * get_page()
@@ -69 +69 @@
 
 static inline void * memalign32(size_t size, size_t alignment)
-        { return memalign(size, alignment); }
+        { return memalign(alignment, size); }
 
 static inline void free32(void * addr)