diff options
| author | gary.li.wenchao.4 <[email protected]> | 2010-02-11 02:53:43 +0000 |
|---|---|---|
| committer | gary.li.wenchao.4 <[email protected]> | 2010-02-11 02:53:43 +0000 |
| commit | 66b8805283a059b01367be6f3f4ec8a0c507e004 (patch) | |
| tree | 1645beabff49a65564f0c2892b8a351d84ee24b9 /libcpu | |
| parent | 2fdf1120635181d9deb5715175977b857b7d7dfa (diff) | |
Modified macro of RTC_ENABLE and RTC_DISABLE
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@403 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/arm/s3c24x0/rtc.c | 23 | ||||
| -rw-r--r-- | libcpu/arm/s3c24x0/rtc.h | 4 |
2 files changed, 17 insertions, 10 deletions
diff --git a/libcpu/arm/s3c24x0/rtc.c b/libcpu/arm/s3c24x0/rtc.c index a1ba7bb254..c3251de57c 100644 --- a/libcpu/arm/s3c24x0/rtc.c +++ b/libcpu/arm/s3c24x0/rtc.c @@ -26,7 +26,7 @@ void rt_hw_rtc_get(struct rtc_time *ti) rt_uint8_t sec, min, hour, mday, wday, mon, year;
/* enable access to RTC registers */
- RTCCON |= RTC_ENABLE;
+ RTC_ENABLE();
/* read RTC registers */
do
@@ -38,10 +38,10 @@ void rt_hw_rtc_get(struct rtc_time *ti) wday = BCDDAY;
mon = BCDMON;
year = BCDYEAR;
- } while (sec != BCDSEC);
+ } while (sec != BCDSEC);
/* disable access to RTC registers */
- RTCCON &= ~0x01;
+ RTC_DISABLE();
ti->tm_sec = BCD2BIN(sec & 0x7F);
ti->tm_min = BCD2BIN(min & 0x7F);
@@ -70,7 +70,7 @@ void rt_hw_rtc_set(struct rtc_time *ti) sec = BIN2BCD(ti->tm_sec);
/* enable access to RTC registers */
- RTCCON |= 0x01;
+ RTC_ENABLE();
/* write RTC registers */
BCDSEC = sec;
@@ -82,7 +82,7 @@ void rt_hw_rtc_set(struct rtc_time *ti) BCDYEAR = year;
/* disable access to RTC registers */
- RTCCON &= ~0x01;
+ RTC_DISABLE();
}
/**
@@ -97,6 +97,13 @@ void rt_hw_rtc_reset (void) static struct rt_device rtc;
static rt_err_t rt_rtc_open(rt_device_t dev, rt_uint16_t oflag)
{
+ RTC_ENABLE();
+ return RT_EOK;
+}
+
+static rt_err_t rt_rtc_close(rt_device_t dev)
+{
+ RTC_DISABLE();
return RT_EOK;
}
@@ -134,7 +141,7 @@ void rt_hw_rtc_init(void) /* register rtc device */
rtc.init = RT_NULL;
rtc.open = rt_rtc_open;
- rtc.close = RT_NULL;
+ rtc.close = rt_rtc_close;
rtc.read = rt_rtc_read;
rtc.write = RT_NULL;
rtc.control = rt_rtc_control;
@@ -170,7 +177,7 @@ time_t time(time_t* t) #include <finsh.h>
void set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day)
{
- struct tm ti;
+ struct rtc_time ti;
rt_device_t device;
device = rt_device_find("rtc");
@@ -187,7 +194,7 @@ FINSH_FUNCTION_EXPORT(set_date, set date(year, month, day)) void set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second)
{
- struct tm ti;
+ struct rtc_time ti;
rt_device_t device;
device = rt_device_find("rtc");
diff --git a/libcpu/arm/s3c24x0/rtc.h b/libcpu/arm/s3c24x0/rtc.h index 8332e079bf..0541adec6a 100644 --- a/libcpu/arm/s3c24x0/rtc.h +++ b/libcpu/arm/s3c24x0/rtc.h @@ -8,8 +8,8 @@ #define RTC_DEBUG
-#define RTC_ENABLE 0x01
-#define RTC_DISABLE 0x02
+#define RTC_ENABLE() (RTCCON |= 0x01) //RTC read and write enable
+#define RTC_DISABLE() (RTCCON &= ~0x01) //RTC read and write disable
#define BCD2BIN(n) (((((n) >> 4) & 0x0F) * 10) + ((n) & 0x0F))
#define BIN2BCD(n) ((((n) / 10) << 4) | ((n) % 10))
|