Changeset e2a0d76 in mainline for kernel/generic/src

Timestamp:

2013-09-09T23:29:57Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ba2be23

Parents:

8cbf1c3

Message:

cstyle

Location:

kernel/generic/src

Files:

• ddi/ddi.c (modified) (2 diffs)
• debug/stacktrace.c (modified) (2 diffs)
• mm/km.c (modified) (1 diff)
• mm/slab.c (modified) (1 diff)

kernel/generic/src/ddi/ddi.c

@@ -327 +327 @@
         ASSERT(TASK);
         
-        size_t pages = SIZE2FRAMES(size);
+        size_t frames = SIZE2FRAMES(size);
         uint8_t order;
         
-        /* We need the 2^order >= pages */
-        if (pages == 1)
+        /* We need the 2^order >= frames */
+        if (frames == 1)
                 order = 0;
         else
-                order = fnzb(pages - 1) + 1;
+                order = fnzb(frames - 1) + 1;
         
         *phys = frame_alloc_noreserve(order, 0, 0);
@@ -342 +342 @@
         mem_backend_data_t backend_data;
         backend_data.base = *phys;
-        backend_data.frames = pages;
+        backend_data.frames = frames;
         
         if (!as_area_create(TASK->as, map_flags, size,

kernel/generic/src/debug/stacktrace.c

@@ -39 +39 @@
 #include <print.h>
 
-#define STACK_FRAMES_MAX        20
+#define STACK_FRAMES_MAX  20
 
 void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
@@ -49 +49 @@
         uintptr_t pc;
         
-        while (cnt++ < STACK_FRAMES_MAX &&
-            ops->stack_trace_context_validate(ctx)) {
+        while ((cnt++ < STACK_FRAMES_MAX) &&
+            (ops->stack_trace_context_validate(ctx))) {
                 if (ops->symbol_resolve &&
                     ops->symbol_resolve(ctx->pc, &symbol, &offset)) {

kernel/generic/src/mm/km.c

@@ -239 +239 @@
 uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags)
 {
-        uintptr_t frame;
-        uintptr_t page;
-
         ASSERT(THREAD);
         ASSERT(framep);
         ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
-
+        
         /*
          * Allocate a frame, preferably from high memory.
          */
-        frame = frame_alloc(ONE_FRAME,
+        uintptr_t page;
+        uintptr_t frame = frame_alloc(ONE_FRAME,
             FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0); 
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                ASSERT(page);   // FIXME
+                
+                // FIXME
+                ASSERT(page);
         } else {
                 frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM | flags, 0);
                 if (!frame)
                         return (uintptr_t) NULL;
+                
                 page = PA2KA(frame);
         }
-
+        
         *framep = frame;
-        return page;    
+        return page;
 }
 

kernel/generic/src/mm/slab.c

@@ -184 +184 @@
         void *data = (void *)
             PA2KA(frame_alloc_generic(cache->order, flags, 0, &zone));
-        if (!data) {
+        if (!data)
                 return NULL;
-        }
         
         slab_t *slab;