Changeset 32ba5a6 in mainline

Timestamp:

2011-12-26T22:08:24Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e67e1be

Parents:

4005e37a

Message:

i8042: Fix endless loop in buffer_read.

File:

• uspace/drv/char/i8042/buffer.h (modified) (2 diffs)

uspace/drv/char/i8042/buffer.h

@@ -64 +64 @@
 {
         fibril_mutex_lock(&buffer->guard);
+
         /* Next position. */
         uint8_t *new_head = buffer->write_head + 1;
         if (new_head == buffer->buffer_end)
                 new_head = buffer->buffer;
+
         /* Buffer full. */
         while (new_head == buffer->read_head)
                 fibril_condvar_wait(&buffer->change, &buffer->guard);
+
         /* Write data. */
         *buffer->write_head = data;
@@ -102 +105 @@
         if (new_write_head == buffer->buffer_end)
                 new_write_head = buffer->buffer;
-        while (new_write_head == buffer->read_head)
+        if (new_write_head == buffer->read_head)
                 fibril_condvar_broadcast(&buffer->change);
+
         /* Move head */
         buffer->read_head = new_head;