summaryrefslogtreecommitdiff
path: root/bsp
diff options
context:
space:
mode:
authorwuyangyong <[email protected]>2010-03-17 02:49:00 +0000
committerwuyangyong <[email protected]>2010-03-17 02:49:00 +0000
commitc9ee5a06356bb57e2eadd2a5db92d56c52674d4e (patch)
tree0b9562b647bd032d474c881d7fa567010cd7fd9f /bsp
parent7e8a5f5d9f13a3e40875be52bab179026e689e13 (diff)
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@497 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'bsp')
-rw-r--r--bsp/stm32_radio/board.c32
-rw-r--r--bsp/stm32_radio/startup.c2
2 files changed, 14 insertions, 20 deletions
diff --git a/bsp/stm32_radio/board.c b/bsp/stm32_radio/board.c
index ac30a6c8d5..94311b45ce 100644
--- a/bsp/stm32_radio/board.c
+++ b/bsp/stm32_radio/board.c
@@ -71,9 +71,9 @@ void rt_hw_timer_handler(void)
static void all_device_reset(void)
{
/* RESET */
- /* DM9000A PE5 */
- /* LCD PF10 */
- /* SPI-FLASH PA3 */
+ /* DM9000A PE5 */
+ /* LCD PF10 */
+ /* SPI-FLASH PA3 */
/* CS */
/* DM9000A FSMC_NE4 PG12 */
@@ -89,6 +89,11 @@ static void all_device_reset(void)
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+ /* SDIO POWER */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
+ GPIO_Init(GPIOC,&GPIO_InitStructure);
+ GPIO_SetBits(GPIOC,GPIO_Pin_6); /* SD card power down */
+
/* SPI_FLASH CS */
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4;
GPIO_Init(GPIOA,&GPIO_InitStructure);
@@ -184,9 +189,9 @@ static void all_device_reset(void)
}
/* FSMC GPIO configure */
- GPIO_SetBits(GPIOE,GPIO_Pin_5); /* DM9000A */
- GPIO_SetBits(GPIOF,GPIO_Pin_10); /* LCD */
- GPIO_SetBits(GPIOA,GPIO_Pin_3); /* SPI_FLASH */
+ GPIO_SetBits(GPIOE,GPIO_Pin_5); /* DM9000A */
+ GPIO_SetBits(GPIOF,GPIO_Pin_10); /* LCD */
+ GPIO_SetBits(GPIOA,GPIO_Pin_3); /* SPI_FLASH */
}
/**
@@ -209,8 +214,8 @@ void rt_hw_board_init()
SysTick_Config( SystemCoreClock / RT_TICK_PER_SECOND );
/* Console Initialization*/
- rt_hw_usart_init();
- rt_console_set_device("uart1");
+ rt_hw_usart_init();
+ rt_console_set_device("uart1");
rt_kprintf("\r\n\r\nSystemInit......\r\n");
@@ -241,17 +246,6 @@ void rt_hw_board_init()
rt_kprintf("\rmem test pass!!\r\n");
}/* memtest */
- {
- /* PC6 for SDCard Rst */
- GPIO_InitTypeDef GPIO_InitStructure;
-
- GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
- GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
- GPIO_Init(GPIOC,&GPIO_InitStructure);
- GPIO_SetBits(GPIOC,GPIO_Pin_6);
- }
-
/* SPI1 config */
{
GPIO_InitTypeDef GPIO_InitStructure;
diff --git a/bsp/stm32_radio/startup.c b/bsp/stm32_radio/startup.c
index e220adfd1d..39ff800b2f 100644
--- a/bsp/stm32_radio/startup.c
+++ b/bsp/stm32_radio/startup.c
@@ -108,7 +108,7 @@ void rtthread_startup(void)
/* init hardware device */
#ifdef RT_USING_DFS
- GPIO_ResetBits(GPIOC,GPIO_Pin_6);
+ GPIO_ResetBits(GPIOC,GPIO_Pin_6); /* SD card power up */
rt_hw_sdcard_init();
rt_hw_spi_flash_init();
#endif