完善RTC部分

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@415 bbd45198-f89e-11dd-88c7-29a3b14d5316

bsp/stm32_radio/application.c

@@ -24,6 +24,7 @@
 #include "board.h"
 #include "netbuffer.h"
 #include "lcd.h"
+#include "rtc.h"
 
 #ifdef RT_USING_DFS
 /* dfs init */
@@ -78,28 +79,28 @@ void rt_init_thread_entry(void *parameter)
     }
 #endif
 
-	/* RTGUI Initialization */
+    /* RTGUI Initialization */
 #ifdef RT_USING_RTGUI
-	{
-		extern void rt_hw_key_init(void);
+    {
+        extern void rt_hw_key_init(void);
 
-		radio_rtgui_init();
-		rt_hw_key_init();
-	}
+        radio_rtgui_init();
+        rt_hw_key_init();
+    }
 #endif
 
     /* LwIP Initialization */
 #ifdef RT_USING_LWIP
     {
         extern void lwip_sys_init(void);
-		extern void rt_hw_dm9000_init(void);
+        extern void rt_hw_dm9000_init(void);
 
-		eth_system_device_init();
+        eth_system_device_init();
 
-		/* register ethernetif device */
-		rt_hw_dm9000_init();
-		/* init all device */
-		rt_device_init_all();
+        /* register ethernetif device */
+        rt_hw_dm9000_init();
+        /* init all device */
+        rt_device_init_all();
 
         /* init lwip system */
         lwip_sys_init();
@@ -108,16 +109,19 @@ void rt_init_thread_entry(void *parameter)
 #endif
 
 #if STM32_EXT_SRAM
-	/* init netbuf worker */
-	net_buf_init(320 * 1024);
+    /* init netbuf worker */
+    net_buf_init(320 * 1024);
 #endif
+
+    /* start RTC */
+    rt_hw_rtc_init();
 }
 
 int rt_application_init()
 {
     rt_thread_t init_thread;
 
-	rt_hw_lcd_init();
+    rt_hw_lcd_init();
 
 #if (RT_THREAD_PRIORITY_MAX == 32)
     init_thread = rt_thread_create("init",

bsp/stm32_radio/board.c

@@ -26,58 +26,6 @@ static void rt_hw_console_init(void);
 
 /*@{*/
 
-/*******************************************************************************
- * Function Name  : RCC_Configuration
- * Description    : Configures the different system clocks.
- * Input          : None
- * Output         : None
- * Return         : None
- *******************************************************************************/
-void RCC_Configuration(void)
-{
-    ErrorStatus HSEStartUpStatus;
-
-    /* RCC system reset(for debug purpose) */
-    RCC_DeInit();
-
-    /* Enable HSE */
-    RCC_HSEConfig(RCC_HSE_ON);
-
-    /* Wait till HSE is ready */
-    HSEStartUpStatus = RCC_WaitForHSEStartUp();
-
-    if (HSEStartUpStatus == SUCCESS)
-    {
-        /* HCLK = SYSCLK */
-        RCC_HCLKConfig(RCC_SYSCLK_Div1);
-
-        /* PCLK2 = HCLK */
-        RCC_PCLK2Config(RCC_HCLK_Div1);
-        /* PCLK1 = HCLK/2 */
-        RCC_PCLK1Config(RCC_HCLK_Div2);
-
-        /* Flash 2 wait state */
-        FLASH_SetLatency(FLASH_Latency_2);
-        /* Enable Prefetch Buffer */
-        FLASH_PrefetchBufferCmd(FLASH_PrefetchBuffer_Enable);
-
-        /* PLLCLK = 8MHz * 9 = 72 MHz */
-        RCC_PLLConfig(RCC_PLLSource_HSE_Div1, RCC_PLLMul_9);
-
-        /* Enable PLL */
-        RCC_PLLCmd(ENABLE);
-
-        /* Wait till PLL is ready */
-        while (RCC_GetFlagStatus(RCC_FLAG_PLLRDY) == RESET) ;
-
-        /* Select PLL as system clock source */
-        RCC_SYSCLKConfig(RCC_SYSCLKSource_PLLCLK);
-
-        /* Wait till PLL is used as system clock source */
-        while (RCC_GetSYSCLKSource() != 0x08) ;
-    }
-}
-
 /*******************************************************************************
 * Function Name  : NVIC_Configuration
 * Description    : Configures Vector Table base location.
@@ -103,26 +51,6 @@ void NVIC_Configuration(void)
     NVIC_PriorityGroupConfig(NVIC_PriorityGroup_2);
 }
 
-/*******************************************************************************
- * Function Name  : SysTick_Configuration
- * Description    : Configures the SysTick for OS tick.
- * Input          : None
- * Output         : None
- * Return         : None
- *******************************************************************************/
-void  SysTick_Configuration(void)
-{
-    RCC_ClocksTypeDef  rcc_clocks;
-    rt_uint32_t         cnts;
-
-    RCC_GetClocksFreq(&rcc_clocks);
-
-    cnts = (rt_uint32_t)rcc_clocks.HCLK_Frequency / RT_TICK_PER_SECOND;
-
-    SysTick_Config(cnts);
-    SysTick_CLKSourceConfig(SysTick_CLKSource_HCLK);
-}
-
 extern void rt_hw_interrupt_thread_switch(void);
 /**
  * This is the timer interrupt service routine.
@@ -151,7 +79,7 @@ void rt_hw_board_init()
     NAND_IDTypeDef NAND_ID;
 
     /* Configure the system clocks */
-    RCC_Configuration();
+    SystemInit();
 
     /* DM9000A */
     {
@@ -170,17 +98,18 @@ void rt_hw_board_init()
     NVIC_Configuration();
 
     /* Configure the SysTick */
-    SysTick_Configuration();
+    SysTick_Config( SystemFrequency_SysClk / RT_TICK_PER_SECOND );
 
     /* Console Initialization*/
     rt_hw_console_init();
+    rt_kprintf("\r\n\r\nSystemInit......\r\n");
 
     /* FSMC Initialization */
     FSMC_NAND_Init();
 
     /* NAND read ID command */
     FSMC_NAND_ReadID(&NAND_ID);
-    rt_kprintf("\r\n\r\nRead the NAND ID:%02X%02X%02X%02X",NAND_ID.Maker_ID,NAND_ID.Device_ID,NAND_ID.Third_ID,NAND_ID.Fourth_ID);
+    rt_kprintf("Read the NAND ID:%02X%02X%02X%02X",NAND_ID.Maker_ID,NAND_ID.Device_ID,NAND_ID.Third_ID,NAND_ID.Fourth_ID);
 
     /* SRAM init */
     RCC_AHBPeriphClockCmd(RCC_AHBPeriph_FSMC, ENABLE);

bsp/stm32_radio/project.Uv2

@@ -209,8 +209,6 @@ File 11,1,<..\..\rtgui\server\topwin.c><topwin.c>
 File 11,1,<..\..\rtgui\common\font_hz_file.c><font_hz_file.c>
 File 11,1,<..\..\rtgui\common\hz16font.c><hz16font.c>
 File 11,1,<..\..\rtgui\common\hz12font.c><hz12font.c>
-File 11,1,<..\..\rtgui\common\arial16font.c><arial16font.c>
-File 11,1,<..\..\rtgui\common\arial12font.c><arial12font.c>
 File 12,1,<.\Libraries\Mass_Storage\src\hw_config.c><hw_config.c>
 File 12,1,<.\Libraries\Mass_Storage\src\mass_mal.c><mass_mal.c>
 File 12,1,<.\Libraries\Mass_Storage\src\memory.c><memory.c>