diff options
| author | Tom Rini <[email protected]> | 2015-05-08 10:46:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-05-08 10:46:59 -0400 |
| commit | 02ffb580e6ab7aaa7f6703ed35f489e97439cb65 (patch) | |
| tree | 77cea28c53d54583a3acfa5534a8aa10054eb29c /include/bcd.h | |
| parent | 57cc4e64c13bc5f42cb5e8572d2c46e25cf7aea1 (diff) | |
| parent | a5e1bcdeebebabdc5d013fbd488f87a4e62ff411 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/bcd.h')
| -rw-r--r-- | include/bcd.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/bcd.h b/include/bcd.h index af4aa9c7baf..9ecd328284e 100644 --- a/include/bcd.h +++ b/include/bcd.h @@ -10,14 +10,12 @@ #ifndef _BCD_H #define _BCD_H -#include <linux/types.h> - -static inline unsigned int bcd2bin(u8 val) +static inline unsigned int bcd2bin(unsigned int val) { - return ((val) & 0x0f) + ((val) >> 4) * 10; + return ((val) & 0x0f) + ((val & 0xff) >> 4) * 10; } -static inline u8 bin2bcd (unsigned int val) +static inline unsigned int bin2bcd(unsigned int val) { return (((val / 10) << 4) | (val % 10)); } |