projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GCC4.6: Squash warning in nand_bbt.c
[oweals/u-boot.git]
/
drivers
/
rtc
/
ds174x.c
diff --git
a/drivers/rtc/ds174x.c
b/drivers/rtc/ds174x.c
index 43e6ab763bd47f435319a8e47ad247a9927c76ca..5a55dc8b7adb112657850d949b8a58a377efb656 100644
(file)
--- a/
drivers/rtc/ds174x.c
+++ b/
drivers/rtc/ds174x.c
@@
-37,10
+37,8
@@
static uchar rtc_read( unsigned int addr );
static void rtc_write( unsigned int addr, uchar val);
static uchar rtc_read( unsigned int addr );
static void rtc_write( unsigned int addr, uchar val);
-static uchar bin2bcd (unsigned int n);
-static unsigned bcd2bin(uchar c);
-#define RTC_BASE ( C
FG_NVRAM_SIZE + CFG
_NVRAM_BASE_ADDR )
+#define RTC_BASE ( C
ONFIG_SYS_NVRAM_SIZE + CONFIG_SYS
_NVRAM_BASE_ADDR )
#define RTC_YEAR ( RTC_BASE + 7 )
#define RTC_MONTH ( RTC_BASE + 6 )
#define RTC_YEAR ( RTC_BASE + 7 )
#define RTC_MONTH ( RTC_BASE + 6 )
@@
-192,14
+190,4
@@
static void rtc_write( unsigned int addr, uchar val )
out8( addr, val );
}
out8( addr, val );
}
-static unsigned bcd2bin (uchar n)
-{
- return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-static unsigned char bin2bcd (unsigned int n)
-{
- return (((n / 10) << 4) | (n % 10));
-}
-
#endif
#endif