diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 11:25:57 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 11:25:57 -0400 |
| commit | 50cb993ea6cd187bfed085cb3e0747066edeb02f (patch) | |
| tree | 61edac62c6c5bc07c59e4369c50c6821ad77f2c0 /include/linux/bcd.h | |
| parent | 445c2714cf72817ab1ad3ca894c6d9b2047b3a3e (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/bcd.h')
| -rw-r--r-- | include/linux/bcd.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/bcd.h b/include/linux/bcd.h index c545308125b0..7ac518e3c152 100644 --- a/include/linux/bcd.h +++ b/include/linux/bcd.h | |||
| @@ -10,8 +10,13 @@ | |||
| 10 | #ifndef _BCD_H | 10 | #ifndef _BCD_H |
| 11 | #define _BCD_H | 11 | #define _BCD_H |
| 12 | 12 | ||
| 13 | #define BCD2BIN(val) (((val) & 0x0f) + ((val)>>4)*10) | 13 | #include <linux/compiler.h> |
| 14 | #define BIN2BCD(val) ((((val)/10)<<4) + (val)%10) | 14 | |
| 15 | unsigned bcd2bin(unsigned char val) __attribute_const__; | ||
| 16 | unsigned char bin2bcd(unsigned val) __attribute_const__; | ||
| 17 | |||
| 18 | #define BCD2BIN(val) bcd2bin(val) | ||
| 19 | #define BIN2BCD(val) bin2bcd(val) | ||
| 15 | 20 | ||
| 16 | /* backwards compat */ | 21 | /* backwards compat */ |
| 17 | #define BCD_TO_BIN(val) ((val)=BCD2BIN(val)) | 22 | #define BCD_TO_BIN(val) ((val)=BCD2BIN(val)) |