Changeset 4363000 in mainline

Timestamp:

2016-05-13T12:40:24Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9260102

Parents:

5012203

Message:

Make sure not to shift bits out of the width of the result

Location:

uspace

Files:

• drv/bus/usb/ohci/ohci_regs.h (modified) (1 diff)
• lib/usb/include/usb/usb.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/ohci_regs.h

@@ -180 +180 @@
 /** Device removable mask */
 #define RHDB_DR_SHIFT   0
-#define RHDB_DR_MASK    0xffff
+#define RHDB_DR_MASK    0xffffU
 /** Power control mask */
-#define RHDB_PCC_MASK (0xffff)
-#define RHDB_PCC_SHIFT 16
+#define RHDB_PCC_MASK   0xffffU
+#define RHDB_PCC_SHIFT  16
 
         /** Root hub status register */

uspace/lib/usb/include/usb/usb.h

@@ -168 +168 @@
         ( \
             _MAKE_PID_NIBBLE(tag, type) \
-            | ((~_MAKE_PID_NIBBLE(tag, type)) << 4) \
+            | (((~_MAKE_PID_NIBBLE(tag, type)) & 0xf) << 4) \
         )
         USB_PID_OUT = _MAKE_PID(0, 1),