Changeset ad123964 in mainline for kbd/generic/key_buffer.c

Timestamp:

2006-06-01T00:21:19Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

cf28036

Parents:

c594489

Message:

Fixed some bugs.

File:

• kbd/generic/key_buffer.c (modified) (4 diffs)

kbd/generic/key_buffer.c

@@ -28 +28 @@
 
 #include <key_buffer.h>
+#include <futex.h>
+
+atomic_t keybuffer_futex = FUTEX_INITIALIZER;
 
 /** Clear key buffer.
@@ -33 +36 @@
 void keybuffer_free(keybuffer_t *keybuffer) 
 {
-
+        futex_down(&keybuffer_futex);
+        keybuffer->head = 0;
+        keybuffer->tail = 0;
         keybuffer->items = 0;
-        keybuffer->head = keybuffer->tail = keybuffer->items = 0;
+        futex_up(&keybuffer_futex);
 }
 
@@ -70 +75 @@
 void keybuffer_push(keybuffer_t *keybuffer, char key)
 {
+        futex_down(&keybuffer_futex);
         if (keybuffer->items < KEYBUFFER_SIZE) {
-                keybuffer->fifo[keybuffer->tail = (keybuffer->tail + 1) < keybuffer->items ? (keybuffer->tail + 1) : 0] = (key);
+                keybuffer->fifo[keybuffer->tail] = key;
+                keybuffer->tail = (keybuffer->tail + 1) % KEYBUFFER_SIZE;
                 keybuffer->items++;
         }
+        futex_up(&keybuffer_futex);
 }
 
@@ -82 +90 @@
 int keybuffer_pop(keybuffer_t *keybuffer, char *c)
 {
+        futex_down(&keybuffer_futex);
         if (keybuffer->items > 0) {
                 keybuffer->items--;
-                *c = keybuffer->fifo[keybuffer->head = (keybuffer->head + 1) < keybuffer->items ? (keybuffer->head + 1) : 0];
+                *c = keybuffer->fifo[keybuffer->head];
+                keybuffer->head = (keybuffer->head + 1) % KEYBUFFER_SIZE;
+                futex_up(&keybuffer_futex);
                 return 1;
         }
+        futex_up(&keybuffer_futex);
         return 0;
 }