Changeset d87561c in mainline

Timestamp:

2013-06-11T14:22:04Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

dba3e2c

Parents:

f81498d

Message:

C style: type-casting etc.

Location:

uspace

Files:

• drv/char/ps2mouse/ps2mouse.c (modified) (2 diffs)
• drv/nic/rtl8139/driver.c (modified) (1 diff)
• lib/c/generic/devman.c (modified) (1 diff)
• lib/usbhid/src/hidiface.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); \

uspace/drv/nic/rtl8139/driver.c

@@ -620 +620 @@
                 if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
                         ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", "
-                            "header 0x%4" PRIx16 ". Offset: %d)", size, frame_header,
+                            "header 0x%4" PRIx32 ". Offset: %" PRIu16 ")", size, frame_header,
                             rx_offset);
                         goto rx_err;

uspace/lib/c/generic/devman.c

@@ -413 +413 @@
         sysarg_t dretval;
         
-        exch = devman_exchange_begin_blocking(LOC_PORT_CONSUMER);
+        exch = devman_exchange_begin_blocking(DEVMAN_CLIENT);
         
         ipc_call_t answer;

uspace/lib/usbhid/src/hidiface.c

@@ -90 +90 @@
                 return EINVAL;
         
-        if ((buf == NULL))
+        if (buf == NULL)
                 return ENOMEM;
         
@@ -184 +184 @@
                 return EINVAL;
         
-        if ((buf == NULL))
+        if (buf == NULL)
                 return ENOMEM;