usb/core: use bin2bcd() for bcdDevice in RH

[karo-tx-linux.git] / include / linux / bcd.h

diff --git a/include/linux/bcd.h b/include/linux/bcd.h
index 22ea563ba3eb169f9e04aac1233b404923c42d6e..18fff11fb3eadbe6ebd715a584aa49909d1dd30f 100644 (file)
--- a/include/linux/bcd.h
+++ b/include/linux/bcd.h
@@ -3,7 +3,20 @@
 
 #include <linux/compiler.h>
 
-unsigned bcd2bin(unsigned char val) __attribute_const__;
-unsigned char bin2bcd(unsigned val) __attribute_const__;
+#define bcd2bin(x)                                     \
+               (__builtin_constant_p((u8 )(x)) ?       \
+               const_bcd2bin(x) :                      \
+               _bcd2bin(x))
+
+#define bin2bcd(x)                                     \
+               (__builtin_constant_p((u8 )(x)) ?       \
+               const_bin2bcd(x) :                      \
+               _bin2bcd(x))
+
+#define const_bcd2bin(x)       (((x) & 0x0f) + ((x) >> 4) * 10)
+#define const_bin2bcd(x)       ((((x) / 10) << 4) + (x) % 10)
+
+unsigned _bcd2bin(unsigned char val) __attribute_const__;
+unsigned char _bin2bcd(unsigned val) __attribute_const__;
 
 #endif /* _BCD_H */