Changeset 0c2d9bb in mainline for kernel/test/mm/mapping1.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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:

• kernel/test/mm/mapping1.c (modified) (1 diff)

kernel/test/mm/mapping1.c

@@ -41 +41 @@
 const char *test_mapping1(void)
 {
-        uintptr_t page0, page1;
-        uintptr_t frame;
-        uint32_t v;
-        int i;
+        uintptr_t frame = frame_alloc(1, FRAME_NONE, 0);
         
-        frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_NONE);
-
-        page0 = km_map(frame, FRAME_SIZE,
+        uintptr_t page0 = km_map(frame, FRAME_SIZE,
             PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
         TPRINTF("Virtual address %p mapped to physical address %p.\n",
             (void *) page0, (void *) frame);
-        page1 = km_map(frame, FRAME_SIZE,
+        
+        uintptr_t page1 = km_map(frame, FRAME_SIZE,
             PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
         TPRINTF("Virtual address %p mapped to physical address %p.\n",
             (void *) page1, (void *) frame);
         
-        for (i = 0; i < 2; i++) {
+        for (unsigned int i = 0; i < 2; i++) {
                 TPRINTF("Writing magic using the first virtual address.\n");
-
+                
                 *((uint32_t *) page0) = TEST_MAGIC;
-
+                
                 TPRINTF("Reading magic using the second virtual address.\n");
-
-                v = *((uint32_t *) page1);
-        
+                
+                uint32_t v = *((uint32_t *) page1);
+                
                 if (v != TEST_MAGIC) {
                         km_unmap(page0, PAGE_SIZE);
                         km_unmap(page1, PAGE_SIZE);
-                        frame_free(frame);
+                        frame_free(frame, 1);
                         return "Criss-cross read does not match the value written.";
                 }
-
+                
                 TPRINTF("Writing zero using the second virtual address.\n");
-        
+                
                 *((uint32_t *) page1) = 0;
-
+                
                 TPRINTF("Reading zero using the first virtual address.\n");
-        
+                
                 v = *((uint32_t *) page0);
-        
+                
                 if (v != 0) {
                         km_unmap(page0, PAGE_SIZE);
                         km_unmap(page1, PAGE_SIZE);
-                        frame_free(frame);
+                        frame_free(frame, 1);
                         return "Criss-cross read does not match the value written.";
                 }
         }
-
+        
         km_unmap(page0, PAGE_SIZE);
         km_unmap(page1, PAGE_SIZE);
-        frame_free(frame);
+        frame_free(frame, 1);
         
         return NULL;