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
/
ds3231.c
diff --git
a/drivers/rtc/ds3231.c
b/drivers/rtc/ds3231.c
index d8cd47dac53d109e98ad47cca9bcc6a704f0d767..134a0e4fc22b85f25a6182f2db2e5f4332503bf7 100644
(file)
--- a/
drivers/rtc/ds3231.c
+++ b/
drivers/rtc/ds3231.c
@@
-79,8
+79,6
@@
static uchar rtc_read (uchar reg);
static void rtc_write (uchar reg, uchar val);
static uchar rtc_read (uchar reg);
static void rtc_write (uchar reg, uchar val);
-static uchar bin2bcd (unsigned int n);
-static unsigned bcd2bin (uchar c);
/*
/*
@@
-134,7
+132,7
@@
int rtc_get (struct rtc_time *tmp)
/*
* Set the RTC
*/
/*
* Set the RTC
*/
-
void
rtc_set (struct rtc_time *tmp)
+
int
rtc_set (struct rtc_time *tmp)
{
uchar century;
{
uchar century;
@@
-152,6
+150,8
@@
void rtc_set (struct rtc_time *tmp)
rtc_write (RTC_HR_REG_ADDR, bin2bcd (tmp->tm_hour));
rtc_write (RTC_MIN_REG_ADDR, bin2bcd (tmp->tm_min));
rtc_write (RTC_SEC_REG_ADDR, bin2bcd (tmp->tm_sec));
rtc_write (RTC_HR_REG_ADDR, bin2bcd (tmp->tm_hour));
rtc_write (RTC_MIN_REG_ADDR, bin2bcd (tmp->tm_min));
rtc_write (RTC_SEC_REG_ADDR, bin2bcd (tmp->tm_sec));
+
+ return 0;
}
}
@@
-175,23
+175,13
@@
void rtc_reset (void)
static
uchar rtc_read (uchar reg)
{
static
uchar rtc_read (uchar reg)
{
- return (i2c_reg_read (C
FG
_I2C_RTC_ADDR, reg));
+ return (i2c_reg_read (C
ONFIG_SYS
_I2C_RTC_ADDR, reg));
}
static void rtc_write (uchar reg, uchar val)
{
}
static void rtc_write (uchar reg, uchar val)
{
- i2c_reg_write (CFG_I2C_RTC_ADDR, reg, 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));
+ i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
}
#endif
}
#endif