Changeset 3bacee1 in mainline for kernel/arch/arm32

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

kernel/arch/arm32

Files:

• include/arch/asm.h (modified) (2 diffs)
• include/arch/security_ext.h (modified) (1 diff)
• src/mach/raspberrypi/raspberrypi.c (modified) (4 diffs)
• src/mm/page.c (modified) (1 diff)

kernel/arch/arm32/include/arch/asm.h

@@ -59 +59 @@
 {
 #ifdef PROCESSOR_ARCH_armv7_a
-        asm volatile ( "wfe" );
+        asm volatile ("wfe");
 #elif defined(PROCESSOR_ARCH_armv6) | defined(PROCESSOR_arm926ej_s) | defined(PROCESSOR_arm920t)
         WFI_write(0);
@@ -107 +107 @@
 
         asm volatile (
-                "and %[v], sp, %[size]\n"
-                : [v] "=r" (v)
-                : [size] "r" (~(STACK_SIZE - 1))
+            "and %[v], sp, %[size]\n"
+            : [v] "=r" (v)
+            : [size] "r" (~(STACK_SIZE - 1))
         );
 

kernel/arch/arm32/include/arch/security_ext.h

@@ -77 +77 @@
 static inline bool sec_ext_is_secure(void)
 {
-        return sec_ext_is_implemented()
-            && (sec_ext_is_monitor_mode() || !(SCR_read() & SCR_NS_FLAG));
+        return sec_ext_is_implemented() &&
+            (sec_ext_is_monitor_mode() || !(SCR_read() & SCR_NS_FLAG));
 }
 

kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

@@ -103 +103 @@
         /* Initialize interrupt controller */
         raspi.irc = (void *) km_map(BCM2835_IRC_ADDR, sizeof(bcm2835_irc_t),
-                                    PAGE_NOT_CACHEABLE);
+            PAGE_NOT_CACHEABLE);
         assert(raspi.irc);
         bcm2835_irc_init(raspi.irc);
@@ -109 +109 @@
         /* Initialize system timer */
         raspi.timer = (void *) km_map(BCM2835_TIMER_ADDR,
-                                      sizeof(bcm2835_timer_t),
-                                      PAGE_NOT_CACHEABLE);
+            sizeof(bcm2835_timer_t),
+            PAGE_NOT_CACHEABLE);
 }
 
@@ -129 +129 @@
 static void raspberrypi_cpu_halt(void)
 {
-        while (true) ;
+        while (true)
+                ;
 }
 
@@ -184 +185 @@
 #ifdef CONFIG_PL011_UART
         if (pl011_uart_init(&raspi.uart, BCM2835_UART_IRQ,
-                            BCM2835_UART0_BASE_ADDRESS))
+            BCM2835_UART0_BASE_ADDRESS))
                 stdout_wire(&raspi.uart.outdev);
 #endif

kernel/arch/arm32/src/mm/page.c

@@ -63 +63 @@
         for (uintptr_t cur = PHYSMEM_START_ADDR;
             cur < min(KA2PA(config.identity_base) +
-                config.identity_size, config.physmem_end);
+            config.identity_size, config.physmem_end);
             cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);