Changeset 4339f09 in mainline for uspace/drv

Timestamp:

2013-06-28T07:46:31Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e52b4b5

Parents:

3de67b4c (diff), dba3e2c (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:

Mostly C style (obey clang suggestions)

Merge from lp:~vojtech-horky/helenos/misc.

Most changes driven by warnings/errors from clang, such as type
redefinitions (typedef struct …) or possibly uninitizalied
variables. Clang still emits some warnings but a lot less than
before . As a result, kernel can be built with clang/-Werror.

Also updated mkext2.py to work with Python 3 again.

Location:

uspace/drv

Files:

• bus/usb/vhc/hub/virthubops.c (modified) (1 diff)
• char/ps2mouse/ps2mouse.c (modified) (2 diffs)
• nic/rtl8139/driver.c (modified) (1 diff)

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -299 +299 @@
     size_t *act_size)
 {
-        int rc;
+        int rc = ENOTSUP;
         size_t port = request->index - 1;
         usb_hub_class_feature_t feature = request->value;

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;