Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED]
---
board/bmw/m48t59y.c |4 ++--
board/cray/L1/L1.c |4 ++--
board/etin/debris/phantom.c |4 +++-
board/mousse/m48t59y.c |4 ++--
common/cmd_date.c | 28
cpu/s3c44b0/cpu.c |4 +++-
drivers/rtc/bfin_rtc.c |6 --
drivers/rtc/ds12887.c |4 +++-
drivers/rtc/ds1302.c|5 +++--
drivers/rtc/ds1306.c|6 --
drivers/rtc/ds1307.c|4 +++-
drivers/rtc/ds1337.c|4 +++-
drivers/rtc/ds1374.c|4 +++-
drivers/rtc/ds1556.c|4 +++-
drivers/rtc/ds164x.c|4 +++-
drivers/rtc/ds174x.c|4 +++-
drivers/rtc/ds3231.c|4 +++-
drivers/rtc/isl1208.c |4 +++-
drivers/rtc/m41t11.c|4 +++-
drivers/rtc/m41t60.c|8 +---
drivers/rtc/m41t62.c|8 ++--
drivers/rtc/m48t35ax.c |4 +++-
drivers/rtc/max6900.c |4 +++-
drivers/rtc/mc13783-rtc.c |8 +---
drivers/rtc/mc146818.c |3 ++-
drivers/rtc/mcfrtc.c|4 +++-
drivers/rtc/mk48t59.c |6 --
drivers/rtc/mpc5xxx.c |4 +++-
drivers/rtc/mpc8xx.c|4 +++-
drivers/rtc/pcf8563.c |4 +++-
drivers/rtc/pl031.c |6 --
drivers/rtc/rs5c372.c | 10 +++---
drivers/rtc/rx8025.c|4 +++-
drivers/rtc/s3c24x0_rtc.c |4 +++-
drivers/rtc/x1205.c |4 +++-
include/rtc.h |2 +-
36 files changed, 134 insertions(+), 58 deletions(-)
mode change 100755 = 100644 drivers/rtc/pl031.c
diff --git a/board/bmw/m48t59y.c b/board/bmw/m48t59y.c
index a1a85d0..4e83b90 100644
--- a/board/bmw/m48t59y.c
+++ b/board/bmw/m48t59y.c
@@ -299,8 +299,7 @@ rtc_get( struct rtc_time *tmp )
return 0;
}
-void
-rtc_set( struct rtc_time *tmp )
+int rtc_set( struct rtc_time *tmp )
{
m48_tod_set(tmp-tm_year, /* 1980-2079 */
tmp-tm_mon,/* 01-12 */
@@ -315,6 +314,7 @@ rtc_set( struct rtc_time *tmp )
tmp-tm_hour, tmp-tm_min, tmp-tm_sec);
#endif
+ return 0;
}
void
diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c
index f0dfa07..49a9e5e 100644
--- a/board/cray/L1/L1.c
+++ b/board/cray/L1/L1.c
@@ -181,9 +181,9 @@ int rtc_get (struct rtc_time *tmp)
{
return 0;
}
-void rtc_set (struct rtc_time *tmp)
+int rtc_set (struct rtc_time *tmp)
{
- return;
+ return 0;
}
void rtc_reset (void)
{
diff --git a/board/etin/debris/phantom.c b/board/etin/debris/phantom.c
index 263da6b..48b81f7 100644
--- a/board/etin/debris/phantom.c
+++ b/board/etin/debris/phantom.c
@@ -254,7 +254,7 @@ int rtc_get( struct rtc_time *tmp)
return 0;
}
-void rtc_set( struct rtc_time *tmp )
+int rtc_set( struct rtc_time *tmp )
{
if (phantom_flag 0)
phantom_flag = get_phantom_flag();
@@ -307,6 +307,8 @@ void rtc_set( struct rtc_time *tmp )
/* unlock clock registers after read */
rtc_write( RTC_CONTROLA, ( reg_a ~RTC_CA_WRITE ));
}
+
+ return 0;
}
#endif
diff --git a/board/mousse/m48t59y.c b/board/mousse/m48t59y.c
index 2c1e6cf..beb26fe 100644
--- a/board/mousse/m48t59y.c
+++ b/board/mousse/m48t59y.c
@@ -299,8 +299,7 @@ rtc_get( struct rtc_time *tmp )
return 0;
}
-void
-rtc_set( struct rtc_time *tmp )
+int rtc_set( struct rtc_time *tmp )
{
m48_tod_set(tmp-tm_year, /* 1980-2079 */
tmp-tm_mon,/* 01-12 */
@@ -315,6 +314,7 @@ rtc_set( struct rtc_time *tmp )
tmp-tm_hour, tmp-tm_min, tmp-tm_sec);
#endif
+ return 0;
}
void
diff --git a/common/cmd_date.c b/common/cmd_date.c
index 7511598..d6cd565 100644
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -56,18 +56,30 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
rtc_reset ();
} else {
/* initialize tm with current time */
- rtc_get (tm);
- /* insert new date time */
- if (mk_date (argv[1], tm) != 0) {
- puts (## Bad date format\n);
- break;
+ rcode = rtc_get (tm);
+
+ if(!rcode) {
+ /* insert new date time */
+ if (mk_date (argv[1], tm) != 0) {
+ puts (## Bad date format\n);
+ break;
+ }
+ /* and write to RTC */
+ rcode = rtc_set (tm);
+ if(rcode)
+ puts(## Set date failled\n);
+