Changeset 1433ecda in mainline for kernel/arch/arm32

Timestamp:

2018-04-04T15:42:37Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

Location:

kernel/arch/arm32

Files:

• include/arch/mm/page_fault.h (modified) (1 diff)
• src/arm32.c (modified) (1 diff)
• src/atomic.c (modified) (2 diffs)
• src/cpu/cpu.c (modified) (2 diffs)
• src/fpu_context.c (modified) (1 diff)
• src/mach/beagleboardxm/beagleboardxm.c (modified) (1 diff)
• src/mach/beaglebone/beaglebone.c (modified) (2 diffs)
• src/machine_func.c (modified) (1 diff)
• src/mm/page_fault.c (modified) (3 diffs)
• src/userspace.c (modified) (1 diff)

kernel/arch/arm32/include/arch/mm/page_fault.h

@@ -58 +58 @@
                 unsigned fs : 1; /**< armv6+ mandated, earlier IPLM. DEFINED */
                 unsigned wr : 1; /**< armv6+ only */
-                unsigned ext : 1 ; /**< external abort */
+                unsigned ext : 1; /**< external abort */
                 unsigned cm : 1; /**< Cache maintenance, needs LPAE support */
                 unsigned should_be_zero : 18;

kernel/arch/arm32/src/arm32.c

@@ -156 +156 @@
 {
         /* not implemented */
-        while (true);
+        while (true)
+                ;
 }
 

kernel/arch/arm32/src/atomic.c

@@ -44 +44 @@
  * returns the previous value of \a *ptr.
  */
-void * __sync_val_compare_and_swap_4(void **ptr, void *expected, void *new_val)
+void *__sync_val_compare_and_swap_4(void **ptr, void *expected, void *new_val)
 {
         /*
@@ -55 +55 @@
         irq_spinlock_lock(&cas_lock, true);
 
-        void * cur_val = *ptr;
+        void *cur_val = *ptr;
 
         if (cur_val == expected) {

kernel/arch/arm32/src/cpu/cpu.c

@@ -62 +62 @@
 
 /** Implementers (vendor) names */
-static const char * implementer(unsigned id)
+static const char *implementer(unsigned id)
 {
         switch (id) {
-        case 0x41: return "ARM Limited";
-        case 0x44: return "Digital Equipment Corporation";
-        case 0x4d: return "Motorola, Freescale Semiconductor Inc.";
-        case 0x51: return "Qualcomm Inc.";
-        case 0x56: return "Marvell Semiconductor Inc.";
-        case 0x69: return "Intel Corporation";
+        case 0x41:
+                return "ARM Limited";
+        case 0x44:
+                return "Digital Equipment Corporation";
+        case 0x4d:
+                return "Motorola, Freescale Semiconductor Inc.";
+        case 0x51:
+                return "Qualcomm Inc.";
+        case 0x56:
+                return "Marvell Semiconductor Inc.";
+        case 0x69:
+                return "Intel Corporation";
         }
         return "Unknown implementer";
@@ -76 +82 @@
 
 /** Architecture names */
-static const char * architecture_string(cpu_arch_t *arch)
+static const char *architecture_string(cpu_arch_t *arch)
 {
         static const char *arch_data[] = {

kernel/arch/arm32/src/fpu_context.c

@@ -126 +126 @@
          * Moreover they need to have same access enabled */
         if (((cpacr & CPACR_CP_MASK(10)) != CPACR_CP_FULL_ACCESS(10)) &&
-           ((cpacr & CPACR_CP_MASK(11)) != CPACR_CP_FULL_ACCESS(11))) {
+            ((cpacr & CPACR_CP_MASK(11)) != CPACR_CP_FULL_ACCESS(11))) {
                 printf("No access to CP10 and CP11: %" PRIx32 "\n", cpacr);
                 return 0;

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

@@ -130 +130 @@
 static void bbxm_cpu_halt(void)
 {
-        while (1);
+        while (1)
+                ;
 }
 

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

@@ -137 +137 @@
         /* Select the SYSCLK as the clock source for the dmtimer2 module */
         am335x_clock_source_select(bbone.cm_dpll_addr, DMTIMER2,
-           CLK_SRC_M_OSC);
+            CLK_SRC_M_OSC);
         /* Initialize the DMTIMER2 */
         if (am335x_ctrl_module_clock_freq_get(bbone.ctrl_module,
@@ -159 +159 @@
 static void bbone_cpu_halt(void)
 {
-        while (1);
+        while (1)
+                ;
 }
 

kernel/arch/arm32/src/machine_func.c

@@ -137 +137 @@
 }
 
-const char * machine_get_platform_name(void)
+const char *machine_get_platform_name(void)
 {
         if (machine_ops->machine_get_platform_name)

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

@@ -75 +75 @@
 } dfsr_source_t;
 
-static inline const char * dfsr_source_to_str(dfsr_source_t source)
+static inline const char *dfsr_source_to_str(dfsr_source_t source)
 {
         switch (source) {
@@ -149 +149 @@
                 panic("page_fault - instruction does not access memory "
                     "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
-                    *(uint32_t*)instr_union.instr, (void *) badvaddr);
+                    *(uint32_t *)instr_union.instr, (void *) badvaddr);
                 return PF_ACCESS_EXEC;
         }
@@ -177 +177 @@
                 { 0x0fb00000, 0x01000000, PF_ACCESS_WRITE },
         };
-        const uint32_t inst = *(uint32_t*)instr_addr;
+        const uint32_t inst = *(uint32_t *)instr_addr;
         for (unsigned i = 0; i < sizeof(ls_inst) / sizeof(ls_inst[0]); ++i) {
                 if ((inst & ls_inst[i].mask) == ls_inst[i].value) {

kernel/arch/arm32/src/userspace.c

@@ -104 +104 @@
         /* set user mode, set registers, jump */
         asm volatile (
-                "mov sp, %[ustate]\n"
-                "msr spsr_c, %[user_mode]\n"
-                "ldmfd sp, {r0-r12, sp, lr}^\n"
-                "nop\n"         /* Cannot access sp immediately after ldm(2) */
-                "add sp, sp, #(15*4)\n"
-                "ldmfd sp!, {pc}^\n"
-                :: [ustate] "r" (&ustate), [user_mode] "r" (user_mode)
+            "mov sp, %[ustate]\n"
+            "msr spsr_c, %[user_mode]\n"
+            "ldmfd sp, {r0-r12, sp, lr}^\n"
+            "nop\n"             /* Cannot access sp immediately after ldm(2) */
+            "add sp, sp, #(15*4)\n"
+            "ldmfd sp!, {pc}^\n"
+            :: [ustate] "r" (&ustate), [user_mode] "r" (user_mode)
         );
 
         /* unreachable */
-        while(1)
+        while (1)
                 ;
 }