Changeset 1433ecda in mainline for uspace/srv/hid/isdv4_tablet/main.c

Timestamp:

2018-04-04T15:42:37Z (7 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.

File:

• uspace/srv/hid/isdv4_tablet/main.c (modified) (9 diffs)

uspace/srv/hid/isdv4_tablet/main.c

@@ -94 +94 @@
         fibril_mutex_unlock(&client_mutex);
 
-        if (!sess) return;
+        if (!sess)
+                return;
 
         async_exch_t *exch = async_exchange_begin(sess);
@@ -105 +106 @@
                 }
                 async_msg_4(exch, MOUSEEV_ABS_MOVE_EVENT, event->x, event->y,
-                                    max_x, max_y);
+                    max_x, max_y);
                 if (event->type == PRESS || event->type == RELEASE) {
                         async_msg_2(exch, MOUSEEV_BUTTON_EVENT, event->button,
-                                    event->type == PRESS);
+                            event->type == PRESS);
                 }
         }
@@ -118 +119 @@
         const char *type = NULL;
         switch (event->type) {
-                case PRESS:
-                        type = "PRESS";
-                        break;
-                case RELEASE:
-                        type = "RELEASE";
-                        break;
-                case PROXIMITY_IN:
-                        type = "PROXIMITY IN";
-                        break;
-                case PROXIMITY_OUT:
-                        type = "PROXIMITY OUT";
-                        break;
-                case MOVE:
-                        type = "MOVE";
-                        break;
-                default:
-                        type = "UNKNOWN";
-                        break;
+        case PRESS:
+                type = "PRESS";
+                break;
+        case RELEASE:
+                type = "RELEASE";
+                break;
+        case PROXIMITY_IN:
+                type = "PROXIMITY IN";
+                break;
+        case PROXIMITY_OUT:
+                type = "PROXIMITY OUT";
+                break;
+        case MOVE:
+                type = "MOVE";
+                break;
+        default:
+                type = "UNKNOWN";
+                break;
         }
 
         const char *source = NULL;
         switch (event->source) {
-                case STYLUS_TIP:
-                        source = "stylus tip";
-                        break;
-                case STYLUS_ERASER:
-                        source = "stylus eraser";
-                        break;
-                case TOUCH:
-                        source = "touch";
-                        break;
+        case STYLUS_TIP:
+                source = "stylus tip";
+                break;
+        case STYLUS_ERASER:
+                source = "stylus eraser";
+                break;
+        case TOUCH:
+                source = "touch";
+                break;
         }
 
@@ -160 +161 @@
 {
         switch (data_id) {
-                case 0:
-                        return "resistive+stylus";
-                case 1:
-                        return "capacitive+stylus";
-                case 2:
-                        return "resistive";
-                case 3:
-                case 4:
-                        return "capacitive";
-                case 5:
-                        return "penabled";
+        case 0:
+                return "resistive+stylus";
+        case 1:
+                return "capacitive+stylus";
+        case 2:
+                return "resistive";
+        case 3:
+        case 4:
+                return "capacitive";
+        case 5:
+                return "penabled";
         }
         return "unknown";
@@ -189 +190 @@
         if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
                 size_t arg_offset = str_lsize(argv[arg], 7);
-                char* arg_str = argv[arg] + arg_offset;
+                char *arg_str = argv[arg] + arg_offset;
                 if (str_length(arg_str) == 0) {
                         fprintf(stderr, "--baud requires an argument\n");
@@ -219 +220 @@
                 }
                 arg++;
-        }
-        else {
+        } else {
                 category_id_t serial_cat_id;
 
@@ -233 +233 @@
                 size_t svc_count;
 
-                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);                if (rc != EOK) {
+                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);
+                if (rc != EOK) {
                         fprintf(stderr, "Failed getting list of services\n");
                         return 1;
@@ -301 +302 @@
         if (state.stylus_tilt_supported) {
                 printf("%ux%u\n", state.stylus_max_xtilt, state.stylus_max_ytilt);
-        }
-        else {
+        } else {
                 printf("not supported\n");
         }
         printf(" Touch: %ux%u type: %s\n", state.touch_max_x, state.touch_max_y,
-                touch_type(state.touch_type));
+            touch_type(state.touch_type));
 
         fid_t fibril = fibril_create(read_fibril, NULL);
@@ -337 +337 @@
         if (rc != EOK) {
                 printf(NAME ": Unable to get mouse category id.\n");
-        }
-        else {
+        } else {
                 rc = loc_service_add_to_cat(service_id, mouse_category);
                 if (rc != EOK) {