Changeset 3f03199 in mainline for kernel/arch/arm32/src/ras.c

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:

• kernel/arch/arm32/src/ras.c (modified) (1 diff)

kernel/arch/arm32/src/ras.c

@@ -51 +51 @@
 void ras_init(void)
 {
-        uintptr_t frame;
-
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_ATOMIC | FRAME_HIGHMEM);
+        uintptr_t frame =
+            frame_alloc(1, FRAME_ATOMIC | FRAME_HIGHMEM, 0);
         if (!frame)
-                frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_LOWMEM);
+                frame = frame_alloc(1, FRAME_LOWMEM, 0);
+        
         ras_page = (uintptr_t *) km_map(frame,
             PAGE_SIZE, PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_CACHEABLE);
-
+        
         memsetb(ras_page, PAGE_SIZE, 0); 
         ras_page[RAS_START] = 0;