Changeset 3bacee1 in mainline for kernel/arch/ia64/src

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/ia64/src

Files:

• drivers/ski.c (modified) (3 diffs)
• ia64.c (modified) (3 diffs)
• interrupt.c (modified) (2 diffs)

kernel/arch/ia64/src/drivers/ski.c

@@ -84 +84 @@
 
         asm volatile (
-                "mov r15 = %1\n"
-                "break 0x80000;;\n"  /* modifies r8 */
-                "mov %0 = r8;;\n"
-
-                : "=r" (ch)
-                : "i" (SKI_GETCHAR)
-                : "r15", "r8"
+            "mov r15 = %1\n"
+            "break 0x80000;;\n"  /* modifies r8 */
+            "mov %0 = r8;;\n"
+
+            : "=r" (ch)
+            : "i" (SKI_GETCHAR)
+            : "r15", "r8"
         );
 
@@ -143 +143 @@
 
         asm volatile (
-                "mov r15 = %0\n"
-                "break 0x80000\n"
-                :
-                : "i" (SKI_INIT_CONSOLE)
-                : "r15", "r8"
+            "mov r15 = %0\n"
+            "break 0x80000\n"
+            :
+            : "i" (SKI_INIT_CONSOLE)
+            : "r15", "r8"
         );
 
@@ -169 +169 @@
 {
         asm volatile (
-                "mov r15 = %[cmd]\n"
-                "mov r32 = %[ch]\n"   /* r32 is in0 */
-                "break 0x80000\n"     /* modifies r8 */
-                :
-                : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
-                : "r15", "in0", "r8"
+            "mov r15 = %[cmd]\n"
+            "mov r32 = %[ch]\n"   /* r32 is in0 */
+            "break 0x80000\n"     /* modifies r8 */
+            :
+            : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
+            : "r15", "in0", "r8"
         );
 }

kernel/arch/ia64/src/ia64.c

@@ -181 +181 @@
 
 #ifdef CONFIG_NS16550
-        ns16550_instance_t *ns16550_instance
-            = ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL,
+        ns16550_instance_t *ns16550_instance =
+            ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL,
             NULL);
         if (ns16550_instance) {
@@ -253 +253 @@
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
-        while (true);
+        while (true)
+                ;
 }
 
@@ -259 +260 @@
 {
         pio_write_8((ioport8_t *)0x64, 0xfe);
-        while (true);
+        while (true)
+                ;
 }
 

kernel/arch/ia64/src/interrupt.c

@@ -229 +229 @@
 {
         asm volatile (
-                "mov cr.eoi = r0 ;;"
+            "mov cr.eoi = r0 ;;"
         );
 }
@@ -245 +245 @@
         case INTERRUPT_SPURIOUS:
 #ifdef CONFIG_DEBUG
-                printf("cpu%d: spurious interrupt\n", CPU->id);
+                printf("cpu%d: spurious interrupt\n", CPU->id);
 #endif
                 break;