update RTC driver.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1094 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong@gmail.com 2010-11-22 14:50:45 +00:00
parent 1a0ec7b470
commit b7e611c0a5
1 changed files with 30 additions and 72 deletions

View File

@ -11,7 +11,7 @@
* Date Author Notes * Date Author Notes
* 2009-04-26 yi.qiu first version * 2009-04-26 yi.qiu first version
* 2010-03-18 Gary Lee add functions such as GregorianDay * 2010-03-18 Gary Lee add functions such as GregorianDay
* and rt_rtc_time_to_tm * and rtc_time_to_tm
* 2009-03-20 yi.qiu clean up * 2009-03-20 yi.qiu clean up
*/ */
@ -39,19 +39,19 @@ void rt_hw_rtc_get(struct tm *ti)
/* read RTC registers */ /* read RTC registers */
do do
{ {
sec = BCDSEC; sec = BCDSEC;
min = BCDMIN; min = BCDMIN;
hour = BCDHOUR; hour = BCDHOUR;
mday = BCDDATE; mday = BCDDATE;
wday = BCDDAY; wday = BCDDAY;
mon = BCDMON; mon = BCDMON;
year = BCDYEAR; year = BCDYEAR;
} while (sec != BCDSEC); } while (sec != BCDSEC);
/* #ifdef RTC_DEBUG
rt_kprintf("sec:%x min:%x hour:%x mday:%x wday:%x mon:%x year:%x\n", rt_kprintf("sec:%x min:%x hour:%x mday:%x wday:%x mon:%x year:%x\n",
sec, min, hour, mday, wday, mon, year); sec, min, hour, mday, wday, mon, year);
*/ #endif
/* disable access to RTC registers */ /* disable access to RTC registers */
RTC_DISABLE RTC_DISABLE
@ -74,13 +74,13 @@ void rt_hw_rtc_set(struct tm *ti)
{ {
rt_uint8_t sec, min, hour, mday, wday, mon, year; rt_uint8_t sec, min, hour, mday, wday, mon, year;
year = BIN2BCD(ti->tm_year); year = BIN2BCD(ti->tm_year);
mon = BIN2BCD(ti->tm_mon); mon = BIN2BCD(ti->tm_mon);
wday = BIN2BCD(ti->tm_wday); wday = BIN2BCD(ti->tm_wday);
mday = BIN2BCD(ti->tm_mday); mday = BIN2BCD(ti->tm_mday);
hour = BIN2BCD(ti->tm_hour); hour = BIN2BCD(ti->tm_hour);
min = BIN2BCD(ti->tm_min); min = BIN2BCD(ti->tm_min);
sec = BIN2BCD(ti->tm_sec); sec = BIN2BCD(ti->tm_sec);
/* enable access to RTC registers */ /* enable access to RTC registers */
RTC_ENABLE RTC_ENABLE
@ -110,39 +110,42 @@ void rt_hw_rtc_reset (void)
} }
static struct rt_device rtc; static struct rt_device rtc;
static rt_err_t rt_rtc_open(rt_device_t dev, rt_uint16_t oflag) static rt_err_t rtc_open(rt_device_t dev, rt_uint16_t oflag)
{ {
RTC_ENABLE RTC_ENABLE
return RT_EOK; return RT_EOK;
} }
static rt_err_t rt_rtc_close(rt_device_t dev) static rt_err_t rtc_close(rt_device_t dev)
{ {
RTC_DISABLE RTC_DISABLE
return RT_EOK; return RT_EOK;
} }
static rt_size_t rt_rtc_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size) static rt_size_t rtc_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
{ {
return RT_EOK; return RT_EOK;
} }
static rt_err_t rt_rtc_control(rt_device_t dev, rt_uint8_t cmd, void *args) static rt_err_t rtc_control(rt_device_t dev, rt_uint8_t cmd, void *args)
{ {
struct tm* time; struct tm tm, *tm_ptr;
time_t *time;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
time = (struct tm*)args; time = (time_t *)args;
switch (cmd) switch (cmd)
{ {
case RT_DEVICE_CTRL_RTC_GET_TIME: case RT_DEVICE_CTRL_RTC_GET_TIME:
/* read device */ /* read device */
rt_hw_rtc_get(time); rt_hw_rtc_get(&tm);
*((rt_time_t *)args) = mktime(&tm);
break; break;
case RT_DEVICE_CTRL_RTC_SET_TIME: case RT_DEVICE_CTRL_RTC_SET_TIME:
tm_ptr = localtime(time);
/* write device */ /* write device */
rt_hw_rtc_set(time); rt_hw_rtc_set(tm_ptr);
break; break;
} }
@ -155,75 +158,30 @@ void rt_hw_rtc_init(void)
/* register rtc device */ /* register rtc device */
rtc.init = RT_NULL; rtc.init = RT_NULL;
rtc.open = rt_rtc_open; rtc.open = rtc_open;
rtc.close = rt_rtc_close; rtc.close = rtc_close;
rtc.read = rt_rtc_read; rtc.read = rtc_read;
rtc.write = RT_NULL; rtc.write = RT_NULL;
rtc.control = rt_rtc_control; rtc.control = rtc_control;
/* no private */ /* no private */
rtc.private = RT_NULL; rtc.private = RT_NULL;
rt_device_register(&rtc, "rtc", RT_DEVICE_FLAG_RDWR); rt_device_register(&rtc, "rtc", RT_DEVICE_FLAG_RDWR);
} }
time_t time(time_t* t)
{
rt_kprintf("not implement yet\n");
return 0;
}
#ifdef RT_USING_FINSH
#include <finsh.h> #include <finsh.h>
void set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day) void list_date()
{ {
struct tm ti; time_t time;
rt_device_t device;
device = rt_device_find("rtc");
if (device != RT_NULL)
{
rt_rtc_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &ti);
ti.tm_year = year - 1900;
ti.tm_mon = month - 1;
ti.tm_mday = day;
rt_rtc_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &ti);
}
}
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;
rt_device_t device;
device = rt_device_find("rtc");
if (device != RT_NULL)
{
rt_rtc_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &ti);
ti.tm_hour = hour;
ti.tm_min = minute;
ti.tm_sec = second;
rt_rtc_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &ti);
}
}
FINSH_FUNCTION_EXPORT(set_time, set time(hour, minute, second))
void list_date(void)
{
struct tm ti;
rt_device_t device; rt_device_t device;
device = rt_device_find("rtc"); device = rt_device_find("rtc");
if (device != RT_NULL) if (device != RT_NULL)
{ {
rt_rtc_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &ti); rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
rt_kprintf("%04d-%02d-%02d %02d-%02d-%02d\n", rt_kprintf("%d, %s\n", time, ctime(&time));
ti.tm_year + 1900, ti.tm_mon+1, ti.tm_mday,
ti.tm_hour, ti.tm_min, ti.tm_sec);
} }
} }
FINSH_FUNCTION_EXPORT(list_date, list date) FINSH_FUNCTION_EXPORT(list_date, list date);
#endif