Changeset 1433ecda in mainline for uspace/drv/char/ski-con

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:

uspace/drv/char/ski-con

Files:

• main.c (modified) (2 diffs)
• ski-con.c (modified) (2 diffs)

uspace/drv/char/ski-con/main.c

@@ -65 +65 @@
         ski_con_t *ski_con;
 
-        ddf_msg(LVL_DEBUG, "ski_con_dev_add(%p)", dev);
+        ddf_msg(LVL_DEBUG, "ski_con_dev_add(%p)", dev);
         ski_con = ddf_dev_data_alloc(dev, sizeof(ski_con_t));
         if (ski_con == NULL) {
@@ -79 +79 @@
 static errno_t ski_con_dev_remove(ddf_dev_t *dev)
 {
-        ski_con_t *ski_con = (ski_con_t *)ddf_dev_data_get(dev);
+        ski_con_t *ski_con = (ski_con_t *)ddf_dev_data_get(dev);
 
-        ddf_msg(LVL_DEBUG, "ski_con_dev_remove(%p)", dev);
+        ddf_msg(LVL_DEBUG, "ski_con_dev_remove(%p)", dev);
 
-        return ski_con_remove(ski_con);
+        return ski_con_remove(ski_con);
 }
 
 static errno_t ski_con_dev_gone(ddf_dev_t *dev)
 {
-        ski_con_t *ski_con = (ski_con_t *)ddf_dev_data_get(dev);
+        ski_con_t *ski_con = (ski_con_t *)ddf_dev_data_get(dev);
 
-        ddf_msg(LVL_DEBUG, "ski_con_dev_gone(%p)", dev);
+        ddf_msg(LVL_DEBUG, "ski_con_dev_gone(%p)", dev);
 
-        return ski_con_gone(ski_con);
+        return ski_con_gone(ski_con);
 }
 
 static errno_t ski_con_fun_online(ddf_fun_t *fun)
 {
-        ddf_msg(LVL_DEBUG, "ski_con_fun_online()");
-        return ddf_fun_online(fun);
+        ddf_msg(LVL_DEBUG, "ski_con_fun_online()");
+        return ddf_fun_online(fun);
 }
 
 static errno_t ski_con_fun_offline(ddf_fun_t *fun)
 {
-        ddf_msg(LVL_DEBUG, "ski_con_fun_offline()");
-        return ddf_fun_offline(fun);
+        ddf_msg(LVL_DEBUG, "ski_con_fun_offline()");
+        return ddf_fun_offline(fun);
 }
 

uspace/drv/char/ski-con/ski-con.c

@@ -169 +169 @@
 #ifdef UARCH_ia64
         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"
         );
 #else
@@ -199 +199 @@
 #ifdef UARCH_ia64
         asm volatile (
-                "mov r15 = %0\n"
-                "mov r32 = %1\n"   /* r32 is in0 */
-                "break 0x80000\n"  /* modifies r8 */
-                :
-                : "i" (SKI_PUTCHAR), "r" (ch)
-                : "r15", "in0", "r8"
+            "mov r15 = %0\n"
+            "mov r32 = %1\n"   /* r32 is in0 */
+            "break 0x80000\n"  /* modifies r8 */
+            :
+            : "i" (SKI_PUTCHAR), "r" (ch)
+            : "r15", "in0", "r8"
         );
 #else