Browse Source

rename bsp/stm32f10x/drivers/rtc.c to stm32f1_rtc.c
rename bsp/stm32f10x/drivers/rtc.h to stm32f10x/drivers/stm32f1_rtc.h

remove set_date,set_time function.

FlyM 10 years ago
parent
commit
32855cfd3a
2 changed files with 89 additions and 89 deletions
  1. 89 89
      bsp/stm32f10x/drivers/stm32f1_rtc.c
  2. 0 0
      bsp/stm32f10x/drivers/stm32f1_rtc.h

+ 89 - 89
bsp/stm32f10x/drivers/rtc.c → bsp/stm32f10x/drivers/stm32f1_rtc.c

@@ -15,7 +15,7 @@
 
 
 #include <rtthread.h>
 #include <rtthread.h>
 #include <stm32f10x.h>
 #include <stm32f10x.h>
-#include "rtc.h"
+#include "stm32f1_rtc.h"
 
 
 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 rt_rtc_open(rt_device_t dev, rt_uint16_t oflag)
@@ -159,91 +159,91 @@ void rt_hw_rtc_init(void)
     return;
     return;
 }
 }
 
 
-#include <time.h>
-#if defined (__IAR_SYSTEMS_ICC__) &&  (__VER__) >= 6020000   /* for IAR 6.2 later Compiler */
-#pragma module_name = "?time"
-time_t (__time32)(time_t *t)                                 /* Only supports 32-bit timestamp */
-#else
-time_t time(time_t* t)
-#endif
-{
-    rt_device_t device;
-    time_t time=0;
-
-    device = rt_device_find("rtc");
-    if (device != RT_NULL)
-    {
-        rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
-        if (t != RT_NULL) *t = time;
-    }
-
-    return time;
-}
-
-#ifdef RT_USING_FINSH
-#include <finsh.h>
-
-void set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day)
-{
-    time_t now;
-    struct tm* ti;
-    rt_device_t device;
-
-    ti = RT_NULL;
-    /* get current time */
-    time(&now);
-
-    ti = localtime(&now);
-    if (ti != RT_NULL)
-    {
-        ti->tm_year = year - 1900;
-        ti->tm_mon 	= month - 1; /* ti->tm_mon 	= month; 0~11 */
-        ti->tm_mday = day;
-    }
-
-    now = mktime(ti);
-
-    device = rt_device_find("rtc");
-    if (device != RT_NULL)
-    {
-        rt_rtc_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &now);
-    }
-}
-FINSH_FUNCTION_EXPORT(set_date, set date. e.g: set_date(2010,2,28))
-
-void set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second)
-{
-    time_t now;
-    struct tm* ti;
-    rt_device_t device;
-
-    ti = RT_NULL;
-    /* get current time */
-    time(&now);
-
-    ti = localtime(&now);
-    if (ti != RT_NULL)
-    {
-        ti->tm_hour = hour;
-        ti->tm_min 	= minute;
-        ti->tm_sec 	= second;
-    }
-
-    now = mktime(ti);
-    device = rt_device_find("rtc");
-    if (device != RT_NULL)
-    {
-        rt_rtc_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &now);
-    }
-}
-FINSH_FUNCTION_EXPORT(set_time, set time. e.g: set_time(23,59,59))
-
-void list_date(void)
-{
-    time_t now;
-
-    time(&now);
-    rt_kprintf("%s\n", ctime(&now));
-}
-FINSH_FUNCTION_EXPORT(list_date, show date and time.)
-#endif
+// #include <time.h>
+// #if defined (__IAR_SYSTEMS_ICC__) &&  (__VER__) >= 6020000   /* for IAR 6.2 later Compiler */
+// #pragma module_name = "?time"
+// time_t (__time32)(time_t *t)                                 /* Only supports 32-bit timestamp */
+// #else
+// time_t time(time_t* t)
+// #endif
+// {
+//     rt_device_t device;
+//     time_t time=0;
+// 
+//     device = rt_device_find("rtc");
+//     if (device != RT_NULL)
+//     {
+//         rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
+//         if (t != RT_NULL) *t = time;
+//     }
+// 
+//     return time;
+// }
+
+// #ifdef RT_USING_FINSH
+// #include <finsh.h>
+// 
+// void set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day)
+// {
+//     time_t now;
+//     struct tm* ti;
+//     rt_device_t device;
+// 
+//     ti = RT_NULL;
+//     /* get current time */
+//     time(&now);
+// 
+//     ti = localtime(&now);
+//     if (ti != RT_NULL)
+//     {
+//         ti->tm_year = year - 1900;
+//         ti->tm_mon 	= month - 1; /* ti->tm_mon 	= month; 0~11 */
+//         ti->tm_mday = day;
+//     }
+// 
+//     now = mktime(ti);
+// 
+//     device = rt_device_find("rtc");
+//     if (device != RT_NULL)
+//     {
+//         rt_rtc_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &now);
+//     }
+// }
+// FINSH_FUNCTION_EXPORT(set_date, set date. e.g: set_date(2010,2,28))
+// 
+// void set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second)
+// {
+//     time_t now;
+//     struct tm* ti;
+//     rt_device_t device;
+// 
+//     ti = RT_NULL;
+//     /* get current time */
+//     time(&now);
+// 
+//     ti = localtime(&now);
+//     if (ti != RT_NULL)
+//     {
+//         ti->tm_hour = hour;
+//         ti->tm_min 	= minute;
+//         ti->tm_sec 	= second;
+//     }
+// 
+//     now = mktime(ti);
+//     device = rt_device_find("rtc");
+//     if (device != RT_NULL)
+//     {
+//         rt_rtc_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &now);
+//     }
+// }
+// FINSH_FUNCTION_EXPORT(set_time, set time. e.g: set_time(23,59,59))
+// 
+// void list_date(void)
+// {
+//     time_t now;
+// 
+//     time(&now);
+//     rt_kprintf("%s\n", ctime(&now));
+// }
+// FINSH_FUNCTION_EXPORT(list_date, show date and time.)
+// #endif

+ 0 - 0
bsp/stm32f10x/drivers/rtc.h → bsp/stm32f10x/drivers/stm32f1_rtc.h