Changeset ce3efa0 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2014-08-12T16:49:25Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

593e023

Parents:

f6ab787

Message:

cstyle
(no change in functionality)

File:

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

uspace/srv/hid/input/input.c

@@ -103 +103 @@
         
         switch (key) {
-        case KC_LCTRL: mod_mask = KM_LCTRL; break;
-        case KC_RCTRL: mod_mask = KM_RCTRL; break;
-        case KC_LSHIFT: mod_mask = KM_LSHIFT; break;
-        case KC_RSHIFT: mod_mask = KM_RSHIFT; break;
-        case KC_LALT: mod_mask = KM_LALT; break;
-        case KC_RALT: mod_mask = KM_RALT; break;
-        default: mod_mask = 0; break;
+        case KC_LCTRL:
+                mod_mask = KM_LCTRL;
+                break;
+        case KC_RCTRL:
+                mod_mask = KM_RCTRL;
+                break;
+        case KC_LSHIFT:
+                mod_mask = KM_LSHIFT;
+                break;
+        case KC_RSHIFT:
+                mod_mask = KM_RSHIFT;
+                break;
+        case KC_LALT:
+                mod_mask = KM_LALT;
+                break;
+        case KC_RALT:
+                mod_mask = KM_RALT;
+                break;
+        default:
+                mod_mask = 0;
         }
         
@@ -120 +133 @@
         
         switch (key) {
-        case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
-        case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
-        case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
-        default: mod_mask = 0; break;
+        case KC_CAPS_LOCK:
+                mod_mask = KM_CAPS_LOCK;
+                break;
+        case KC_NUM_LOCK:
+                mod_mask = KM_NUM_LOCK;
+                break;
+        case KC_SCROLL_LOCK:
+                mod_mask = KM_SCROLL_LOCK;
+                break;
+        default:
+                mod_mask = 0;
         }
         
@@ -143 +163 @@
         }
         
-        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-            key == KC_F1) {
+        // TODO: More elegant layout switching
+        
+        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
+            (key == KC_F1)) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[0]);
@@ -150 +172 @@
         }
         
-        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-            key == KC_F2) {
+        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
+            (key == KC_F2)) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[1]);
@@ -157 +179 @@
         }
         
-        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-            key == KC_F3) {
+        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
+            (key == KC_F3)) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[2]);
@@ -164 +186 @@
         }
         
-        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-            key == KC_F4) {
+        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
+            (key == KC_F4)) {
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[3]);
@@ -620 +642 @@
 static int input_start_dev_discovery(void)
 {
-        int rc;
-
-        rc = loc_register_cat_change_cb(cat_change_cb);
+        int rc = loc_register_cat_change_cb(cat_change_cb);
         if (rc != EOK) {
                 printf("%s: Failed registering callback for device discovery. "
@@ -628 +648 @@
                 return rc;
         }
-
+        
         return dev_check_new();
 }
@@ -668 +688 @@
         /* Register driver */
         async_set_client_connection(client_connection);
+        
         int rc = loc_server_register(NAME);
         if (rc != EOK) {