Changeset 1433ecda in mainline for boot

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:

boot

Files:

• arch/ia64/src/ski.c (modified) (2 diffs)
• arch/sparc64/src/main.c (modified) (1 diff)
• genarch/src/multiplication.c (modified) (2 diffs)
• generic/src/str.c (modified) (1 diff)
• generic/src/version.c (modified) (1 diff)

boot/arch/ia64/src/ski.c

@@ -42 +42 @@
 
         asm volatile (
-                "mov r15 = %[cmd]\n"
-                "break 0x80000\n"
-                :
-                : [cmd] "i" (SKI_INIT_CONSOLE)
-                : "r15", "r8"
+            "mov r15 = %[cmd]\n"
+            "break 0x80000\n"
+            :
+            : [cmd] "i" (SKI_INIT_CONSOLE)
+            : "r15", "r8"
         );
 
@@ -60 +60 @@
 
         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"
         );
 }

boot/arch/sparc64/src/main.c

@@ -119 +119 @@
         uint64_t ver;
         asm volatile (
-                "rdpr %%ver, %[ver]\n"
-                : [ver] "=r" (ver)
+            "rdpr %%ver, %[ver]\n"
+            : [ver] "=r" (ver)
         );
 

boot/genarch/src/multiplication.c

@@ -37 +37 @@
 /** Set 1 to return INT64_MAX or INT64_MIN on overflow */
 #ifndef SOFTINT_CHECK_OF
-        #define SOFTINT_CHECK_OF  0
+#define SOFTINT_CHECK_OF  0
 #endif
 
@@ -45 +45 @@
  *
  */
-static unsigned long long mul(unsigned int a, unsigned int b) {
+static unsigned long long mul(unsigned int a, unsigned int b)
+{
         unsigned int a1 = a >> 16;
         unsigned int a2 = a & UINT16_MAX;

boot/generic/src/str.c

@@ -105 +105 @@
 /** Check the condition if wchar_t is signed */
 #ifdef __WCHAR_UNSIGNED__
-        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#define WCHAR_SIGNED_CHECK(cond)  (true)
 #else
-        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#define WCHAR_SIGNED_CHECK(cond)  (cond)
 #endif
 

boot/generic/src/version.c

@@ -38 +38 @@
 
 #ifdef REVISION
-        static const char *revision = ", revision " STRING(REVISION);
+static const char *revision = ", revision " STRING(REVISION);
 #else
-        static const char *revision = "";
+static const char *revision = "";
 #endif
 
 #ifdef TIMESTAMP
-        static const char *timestamp = " on " STRING(TIMESTAMP);
+static const char *timestamp = " on " STRING(TIMESTAMP);
 #else
-        static const char *timestamp = "";
+static const char *timestamp = "";
 #endif