Changeset dd0c8a0 in mainline for uspace/drv/char/ps2mouse/ps2mouse.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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.

Message:

Merge mainline changes.

File:

• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (2 diffs)

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -70 +70 @@
 #define PS2_BUTTON_MASK(button) (1 << button)
 
-#define MOUSE_READ_BYTE_TEST(sess, value) \
+#define MOUSE_READ_BYTE_TEST(sess, value_) \
 do { \
+        uint8_t value = (value_); \
         uint8_t data = 0; \
         const ssize_t size = chardev_read(sess, &data, 1); \
@@ -78 +79 @@
                 return size < 0 ? size : EIO; \
         } \
-        if (data != (value)) { \
+        if (data != value) { \
                 ddf_msg(LVL_DEBUG, "Failed testing byte: got %hhx vs. %hhx)", \
-                    data, (value)); \
+                    data, value); \
                 return EIO; \
         } \
 } while (0)
 
-#define MOUSE_WRITE_BYTE(sess, value) \
+#define MOUSE_WRITE_BYTE(sess, value_) \
 do { \
+        uint8_t value = (value_); \
         uint8_t data = (value); \
         const ssize_t size = chardev_write(sess, &data, 1); \