Changeset 1433ecda in mainline for uspace/srv/hid/isdv4_tablet/isdv4.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/isdv4.c (modified) (13 diffs)

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -98 +98 @@
                                 event.button = 1;
                                 state->emit_event_fn(&event);
-                        }
-                        else if (finger1 && !state->finger1_pressed) {
+                        } else if (finger1 && !state->finger1_pressed) {
                                 state->finger1_pressed = true;
 
@@ -105 +104 @@
                                 event.button = 1;
                                 state->emit_event_fn(&event);
-                        }
-                        else {
+                        } else {
                                 event.type = MOVE;
                                 event.button = 1;
@@ -112 +110 @@
                         }
                 }
-        }
-        else {
+        } else {
                 if (size != 9)
                         return true;
@@ -133 +130 @@
                         event.type = PROXIMITY_IN;
                         state->emit_event_fn(&event);
-                }
-                else if (!proximity && state->stylus_in_proximity) {
+                } else if (!proximity && state->stylus_in_proximity) {
                         /* Stylus came out of proximity */
                         state->stylus_in_proximity = false;
@@ -140 +136 @@
                         event.type = PROXIMITY_OUT;
                         state->emit_event_fn(&event);
-                }
-                else {
+                } else {
                         /* Proximity state didn't change, but we need to check if it is still eraser */
                         if (state->stylus_is_eraser && !button2) {
@@ -151 +146 @@
                                 state->emit_event_fn(&event);
                                 state->stylus_is_eraser = false;
-                        }
-                        else if (!state->stylus_is_eraser && !tip && button2) {
+                        } else if (!state->stylus_is_eraser && !tip && button2) {
                                 event.type = PROXIMITY_OUT;
                                 event.source = STYLUS_TIP;
@@ -170 +164 @@
                                 event.button = 1;
                                 state->emit_event_fn(&event);
-                        }
-                        else if (!tip && state->tip_pressed) {
+                        } else if (!tip && state->tip_pressed) {
                                 state->tip_pressed = false;
                                 event.type = RELEASE;
@@ -184 +177 @@
                                 event.button = 2;
                                 state->emit_event_fn(&event);
-                        }
-                        else if (!button1 && state->button1_pressed) {
+                        } else if (!button1 && state->button1_pressed) {
                                 state->button1_pressed = false;
                                 event.type = RELEASE;
@@ -198 +190 @@
                                 event.button = 3;
                                 state->emit_event_fn(&event);
-                        }
-                        else if (!button2 && state->button2_pressed) {
+                        } else if (!button2 && state->button2_pressed) {
                                 state->button2_pressed = false;
                                 event.type = RELEASE;
@@ -210 +201 @@
                         event.button = 0;
                         state->emit_event_fn(&event);
-                }
-                else {
+                } else {
                         if (tip && !state->tip_pressed) {
                                 state->tip_pressed = true;
@@ -218 +208 @@
                                 event.button = 1;
                                 state->emit_event_fn(&event);
-                        }
-                        else if (!tip && state->tip_pressed) {
+                        } else if (!tip && state->tip_pressed) {
                                 state->tip_pressed = false;
                                 event.type = RELEASE;
@@ -310 +299 @@
 
                 /* Skip data until a start of packet is found */
-                while (i < state->buf_end && (state->buf[i] & START_OF_PACKET) == 0) i++;
+                while (i < state->buf_end && (state->buf[i] & START_OF_PACKET) == 0)
+                        i++;
 
                 size_t start = i;
@@ -322 +312 @@
                         if (state->buf[i] & CONTROL_PACKET) {
                                 packet_remaining = 11;
-                        }
-                        else if (state->buf[i] & TOUCH_EVENT) {
+                        } else if (state->buf[i] & TOUCH_EVENT) {
                                 packet_remaining = 5;
-                        }
-                        else {
+                        } else {
                                 packet_remaining = 9;
                         }