Changeset 8565a42 in mainline for kernel/genarch/src/kbrd/kbrd.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/genarch/src/kbrd/kbrd.c (modified) (8 diffs)

kernel/genarch/src/kbrd/kbrd.c

@@ -78 +78 @@
 {
         spinlock_lock(&instance->keylock);
-        
+
         switch (sc) {
         case SC_LSHIFT:
@@ -94 +94 @@
                 break;
         }
-        
+
         spinlock_unlock(&instance->keylock);
 }
@@ -108 +108 @@
         bool capslock;
         wchar_t ch;
-        
+
         spinlock_lock(&instance->keylock);
-        
+
         switch (sc) {
         case SC_LSHIFT:
@@ -126 +126 @@
                 capslock = (instance->keyflags & PRESSED_CAPSLOCK) ||
                     (instance->lockflags & LOCKED_CAPSLOCK);
-                
+
                 if ((letter) && (capslock))
                         shift = !shift;
-                
+
                 if (shift)
                         ch = sc_secondary_map[sc];
                 else
                         ch = sc_primary_map[sc];
-                
+
                 switch (ch) {
                 case U_PAGE_UP:
@@ -145 +145 @@
                         indev_push_character(instance->sink, ch);
                 }
-                
-                break;
-        }
-        
+
+                break;
+        }
+
         spinlock_unlock(&instance->keylock);
 }
@@ -155 +155 @@
 {
         kbrd_instance_t *instance = (kbrd_instance_t *) arg;
-        
+
         while (true) {
                 wchar_t sc = indev_pop_character(&instance->raw);
-                
+
                 if (sc == IGNORE_CODE)
                         continue;
-                
+
                 if (sc & KEY_RELEASE)
                         key_released(instance, (sc ^ KEY_RELEASE) & 0x7f);
@@ -176 +176 @@
                 instance->thread = thread_create(kkbrd, (void *) instance,
                     TASK, THREAD_FLAG_NONE, "kkbrd");
-                
+
                 if (!instance->thread) {
                         free(instance);
                         return NULL;
                 }
-                
+
                 instance->sink = NULL;
                 indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops);
-                
+
                 spinlock_initialize(&instance->keylock, "kbrd.instance.keylock");
                 instance->keyflags = 0;
                 instance->lockflags = 0;
         }
-        
+
         return instance;
 }
@@ -197 +197 @@
         assert(instance);
         assert(sink);
-        
+
         instance->sink = sink;
         thread_ready(instance->thread);
-        
+
         return &instance->raw;
 }