Changes in kernel/test/mm/mapping1.c [5df1963:9d58539] in mainline

File:

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

kernel/test/mm/mapping1.c

@@ -41 +41 @@
 const char *test_mapping1(void)
 {
-        uintptr_t frame = frame_alloc(1, FRAME_NONE, 0);
+        uintptr_t page0, page1;
+        uintptr_t frame;
+        uint32_t v;
+        int i;
         
-        uintptr_t page0 = km_map(frame, FRAME_SIZE,
+        frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_NONE);
+
+        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);
-        
-        uintptr_t page1 = km_map(frame, FRAME_SIZE,
+        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 (unsigned int i = 0; i < 2; i++) {
+        for (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");
-                
-                uint32_t v = *((uint32_t *) page1);
-                
+
+                v = *((uint32_t *) page1);
+        
                 if (v != TEST_MAGIC) {
                         km_unmap(page0, PAGE_SIZE);
                         km_unmap(page1, PAGE_SIZE);
-                        frame_free(frame, 1);
+                        frame_free(frame);
                         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, 1);
+                        frame_free(frame);
                         return "Criss-cross read does not match the value written.";
                 }
         }
-        
+
         km_unmap(page0, PAGE_SIZE);
         km_unmap(page1, PAGE_SIZE);
-        frame_free(frame, 1);
+        frame_free(frame);
         
         return NULL;