summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bsp/stm3210/SConstruct4
-rw-r--r--bsp/stm3210/application.c18
-rw-r--r--bsp/stm3210/board.h118
-rw-r--r--bsp/stm3210/dm9000a.c251
-rw-r--r--bsp/stm3210/dm9000a.h11
-rw-r--r--bsp/stm3210/enc28j60.c138
-rw-r--r--bsp/stm3210/enc28j60.h2
-rw-r--r--bsp/stm3210/project.Uv24
-rw-r--r--bsp/stm3210/project.ewp3
-rw-r--r--bsp/stm3210/project_full/application.c31
-rw-r--r--bsp/stm3210/project_full/board.h65
-rw-r--r--bsp/stm3210/project_full/project.Uv26
-rw-r--r--bsp/stm3210/project_full/project.ewp3
-rw-r--r--bsp/stm3210/project_full/startup.c12
-rw-r--r--bsp/stm3210/project_full/stm32f10x_it.c30
-rw-r--r--bsp/stm3210/rtconfig.h1
-rw-r--r--bsp/stm3210/rtconfig.py34
-rw-r--r--bsp/stm3210/sdcard.c211
-rw-r--r--bsp/stm3210/startup.c26
-rw-r--r--bsp/stm3210/stm32f10x_it.c49
-rw-r--r--bsp/stm3210/stm32f10x_it.h6
-rw-r--r--bsp/stm3210/usart.c30
22 files changed, 648 insertions, 405 deletions
diff --git a/bsp/stm3210/SConstruct b/bsp/stm3210/SConstruct
index c310df9280..49a59802a1 100644
--- a/bsp/stm3210/SConstruct
+++ b/bsp/stm3210/SConstruct
@@ -5,7 +5,7 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
device_type = 'STM32F10X_HD'
target = 'rtthread-stm32'
-# search path for C compiler
+# search path for C compiler
bsp_path = RTT_ROOT + '/bsp/stm3210'
env = Environment(tools = ['mingw'],
@@ -15,7 +15,7 @@ env = Environment(tools = ['mingw'],
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
env.AppendUnique(CPPPATH = bsp_path)
-env.AppendUnique(CCFLAGS = ' -DUSE_STDPERIPH_DRIVER -DSTM32F10X_HD')
+env.AppendUnique(CCFLAGS = ' -DUSE_STDPERIPH_DRIVER -D' + device_type)
Export('env')
Export('RTT_ROOT')
diff --git a/bsp/stm3210/application.c b/bsp/stm3210/application.c
index b88e7dee52..3e7458ed4d 100644
--- a/bsp/stm3210/application.c
+++ b/bsp/stm3210/application.c
@@ -17,13 +17,12 @@
*/
/*@{*/
+#include <board.h>
#include <rtthread.h>
#ifdef RT_USING_DFS
/* dfs init */
#include <dfs_init.h>
-/* dfs filesystem:FAT filesystem init */
-#include <dfs_fat.h>
/* dfs filesystem:EFS filesystem init */
#include <dfs_efs.h>
/* dfs Filesystem APIs */
@@ -33,6 +32,7 @@
#ifdef RT_USING_LWIP
#include <lwip/sys.h>
#include <lwip/api.h>
+#include <netif/ethernetif.h>
#endif
void rt_init_thread_entry(void* parameter)
@@ -73,7 +73,19 @@ void rt_init_thread_entry(void* parameter)
#ifdef RT_USING_LWIP
{
extern void lwip_sys_init(void);
-
+#ifdef RT_USING_LWIP
+ eth_system_device_init();
+
+ /* register ethernetif device */
+#if STM32_ETH_IF == 0
+ rt_hw_enc28j60_init();
+#elif STM32_ETH_IF == 1
+ rt_hw_dm9000_init();
+#endif
+ /* re-init device driver */
+ rt_device_init_all();
+#endif
+
/* init lwip system */
lwip_sys_init();
rt_kprintf("TCP/IP initialized!\n");
diff --git a/bsp/stm3210/board.h b/bsp/stm3210/board.h
index b5f41584e6..695b6c8bef 100644
--- a/bsp/stm3210/board.h
+++ b/bsp/stm3210/board.h
@@ -1,55 +1,65 @@
-/*
- * File : board.h
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006, RT-Thread Develop Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2009-09-22 Bernard add board.h to this bsp
- */
-
-// <<< Use Configuration Wizard in Context Menu >>>
-#ifndef __BOARD_H__
-#define __BOARD_H__
-
-/* board configuration */
-// <o> SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card
-// <i>Default: 1
-#define STM32_USE_SDIO 1
-
-/* whether use board external SRAM memory */
-// <e>Use external SRAM memory on the board
-// <i>Enable External SRAM memory
-#define STM32_EXT_SRAM 0
-// <o>Begin Address of External SRAM
-// <i>Default: 0x68000000
-#define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */
-// <o>End Address of External SRAM
-// <i>Default: 0x68080000
-#define STM32_EXT_SRAM_END 0x68080000 /* the end address of external SRAM */
-// </e>
-
-// <o> Internal SRAM memory size[Kbytes] <8-64>
-// <i>Default: 64
-#define STM32_SRAM_SIZE 64
-#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
-
-// <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3
-// <i>Default: 1
+/*
+ * File : board.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006, RT-Thread Develop Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date Author Notes
+ * 2009-09-22 Bernard add board.h to this bsp
+ */
+
+// <<< Use Configuration Wizard in Context Menu >>>
+#ifndef __BOARD_H__
+#define __BOARD_H__
+
+/* board configuration */
+// <o> SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card
+// <i>Default: 1
+#define STM32_USE_SDIO 1
+
+/* whether use board external SRAM memory */
+// <e>Use external SRAM memory on the board
+// <i>Enable External SRAM memory
+#define STM32_EXT_SRAM 0
+// <o>Begin Address of External SRAM
+// <i>Default: 0x68000000
+#define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */
+// <o>End Address of External SRAM
+// <i>Default: 0x68080000
+#define STM32_EXT_SRAM_END 0x68080000 /* the end address of external SRAM */
+// </e>
+
+// <o> Internal SRAM memory size[Kbytes] <8-64>
+// <i>Default: 64
+#define STM32_SRAM_SIZE 64
+#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
+
+// <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3
+// <i>Default: 1
#define STM32_CONSOLE_USART 1
-
-void rt_hw_board_led_on(int n);
-void rt_hw_board_led_off(int n);
-void rt_hw_board_init(void);
-
-void rt_hw_usart_init(void);
-void rt_hw_sdcard_init(void);
-void rt_hw_msd_init(void);
-
-#endif
-
-// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o> Ethernet Interface: <0=> Microchip ENC28J60 <1=> Davicom DM9000A
+// <i>Default: 0
+#define STM32_ETH_IF 0
+
+void rt_hw_board_led_on(int n);
+void rt_hw_board_led_off(int n);
+void rt_hw_board_init(void);
+
+void rt_hw_usart_init(void);
+
+/* SD Card init function */
+void rt_hw_sdcard_init(void);
+void rt_hw_msd_init(void);
+
+/* ETH interface init function */
+void rt_hw_enc28j60_init(void);
+void rt_hw_dm9000_init(void);
+
+#endif
+
+// <<< Use Configuration Wizard in Context Menu >>>
diff --git a/bsp/stm3210/dm9000a.c b/bsp/stm3210/dm9000a.c
index 8b0f07b984..e6eed05dca 100644
--- a/bsp/stm3210/dm9000a.c
+++ b/bsp/stm3210/dm9000a.c
@@ -1,9 +1,10 @@
#include <rtthread.h>
-#include "dm9000.h"
+#include "dm9000a.h"
#include <netif/ethernetif.h>
#include "lwipopts.h"
#include "stm32f10x.h"
+#include "stm32f10x_fsmc.h"
// #define DM9000_DEBUG 1
#if DM9000_DEBUG
@@ -13,11 +14,13 @@
#endif
/*
- * DM9000 interrupt line is connected to PA1
- * 16bit mode
+ * DM9000 interrupt line is connected to PF7
*/
+//--------------------------------------------------------
#define DM9000_PHY 0x40 /* PHY address 0x01 */
+#define RST_1() GPIO_SetBits(GPIOF,GPIO_Pin_6)
+#define RST_0() GPIO_ResetBits(GPIOF,GPIO_Pin_6)
#define MAX_ADDR_LEN 6
enum DM9000_PHY_mode
@@ -158,7 +161,7 @@ void rt_dm9000_isr()
dm9000_io_write(DM9000_ISR, int_status); /* Clear ISR status */
DM9000_TRACE("dm9000 isr: int status %04x\n", int_status);
-
+
/* receive overflow */
if (int_status & ISR_ROS)
{
@@ -173,12 +176,11 @@ void rt_dm9000_isr()
/* Received the coming packet */
if (int_status & ISR_PRS)
{
- rt_err_t result;
+ /* disable receive interrupt */
+ dm9000_device.imr_all = IMR_PAR | IMR_PTM;
/* a frame has been received */
- result = eth_device_ready(&(dm9000_device.parent));
- if (result != RT_EOK) rt_kprintf("eth notification failed\n");
- RT_ASSERT(result == RT_EOK);
+ eth_device_ready(&(dm9000_device.parent));
}
/* Transmit Interrupt check */
@@ -193,7 +195,7 @@ void rt_dm9000_isr()
if (dm9000_device.packet_cnt > 0)
{
DM9000_TRACE("dm9000 isr: tx second packet\n");
-
+
/* transmit packet II */
/* Set TX length to DM9000 */
dm9000_io_write(DM9000_TXPLL, dm9000_device.queue_packet_len & 0xff);
@@ -274,7 +276,7 @@ static rt_err_t rt_dm9000_init(rt_device_t dev)
while (!(phy_read(1) & 0x20))
{
/* autonegation complete bit */
- delay_ms(10);
+ rt_thread_delay(10);
i++;
if (i == 10000)
{
@@ -361,15 +363,6 @@ static rt_err_t rt_dm9000_control(rt_device_t dev, rt_uint8_t cmd, void *args)
/* transmit packet. */
rt_err_t rt_dm9000_tx( rt_device_t dev, struct pbuf* p)
{
- struct pbuf* q;
- rt_int32_t len;
- rt_uint16_t* ptr;
-
-#if DM9000_DEBUG
- rt_uint8_t* dump_ptr;
- rt_uint32_t cnt = 0;
-#endif
-
DM9000_TRACE("dm9000 tx: %d\n", p->tot_len);
/* lock DM9000 device */
@@ -381,34 +374,45 @@ rt_err_t rt_dm9000_tx( rt_device_t dev, struct pbuf* p)
/* Move data to DM9000 TX RAM */
DM9000_outb(DM9000_IO_BASE, DM9000_MWCMD);
- for (q = p; q != NULL; q = q->next)
{
- len = q->len;
- ptr = q->payload;
+ /* q traverses through linked list of pbuf's
+ * This list MUST consist of a single packet ONLY */
+ struct pbuf *q;
+ rt_uint16_t pbuf_index = 0;
+ rt_uint8_t word[2], word_index = 0;
-#if DM9000_DEBUG
- dump_ptr = q->payload;
-#endif
-
- /* use 16bit mode to write data to DM9000 RAM */
- while (len > 0)
- {
- DM9000_outw(DM9000_DATA_BASE, *ptr);
- ptr ++;
- len -= 2;
-
-#ifdef DM9000_DEBUG
- DM9000_TRACE("%02x ", *dump_ptr++);
- if (++cnt % 16 == 0) DM9000_TRACE("\n");
-#endif
- }
+ q = p;
+ /* Write data into dm9000a, two bytes at a time
+ * Handling pbuf's with odd number of bytes correctly
+ * No attempt to optimize for speed has been made */
+ while (q)
+ {
+ if (pbuf_index < q->len)
+ {
+ word[word_index++] = ((u8_t*)q->payload)[pbuf_index++];
+ if (word_index == 2)
+ {
+ DM9000_outw(DM9000_DATA_BASE, (word[1] << 8) | word[0]);
+ word_index = 0;
+ }
+ }
+ else
+ {
+ q = q->next;
+ pbuf_index = 0;
+ }
+ }
+ /* One byte could still be unsent */
+ if (word_index == 1)
+ {
+ DM9000_outw(DM9000_DATA_BASE, word[0]);
+ }
}
- DM9000_TRACE("\n");
if (dm9000_device.packet_cnt == 0)
{
DM9000_TRACE("dm9000 tx: first packet\n");
-
+
dm9000_device.packet_cnt ++;
/* Set TX length to DM9000 */
dm9000_io_write(DM9000_TXPLL, p->tot_len & 0xff);
@@ -445,11 +449,6 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
struct pbuf* p;
rt_uint32_t rxbyte;
-#if DM9000_DEBUG
- rt_uint8_t* dump_ptr;
- rt_uint32_t cnt = 0;
-#endif
-
/* init p pointer */
p = RT_NULL;
@@ -457,7 +456,7 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
/* Check packet ready or not */
- dm9000_io_read(DM9000_MRCMDX); /* Dummy read */
+ dm9000_io_read(DM9000_MRCMDX); /* Dummy read */
rxbyte = DM9000_inb(DM9000_DATA_BASE); /* Got most updated data */
if (rxbyte)
{
@@ -467,7 +466,7 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
if (rxbyte > 1)
{
DM9000_TRACE("dm9000 rx: rx error, stop device\n");
-
+
dm9000_io_write(DM9000_RCR, 0x00); /* Stop Device */
dm9000_io_write(DM9000_ISR, 0x80); /* Stop INT request */
}
@@ -492,20 +491,11 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
data = (rt_uint16_t*)q->payload;
len = q->len;
-#if DM9000_DEBUG
- dump_ptr = q->payload;
-#endif
-
while (len > 0)
{
*data = DM9000_inw(DM9000_DATA_BASE);
data ++;
len -= 2;
-
-#if DM9000_DEBUG
- DM9000_TRACE("%02x ", *dump_ptr++);
- if (++cnt % 16 == 0) DM9000_TRACE("\n");
-#endif
}
}
DM9000_TRACE("\n");
@@ -556,6 +546,12 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
p = RT_NULL;
}
}
+ else
+ {
+ /* restore receive interrupt */
+ dm9000_device.imr_all = IMR_PAR | IMR_PTM | IMR_PRM;
+ dm9000_io_write(DM9000_IMR, dm9000_device.imr_all);
+ }
/* unlock DM9000 device */
rt_sem_release(&sem_lock);
@@ -563,11 +559,12 @@ struct pbuf *rt_dm9000_rx(rt_device_t dev)
return p;
}
-
static void RCC_Configuration(void)
{
/* enable gpiob port clock */
- RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_AFIO, ENABLE);
+ RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOF | RCC_APB2Periph_AFIO, ENABLE);
+ /* enable FSMC clock */
+ RCC_AHBPeriphClockCmd(RCC_AHBPeriph_FSMC, ENABLE);
}
static void NVIC_Configuration(void)
@@ -578,7 +575,7 @@ static void NVIC_Configuration(void)
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_1);
/* Enable the EXTI0 Interrupt */
- NVIC_InitStructure.NVIC_IRQChannel = EXTI1_IRQn;
+ NVIC_InitStructure.NVIC_IRQChannel = EXTI9_5_IRQn;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
@@ -590,24 +587,109 @@ static void GPIO_Configuration()
GPIO_InitTypeDef GPIO_InitStructure;
EXTI_InitTypeDef EXTI_InitStructure;
- /* configure PA1 as external interrupt */
- GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1;
+ /* configure PF6 as eth RST */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+ GPIO_Init(GPIOF,&GPIO_InitStructure);
+ GPIO_ResetBits(GPIOF,GPIO_Pin_6);
+ RST_1();
+
+ /* configure PF7 as external interrupt */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_7;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD;
- GPIO_Init(GPIOA, &GPIO_InitStructure);
+ GPIO_Init(GPIOF, &GPIO_InitStructure);
- /* Connect DM9000 EXTI Line to GPIOA Pin 1 */
- GPIO_EXTILineConfig(GPIO_PortSourceGPIOA, GPIO_PinSource1);
+ /* Connect DM9000 EXTI Line to GPIOF Pin 7 */
+ GPIO_EXTILineConfig(GPIO_PortSourceGPIOF, GPIO_PinSource7);
/* Configure DM9000 EXTI Line to generate an interrupt on falling edge */
- EXTI_InitStructure.EXTI_Line = EXTI_Line1;
+ EXTI_InitStructure.EXTI_Line = EXTI_Line7;
EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt;
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising;
EXTI_InitStructure.EXTI_LineCmd = ENABLE;
EXTI_Init(&EXTI_InitStructure);
/* Clear the Key Button EXTI line pending bit */
- EXTI_ClearITPendingBit(EXTI_Line1);
+ EXTI_ClearITPendingBit(EXTI_Line7);
+}
+
+static void FSMC_Configuration()
+{
+ FSMC_NORSRAMInitTypeDef FSMC_NORSRAMInitStructure;
+ FSMC_NORSRAMTimingInitTypeDef p;
+ GPIO_InitTypeDef GPIO_InitStructure;
+
+ RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOD | RCC_APB2Periph_GPIOG | RCC_APB2Periph_GPIOE |
+ RCC_APB2Periph_GPIOF, ENABLE);
+
+ /*-- GPIO Configuration ------------------------------------------------------*/
+ /* SRAM Data lines configuration */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_8 | GPIO_Pin_9 |
+ GPIO_Pin_10 | GPIO_Pin_14 | GPIO_Pin_15;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+ GPIO_Init(GPIOD, &GPIO_InitStructure);
+
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 |
+ GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14 |
+ GPIO_Pin_15;
+ GPIO_Init(GPIOE, &GPIO_InitStructure);
+
+ /* SRAM Address lines configuration */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 |
+ GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_12 | GPIO_Pin_13 |
+ GPIO_Pin_14 | GPIO_Pin_15;
+ GPIO_Init(GPIOF, &GPIO_InitStructure);
+
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 |
+ GPIO_Pin_4 | GPIO_Pin_5;
+ GPIO_Init(GPIOG, &GPIO_InitStructure);
+
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13;
+ GPIO_Init(GPIOD, &GPIO_InitStructure);
+
+ /* NOE and NWE configuration */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4 |GPIO_Pin_5;
+ GPIO_Init(GPIOD, &GPIO_InitStructure);
+
+ /* NE3 NE4 configuration */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_10 | GPIO_Pin_12;
+ GPIO_Init(GPIOG, &GPIO_InitStructure);
+
+ /* NBL0, NBL1 configuration */
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1;
+ GPIO_Init(GPIOE, &GPIO_InitStructure);
+
+ /*-- FSMC Configuration ------------------------------------------------------*/
+ p.FSMC_AddressSetupTime = 0;
+ p.FSMC_AddressHoldTime = 0;
+ p.FSMC_DataSetupTime = 2;
+ p.FSMC_BusTurnAroundDuration = 0;
+ p.FSMC_CLKDivision = 0;
+ p.FSMC_DataLatency = 0;
+ p.FSMC_AccessMode = FSMC_AccessMode_A;
+
+ FSMC_NORSRAMInitStructure.FSMC_Bank = FSMC_Bank1_NORSRAM4;
+ FSMC_NORSRAMInitStructure.FSMC_DataAddressMux = FSMC_DataAddressMux_Disable;
+ FSMC_NORSRAMInitStructure.FSMC_MemoryType = FSMC_MemoryType_SRAM;
+ FSMC_NORSRAMInitStructure.FSMC_MemoryDataWidth = FSMC_MemoryDataWidth_16b;
+ FSMC_NORSRAMInitStructure.FSMC_BurstAccessMode = FSMC_BurstAccessMode_Disable;
+ FSMC_NORSRAMInitStructure.FSMC_WaitSignalPolarity = FSMC_WaitSignalPolarity_Low;
+ FSMC_NORSRAMInitStructure.FSMC_WrapMode = FSMC_WrapMode_Disable;
+ FSMC_NORSRAMInitStructure.FSMC_WaitSignalActive = FSMC_WaitSignalActive_BeforeWaitState;
+ FSMC_NORSRAMInitStructure.FSMC_WriteOperation = FSMC_WriteOperation_Enable;
+ FSMC_NORSRAMInitStructure.FSMC_WaitSignal = FSMC_WaitSignal_Disable;
+ FSMC_NORSRAMInitStructure.FSMC_ExtendedMode = FSMC_ExtendedMode_Disable;
+ FSMC_NORSRAMInitStructure.FSMC_WriteBurst = FSMC_WriteBurst_Disable;
+ FSMC_NORSRAMInitStructure.FSMC_ReadWriteTimingStruct = &p;
+ FSMC_NORSRAMInitStructure.FSMC_WriteTimingStruct = &p;
+
+ FSMC_NORSRAMInit(&FSMC_NORSRAMInitStructure);
+
+ /* Enable FSMC Bank1_SRAM Bank4 */
+ FSMC_NORSRAMCmd(FSMC_Bank1_NORSRAM4, ENABLE);
}
void rt_hw_dm9000_init()
@@ -615,6 +697,7 @@ void rt_hw_dm9000_init()
RCC_Configuration();
NVIC_Configuration();
GPIO_Configuration();
+ FSMC_Configuration();
rt_sem_init(&sem_ack, "tx_ack", 1, RT_IPC_FLAG_FIFO);
rt_sem_init(&sem_lock, "eth_lock", 1, RT_IPC_FLAG_FIFO);
@@ -651,8 +734,6 @@ void rt_hw_dm9000_init()
eth_device_init(&(dm9000_device.parent), "e0");
}
-#ifdef RT_USING_FINSH
-#include <finsh.h>
void dm9000(void)
{
rt_kprintf("\n");
@@ -671,36 +752,8 @@ void dm9000(void)
rt_kprintf("IMR (0xFF): %02x\n", dm9000_io_read(DM9000_IMR));
rt_kprintf("\n");
}
-FINSH_FUNCTION_EXPORT(dm9000, dm9000 register dump);
-
-void rx(void)
-{
- rt_err_t result;
-
- dm9000_io_write(DM9000_ISR, ISR_PRS); /* Clear rx status */
-
- /* a frame has been received */
- result = eth_device_ready(&(dm9000_device.parent));
- if (result != RT_EOK) rt_kprintf("eth notification failed\n");
- RT_ASSERT(result == RT_EOK);
-}
-FINSH_FUNCTION_EXPORT(rx, notify packet rx);
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+FINSH_FUNCTION_EXPORT(dm9000, dm9000 register dump);
#endif
-
-void EXTI1_IRQHandler(void)
-{
- extern void rt_dm9000_isr(void);
-
- /* enter interrupt */
- rt_interrupt_enter();
-
- rt_dm9000_isr();
-
- /* Clear the Key Button EXTI line pending bit */
- EXTI_ClearITPendingBit(EXTI_Line1);
-
- /* leave interrupt */
- rt_interrupt_leave();
- rt_hw_interrupt_thread_switch();
-}
diff --git a/bsp/stm3210/dm9000a.h b/bsp/stm3210/dm9000a.h
index 1b78d156a9..ec4b2d14bb 100644
--- a/bsp/stm3210/dm9000a.h
+++ b/bsp/stm3210/dm9000a.h
@@ -1,17 +1,20 @@
#ifndef __DM9000_H__
#define __DM9000_H__
-#define DM9000_IO_BASE 0x6C100000
-#define DM9000_DATA_BASE 0x6C100008
+#define DM9000_IO_BASE 0x6C000000
+#define DM9000_DATA_BASE 0x6C000008
-#define DM9000_IO (*((volatile rt_uint16_t *) DM9000_IO_BASE)) // CMD = 0
-#define DM9000_DATA (*((volatile rt_uint16_t *) DM9000_DATA_BASE)) // CMD = 1
+#define DM9000_IO (*((volatile rt_uint16_t *) 0x6C000000)) // CMD = 0
+#define DM9000_DATA (*((volatile rt_uint16_t *) 0x6C000008)) // CMD = 1
#define DM9000_inb(r) (*(volatile rt_uint8_t *)r)
#define DM9000_outb(r, d) (*(volatile rt_uint8_t *)r = d)
#define DM9000_inw(r) (*(volatile rt_uint16_t *)r)
#define DM9000_outw(r, d) (*(volatile rt_uint16_t *)r = d)
+#define RST_1() GPIO_SetBits(GPIOF,GPIO_Pin_6)
+#define RST_0() GPIO_ResetBits(GPIOF,GPIO_Pin_6)
+
#define DM9000_ID 0x90000A46 /* DM9000 ID */
#define DM9000_PKT_MAX 1536 /* Received packet max size */
#define DM9000_PKT_RDY 0x01 /* Packet ready to receive */
diff --git a/bsp/stm3210/enc28j60.c b/bsp/stm3210/enc28j60.c
index f36a178e7e..f4bd2cecc7 100644
--- a/bsp/stm3210/enc28j60.c
+++ b/bsp/stm3210/enc28j60.c
@@ -6,8 +6,6 @@
#define MAX_ADDR_LEN 6
-// #define CSACTIVE GPIO_ResetBits(GPIOB, GPIO_Pin_12);
-// #define CSPASSIVE GPIO_SetBits(GPIOB, GPIO_Pin_12);
#define CSACTIVE GPIOB->BRR = GPIO_Pin_12;
#define CSPASSIVE GPIOB->BSRR = GPIO_Pin_12;
@@ -24,7 +22,7 @@ static struct net_device enc28j60_dev_entry;
static struct net_device *enc28j60_dev =&enc28j60_dev_entry;
static rt_uint8_t Enc28j60Bank;
static rt_uint16_t NextPacketPtr;
-static struct rt_semaphore tx_sem;
+static struct rt_semaphore lock_sem;
void _delay_us(rt_uint32_t us)
{
@@ -69,16 +67,16 @@ rt_uint8_t spi_read_op(rt_uint8_t op, rt_uint8_t address)
void spi_write_op(rt_uint8_t op, rt_uint8_t address, rt_uint8_t data)
{
rt_uint32_t level;
-
+
level = rt_hw_interrupt_disable();
-
+
CSACTIVE;
SPI_I2S_SendData(SPI2, op | (address & ADDR_MASK));
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET);
SPI_I2S_SendData(SPI2,data);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET);
CSPASSIVE;
-
+
rt_hw_interrupt_enable(level);
}
@@ -170,7 +168,29 @@ void enc28j60_clkout(rt_uint8_t clk)
{
//setup clkout: 2 is 12.5MHz:
spi_write(ECOCON, clk & 0x7);
-}
+}
+
+rt_inline rt_uint32_t enc28j60_interrupt_disable()
+{
+ rt_uint32_t level;
+
+ /* switch to bank 0 */
+ enc28j60_set_bank(EIE);
+
+ /* get last interrupt level */
+ level = spi_read(EIE);
+ /* disable interrutps */
+ spi_write_op(ENC28J60_BIT_FIELD_CLR, EIE, level);
+
+ return level;
+}
+
+rt_inline void enc28j60_interrupt_enable(rt_uint32_t level)
+{
+ /* switch to bank 0 */
+ enc28j60_set_bank(EIE);
+ spi_write_op(ENC28J60_BIT_FIELD_SET, EIE, level);
+}
/*
* Access the PHY to determine link status
@@ -195,8 +215,6 @@ static rt_bool_t enc28j60_check_link_status()
}
}
-#ifdef RT_USING_FINSH
-#include <finsh.h>
/*
* Debug routine to dump useful register contents
*/
@@ -223,6 +241,8 @@ static void enc28j60(void)
(spi_read(ETXNDH) << 8) | spi_read(ETXNDL),
spi_read(MACLCON1), spi_read(MACLCON2), spi_read(MAPHSUP));
}
+#ifdef RT_USING_FINSH
+#include <finsh.h>
FINSH_FUNCTION_EXPORT(enc28j60, dump enc28j60 registers);
#endif
@@ -238,9 +258,9 @@ void enc28j60_isr()
/* Variable definitions can be made now. */
volatile rt_uint32_t eir, pk_counter;
volatile rt_bool_t rx_activiated;
-
+
rx_activiated = RT_FALSE;
-
+
/* get EIR */
eir = spi_read(EIR);
// rt_kprintf("eir: 0x%08x\n", eir);
@@ -251,52 +271,48 @@ void enc28j60_isr()
pk_counter = spi_read(EPKTCNT);
if (pk_counter)
{
- rt_err_t result;
/* a frame has been received */
- result = eth_device_ready((struct eth_device*)&(enc28j60_dev->parent));
- RT_ASSERT(result == RT_EOK);
-
+ eth_device_ready((struct eth_device*)&(enc28j60_dev->parent));
+
// switch to bank 0
enc28j60_set_bank(EIE);
// disable rx interrutps
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIE, EIE_PKTIE);
}
-
+
/* clear PKTIF */
if (eir & EIR_PKTIF)
{
enc28j60_set_bank(EIR);
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIR, EIR_PKTIF);
-
+
rx_activiated = RT_TRUE;
}
-
+
/* clear DMAIF */
if (eir & EIR_DMAIF)
{
enc28j60_set_bank(EIR);
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIR, EIR_DMAIF);
}
-
+
/* LINK changed handler */
if ( eir & EIR_LINKIF)
{
enc28j60_check_link_status();
-
+
/* read PHIR to clear the flag */
enc28j60_phy_read(PHIR);
-
+
enc28j60_set_bank(EIR);
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIR, EIR_LINKIF);
}
-
+
if (eir & EIR_TXIF)
{
+ /* A frame has been transmitted. */
enc28j60_set_bank(EIR);
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIR, EIR_TXIF);
-
- /* A frame has been transmitted. */
- rt_sem_release(&tx_sem);
}
/* TX Error handler */
@@ -304,7 +320,7 @@ void enc28j60_isr()
{
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIR, EIR_TXERIF);
}
-
+
eir = spi_read(EIR);
// rt_kprintf("inner eir: 0x%08x\n", eir);
} while ((rx_activiated != RT_TRUE && eir != 0));
@@ -412,8 +428,6 @@ rt_err_t enc28j60_init(rt_device_t dev)
enc28j60_phy_write(PHLCON, 0xD76); //0x476
delay_ms(20);
- // rt_kprintf("enc28j60 init ok!\n");
-
return RT_EOK;
}
@@ -470,11 +484,14 @@ rt_err_t enc28j60_tx( rt_device_t dev, struct pbuf* p)
struct pbuf* q;
rt_uint32_t len;
rt_uint8_t* ptr;
+ rt_uint32_t level;
// rt_kprintf("tx pbuf: 0x%08x, total len %d\n", p, p->tot_len);
- /* lock tx operation */
- rt_sem_take(&tx_sem, RT_WAITING_FOREVER);
+ /* lock enc28j60 */
+ rt_sem_take(&lock_sem, RT_WAITING_FOREVER);
+ /* disable enc28j60 interrupt */
+ level = enc28j60_interrupt_disable();
// Set the write pointer to start of transmit buffer area
spi_write(EWRPTL, TXSTART_INIT&0xFF);
@@ -515,7 +532,9 @@ rt_err_t enc28j60_tx( rt_device_t dev, struct pbuf* p)
spi_write_op(ENC28J60_BIT_FIELD_CLR, ECON1, ECON1_TXRTS);
}
- //rt_kprintf("tx ok\n");
+ /* enable enc28j60 interrupt */
+ enc28j60_interrupt_enable(level);
+ rt_sem_release(&lock_sem);
return RT_EOK;
}
@@ -526,9 +545,15 @@ struct pbuf *enc28j60_rx(rt_device_t dev)
rt_uint32_t len;
rt_uint16_t rxstat;
rt_uint32_t pk_counter;
+ rt_uint32_t level;
p = RT_NULL;
+ /* lock enc28j60 */
+ rt_sem_take(&lock_sem, RT_WAITING_FOREVER);
+ /* disable enc28j60 interrupt */
+ level = enc28j60_interrupt_disable();
+
pk_counter = spi_read(EPKTCNT);
if (pk_counter)
{
@@ -604,23 +629,18 @@ struct pbuf *enc28j60_rx(rt_device_t dev)
}
else
{
- rt_uint32_t level;
- /* lock enc28j60 */
- level = rt_hw_interrupt_disable();
-
- // switch to bank 0
- enc28j60_set_bank(EIE);
- // enable interrutps
- spi_write_op(ENC28J60_BIT_FIELD_SET, EIE, EIE_PKTIE);
// switch to bank 0
enc28j60_set_bank(ECON1);
// enable packet reception
spi_write_op(ENC28J60_BIT_FIELD_SET, ECON1, ECON1_RXEN);
-
- /* enable interrupt */
- rt_hw_interrupt_enable(level);
+
+ level |= EIE_PKTIE;
}
+ /* enable enc28j60 interrupt */
+ enc28j60_interrupt_enable(level);
+ rt_sem_release(&lock_sem);
+
return p;
}
@@ -656,7 +676,7 @@ static void GPIO_Configuration()
/* configure PB0 as external interrupt */
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD;
GPIO_Init(GPIOB, &GPIO_InitStructure);
/* Configure SPI2 pins: SCK, MISO and MOSI ----------------------------*/
@@ -699,25 +719,8 @@ static void SetupSPI (void)
SPI_Cmd(SPI2, ENABLE);
}
-static rt_timer_t enc28j60_timer;
-void rt_hw_enc28j60_timeout(void* parameter)
+void rt_hw_enc28j60_init()
{
- // switch to bank 0
- enc28j60_set_bank(EIE);
- // enable interrutps
- spi_write_op(ENC28J60_BIT_FIELD_SET, EIE, EIE_PKTIE);
- // switch to bank 0
- enc28j60_set_bank(ECON1);
- // enable packet reception
- spi_write_op(ENC28J60_BIT_FIELD_SET, ECON1, ECON1_RXEN);
-
- enc28j60_isr();
-}
-
-int rt_hw_enc28j60_init()
-{
- rt_err_t result;
-
/* configuration PB5 as INT */
RCC_Configuration();
NVIC_Configuration();
@@ -742,16 +745,7 @@ int rt_hw_enc28j60_init()
enc28j60_dev_entry.dev_addr[4] = 0x45;
enc28j60_dev_entry.dev_addr[5] = 0x5e;
- rt_sem_init(&tx_sem, "emac", 1, RT_IPC_FLAG_FIFO);
-
- result = eth_device_init(&(enc28j60_dev->parent), "E0");
+ rt_sem_init(&lock_sem, "lock", 1, RT_IPC_FLAG_FIFO);
- /* workaround for enc28j60 interrupt */
- enc28j60_timer = rt_timer_create("etimer",
- rt_hw_enc28j60_timeout, RT_NULL,
- 50, RT_TIMER_FLAG_PERIODIC);
- if (enc28j60_timer != RT_NULL)
- rt_timer_start(enc28j60_timer);
-
- return RT_EOK;
+ eth_device_init(&(enc28j60_dev->parent), "e0");
}
diff --git a/bsp/stm3210/enc28j60.h b/bsp/stm3210/enc28j60.h
index 8d250075fa..6ed4e1bb45 100644
--- a/bsp/stm3210/enc28j60.h
+++ b/bsp/stm3210/enc28j60.h
@@ -296,6 +296,6 @@
// max frame length which the conroller will accept:
#define MAX_FRAMELEN 1518
-int rt_hw_enc28j60_init(void);
+void rt_hw_enc28j60_init(void);
#endif
diff --git a/bsp/stm3210/project.Uv2 b/bsp/stm3210/project.Uv2
index aca0befb7b..b6e32c5d9e 100644
--- a/bsp/stm3210/project.Uv2
+++ b/bsp/stm3210/project.Uv2
@@ -18,12 +18,14 @@ File 1,1,<.\application.c><application.c>
File 1,1,<.\startup.c><startup.c>
File 1,1,<.\led.c><led.c>
File 1,1,<.\usart.c><usart.c>
-File 1,1,<.\enc28j60.c><enc28j60.c>
File 1,1,<.\sdcard.c><sdcard.c>
File 1,1,<.\msd.c><msd.c>
+File 1,1,<.\enc28j60.c><enc28j60.c>
+File 1,1,<.\dm9000a.c><dm9000a.c>
File 1,1,<.\rtc.c><rtc.c>
File 1,5,<.\rtconfig.h><rtconfig.h>
File 1,5,<.\board.h><board.h>
+File 1,1,<..\..\net\apps\tcpecho.c><tcpecho.c>
File 2,1,<.\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c><misc.c>
File 2,1,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c><stm32f10x_adc.c>
File 2,1,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c><stm32f10x_bkp.c>
diff --git a/bsp/stm3210/project.ewp b/bsp/stm3210/project.ewp
index 7438f9c9e1..44b5d4b048 100644
--- a/bsp/stm3210/project.ewp
+++ b/bsp/stm3210/project.ewp
@@ -1870,6 +1870,9 @@
<name>$PROJ_DIR$\board.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\dm9000a.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\enc28j60.c</name>
</file>
<file>
diff --git a/bsp/stm3210/project_full/application.c b/bsp/stm3210/project_full/application.c
index f3a37e583e..3e7458ed4d 100644
--- a/bsp/stm3210/project_full/application.c
+++ b/bsp/stm3210/project_full/application.c
@@ -17,13 +17,12 @@
*/
/*@{*/
+#include <board.h>
#include <rtthread.h>
#ifdef RT_USING_DFS
/* dfs init */
#include <dfs_init.h>
-/* dfs filesystem:FAT filesystem init */
-#include <dfs_fat.h>
/* dfs filesystem:EFS filesystem init */
#include <dfs_efs.h>
/* dfs Filesystem APIs */
@@ -33,6 +32,7 @@
#ifdef RT_USING_LWIP
#include <lwip/sys.h>
#include <lwip/api.h>
+#include <netif/ethernetif.h>
#endif
void rt_init_thread_entry(void* parameter)
@@ -42,6 +42,8 @@ void rt_init_thread_entry(void* parameter)
{
/* init the device filesystem */
dfs_init();
+
+#ifdef RT_USING_DFS_EFSL
/* init the efsl filesystam*/
efsl_init();
@@ -52,7 +54,18 @@ void rt_init_thread_entry(void* parameter)
}
else
rt_kprintf("File System initialzation failed!\n");
+#elif defined(RT_USING_DFS_ELMFAT)
+ /* init the elm chan FatFs filesystam*/
+ elm_init();
+ /* mount sd card fat partition 1 as root directory */
+ if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
+ {
+ rt_kprintf("File System initialized!\n");
+ }
+ else
+ rt_kprintf("File System initialzation failed!\n");
+#endif
}
#endif
@@ -60,7 +73,19 @@ void rt_init_thread_entry(void* parameter)
#ifdef RT_USING_LWIP
{
extern void lwip_sys_init(void);
-
+#ifdef RT_USING_LWIP
+ eth_system_device_init();
+
+ /* register ethernetif device */
+#if STM32_ETH_IF == 0
+ rt_hw_enc28j60_init();
+#elif STM32_ETH_IF == 1
+ rt_hw_dm9000_init();
+#endif
+ /* re-init device driver */
+ rt_device_init_all();
+#endif
+
/* init lwip system */
lwip_sys_init();
rt_kprintf("TCP/IP initialized!\n");
diff --git a/bsp/stm3210/project_full/board.h b/bsp/stm3210/project_full/board.h
new file mode 100644
index 0000000000..695b6c8bef
--- /dev/null
+++ b/bsp/stm3210/project_full/board.h
@@ -0,0 +1,65 @@
+/*
+ * File : board.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006, RT-Thread Develop Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date Author Notes
+ * 2009-09-22 Bernard add board.h to this bsp
+ */
+
+// <<< Use Configuration Wizard in Context Menu >>>
+#ifndef __BOARD_H__
+#define __BOARD_H__
+
+/* board configuration */
+// <o> SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card
+// <i>Default: 1
+#define STM32_USE_SDIO 1
+
+/* whether use board external SRAM memory */
+// <e>Use external SRAM memory on the board
+// <i>Enable External SRAM memory
+#define STM32_EXT_SRAM 0
+// <o>Begin Address of External SRAM
+// <i>Default: 0x68000000
+#define STM32_EXT_SRAM_BEGIN 0x68000000 /* the begining address of external SRAM */
+// <o>End Address of External SRAM
+// <i>Default: 0x68080000
+#define STM32_EXT_SRAM_END 0x68080000 /* the end address of external SRAM */
+// </e>
+
+// <o> Internal SRAM memory size[Kbytes] <8-64>
+// <i>Default: 64
+#define STM32_SRAM_SIZE 64
+#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
+
+// <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3
+// <i>Default: 1
+#define STM32_CONSOLE_USART 1
+
+// <o> Ethernet Interface: <0=> Microchip ENC28J60 <1=> Davicom DM9000A
+// <i>Default: 0
+#define STM32_ETH_IF 0
+
+void rt_hw_board_led_on(int n);
+void rt_hw_board_led_off(int n);
+void rt_hw_board_init(void);
+
+void rt_hw_usart_init(void);
+
+/* SD Card init function */
+void rt_hw_sdcard_init(void);
+void rt_hw_msd_init(void);
+
+/* ETH interface init function */
+void rt_hw_enc28j60_init(void);
+void rt_hw_dm9000_init(void);
+
+#endif
+
+// <<< Use Configuration Wizard in Context Menu >>>
diff --git a/bsp/stm3210/project_full/project.Uv2 b/bsp/stm3210/project_full/project.Uv2
index 617db90ed0..b6e32c5d9e 100644
--- a/bsp/stm3210/project_full/project.Uv2
+++ b/bsp/stm3210/project_full/project.Uv2
@@ -18,12 +18,14 @@ File 1,1,<.\application.c><application.c>
File 1,1,<.\startup.c><startup.c>
File 1,1,<.\led.c><led.c>
File 1,1,<.\usart.c><usart.c>
-File 1,1,<.\enc28j60.c><enc28j60.c>
File 1,1,<.\sdcard.c><sdcard.c>
File 1,1,<.\msd.c><msd.c>
+File 1,1,<.\enc28j60.c><enc28j60.c>
+File 1,1,<.\dm9000a.c><dm9000a.c>
File 1,1,<.\rtc.c><rtc.c>
File 1,5,<.\rtconfig.h><rtconfig.h>
File 1,5,<.\board.h><board.h>
+File 1,1,<..\..\net\apps\tcpecho.c><tcpecho.c>
File 2,1,<.\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c><misc.c>
File 2,1,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c><stm32f10x_adc.c>
File 2,1,<.\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c><stm32f10x_bkp.c>
@@ -216,7 +218,7 @@ Options 1,0,0 // Target 'RT-Thread STM32'
ADSLDMC (--keep __fsym_* --keep __vsym_*)
ADSLDIF ()
ADSLDDW ()
- OPTDL (SARMCM3.DLL)()(DARMSTM.DLL)(-pSTM32F103ZE)(SARMCM3.DLL)()(TARMSTM.DLL)(-pSTM32F103ZE)
+ OPTDL (SARMCM3.DLL)()(DARMSTM.DLL)(-pSTM32F107xCSchedule)(SARMCM3.DLL)()(TARMSTM.DLL)(-pSTM32F107xC)
OPTDBG 49150,7,()()()()()()()()()() (Segger\JL2CM3.dll)()()()
FLASH1 { 9,0,0,0,1,0,0,0,5,16,0,0,0,0,0,0,0,0,0,0 }
FLASH2 (Segger\JL2CM3.dll)
diff --git a/bsp/stm3210/project_full/project.ewp b/bsp/stm3210/project_full/project.ewp
index 7438f9c9e1..44b5d4b048 100644
--- a/bsp/stm3210/project_full/project.ewp
+++ b/bsp/stm3210/project_full/project.ewp
@@ -1870,6 +1870,9 @@
<name>$PROJ_DIR$\board.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\dm9000a.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\enc28j60.c</name>
</file>
<file>
diff --git a/bsp/stm3210/project_full/startup.c b/bsp/stm3210/project_full/startup.c
index e880f85804..4b0a81f1d4 100644
--- a/bsp/stm3210/project_full/startup.c
+++ b/bsp/stm3210/project_full/startup.c
@@ -25,11 +25,6 @@
/*@{*/
-#ifdef RT_USING_LWIP
-#include "enc28j60.h"
-#include <netif/ethernetif.h>
-#endif
-
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
@@ -111,13 +106,6 @@ void rtthread_startup(void)
rt_hw_msd_init();
#endif
-#ifdef RT_USING_LWIP
- eth_system_device_init();
-
- /* register ethernetif device */
- rt_hw_enc28j60_init();
-#endif
-
rt_hw_rtc_init();
/* init all device */
diff --git a/bsp/stm3210/project_full/stm32f10x_it.c b/bsp/stm3210/project_full/stm32f10x_it.c
index bc945a48a6..c51749f401 100644
--- a/bsp/stm3210/project_full/stm32f10x_it.c
+++ b/bsp/stm3210/project_full/stm32f10x_it.c
@@ -22,6 +22,7 @@
/* Includes ------------------------------------------------------------------*/
#include "stm32f10x_it.h"
+#include <board.h>
#include <rtthread.h>
/** @addtogroup Template_Project
@@ -272,6 +273,8 @@ void SDIO_IRQHandler(void)
#endif
}
+#ifdef RT_USING_LWIP
+#if (STM32_ETH_IF == 0)
/*******************************************************************************
* Function Name : EXTI0_IRQHandler
* Description : This function handles External interrupt Line 0 request.
@@ -281,7 +284,6 @@ void SDIO_IRQHandler(void)
*******************************************************************************/
void EXTI0_IRQHandler(void)
{
-#ifdef RT_USING_LWIP
extern void enc28j60_isr(void);
/* enter interrupt */
@@ -294,8 +296,34 @@ void EXTI0_IRQHandler(void)
/* leave interrupt */
rt_interrupt_leave();
+}
#endif
+
+#if (STM32_ETH_IF == 1)
+/*******************************************************************************
+* Function Name : EXTI9_5_IRQHandler
+* Description : This function handles External lines 9 to 5 interrupt request.
+* Input : None
+* Output : None
+* Return : None
+*******************************************************************************/
+void EXTI9_5_IRQHandler(void)
+{
+ extern void rt_dm9000_isr(void);
+
+ /* enter interrupt */
+ rt_interrupt_enter();
+
+ rt_dm9000_isr();
+
+ /* Clear the Key Button EXTI line pending bit */
+ EXTI_ClearITPendingBit(EXTI_Line7);
+
+ /* leave interrupt */
+ rt_interrupt_leave();
}
+#endif
+#endif /* end of RT_USING_LWIP */
/**
* @}
diff --git a/bsp/stm3210/rtconfig.h b/bsp/stm3210/rtconfig.h
index cc7a2eb581..8ebf2170f9 100644
--- a/bsp/stm3210/rtconfig.h
+++ b/bsp/stm3210/rtconfig.h
@@ -64,7 +64,6 @@
/* Using symbol table */
#define FINSH_USING_SYMTAB
#define FINSH_USING_DESCRIPTION
-#define FINSH_DEVICE_NAME "uart1"
/* SECTION: device filesystem */
#define RT_USING_DFS
diff --git a/bsp/stm3210/rtconfig.py b/bsp/stm3210/rtconfig.py
index ec3f289f02..bbe338a588 100644
--- a/bsp/stm3210/rtconfig.py
+++ b/bsp/stm3210/rtconfig.py
@@ -2,16 +2,19 @@
RT_USING_FINSH = True
RT_USING_DFS = True
RT_USING_DFS_YAFFS2 = False
-RT_USING_DFS_EFSL = True
+RT_USING_DFS_EFSL = False
+RT_USING_DFS_ELMFAT = True
RT_USING_LWIP = True
# toolchains options
ARCH='arm'
CPU='stm32'
-PLATFORM = 'gcc'
-EXEC_PATH = 'd:/SourceryGCC/bin'
-#PLATFORM = 'armcc'
-#EXEC_PATH = 'C:/Keil'
+#PLATFORM = 'gcc'
+#EXEC_PATH = 'd:/codesourcery/bin'
+PLATFORM = 'armcc'
+EXEC_PATH = 'e:/Keil'
+#PLATFORM = 'iar'
+#EXEC_PATH = 'E:/Program Files/IAR Systems/Embedded Workbench 5.4/'
BUILD = 'debug'
if PLATFORM == 'gcc':
@@ -21,7 +24,7 @@ if PLATFORM == 'gcc':
AS = PREFIX + 'gcc'
AR = PREFIX + 'ar'
LINK = PREFIX + 'gcc'
- TARGET_EXT = 'elf'
+ TARGET_EXT = 'axf'
SIZE = PREFIX + 'size'
OBJDUMP = PREFIX + 'objdump'
OBJCPY = PREFIX + 'objcopy'
@@ -29,7 +32,7 @@ if PLATFORM == 'gcc':
DEVICE = ' -mcpu=cortex-m3 -mthumb'
CFLAGS = DEVICE + ' -DRT_USING_MINILIBC'
AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
- LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=main.elf.map,-cref,-u,Reset_Handler -T stm32_rom.ld'
+ LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-stm32.map,-cref,-u,Reset_Handler -T stm32_rom.ld'
CPATH = ''
LPATH = ''
@@ -74,11 +77,18 @@ elif PLATFORM == 'armcc':
elif PLATFORM == 'iar':
# toolchains
- CC = 'armcc'
- AS = 'armasm'
- AR = 'armar'
- LINK = 'armlink'
+ CC = 'iccarm'
+ AS = 'iasmarm'
+ AR = 'iarchive'
+ LINK = 'ilinkarm'
+ TARGET_EXT = 'out'
+
+ DEVICE = ' --cpu DARMSTM --thumb'
CFLAGS = ''
AFLAGS = ''
- LFLAGS = ''
+ LFLAGS = ' --config stm32f10x_flash.icf'
+
+ EXEC_PATH += '/arm/bin/'
+ RT_USING_MINILIBC = False
+ POST_ACTION = ''
diff --git a/bsp/stm3210/sdcard.c b/bsp/stm3210/sdcard.c
index 7ff809a622..386db31793 100644
--- a/bsp/stm3210/sdcard.c
+++ b/bsp/stm3210/sdcard.c
@@ -1,6 +1,6 @@
/**
******************************************************************************
- * @file SDIO/sdcard.c
+ * @file SDIO/sdcard.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
@@ -16,12 +16,14 @@
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
*
* <h2><center>&copy; COPYRIGHT 2009 STMicroelectronics</center></h2>
- */
+ */
/* Includes ------------------------------------------------------------------*/
#include "sdcard.h"
#include <stm32f10x_dma.h>
-#include <stm32f10x_sdio.h>
+#include <stm32f10x_sdio.h>
+
+#include <rtthread.h>
/** @addtogroup STM32F10x_StdPeriph_Examples
* @{
@@ -29,7 +31,7 @@
/** @addtogroup SDIO_Example
* @{
- */
+ */
/* Private typedef -----------------------------------------------------------*/
/* Private define ------------------------------------------------------------*/
@@ -69,6 +71,7 @@
#define SD_HIGH_CAPACITY ((uint32_t)0x40000000)
#define SD_STD_CAPACITY ((uint32_t)0x00000000)
#define SD_CHECK_PATTERN ((uint32_t)0x000001AA)
+#define SD_VOLTAGE_WINDOW_MMC ((uint32_t)0x80FF8000)
#define SD_MAX_VOLT_TRIAL ((uint32_t)0x0000FFFF)
#define SD_ALLZERO ((uint32_t)0x00000000)
@@ -98,7 +101,7 @@
#define SDIO_SEND_IF_COND ((uint32_t)0x00000008)
#define SDIO_INIT_CLK_DIV ((uint8_t)0xB2)
-#define SDIO_TRANSFER_CLK_DIV ((uint8_t)0x1)
+#define SDIO_TRANSFER_CLK_DIV ((uint8_t)0x1)
/* Private macro -------------------------------------------------------------*/
/* Private variables ---------------------------------------------------------*/
@@ -132,7 +135,7 @@ static void DMA_RxConfiguration(uint32_t *BufferDST, uint32_t BufferSize);
/* Private functions ---------------------------------------------------------*/
/**
- * @brief Initializes the SD Card and put it into StandBy State (Ready
+ * @brief Initializes the SD Card and put it into StandBy State (Ready
* for data transfer).
* @param None
* @retval SD_Error: SD Card Error code.
@@ -169,8 +172,8 @@ SD_Error SD_Init(void)
}
/* Configure the SDIO peripheral */
- /* HCLK = 72 MHz, SDIOCLK = 72 MHz, SDIO_CK = HCLK/(2 + 1) = 24 MHz */
- SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
+ /* HCLK = 72 MHz, SDIOCLK = 72 MHz, SDIO_CK = HCLK/(2 + 1) = 24 MHz */
+ SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
@@ -182,7 +185,7 @@ SD_Error SD_Init(void)
}
/**
- * @brief Enquires cards about their operating voltage and configures
+ * @brief Enquires cards about their operating voltage and configures
* clock controls.
* @param None
* @retval SD_Error: SD Card Error code.
@@ -320,8 +323,40 @@ SD_Error SD_PowerON(void)
}
}/* else MMC Card */
+ else
+ {
+ CardType = SDIO_MULTIMEDIA_CARD;
- return(errorstatus);
+ /* Send CMD1 SEND_OP_COND with Argument 0x80FF8000 */
+ while ((!validvoltage) && (count < SD_MAX_VOLT_TRIAL))
+ {
+
+ /* SEND CMD55 APP_CMD with RCA as 0 */
+ SDIO_CmdInitStructure.SDIO_Argument = SD_VOLTAGE_WINDOW_MMC;
+ SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_OP_COND;
+ SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+ SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+ SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+ SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+ errorstatus = CmdResp3Error();
+ if (errorstatus != SD_OK)
+ {
+ return(errorstatus);
+ }
+
+ response = SDIO_GetResponse(SDIO_RESP1);
+ validvoltage = (bool) (((response >> 31) == 1) ? 1 : 0);
+ count++;
+ }
+ if (count >= SD_MAX_VOLT_TRIAL)
+ {
+ errorstatus = SD_INVALID_VOLTRANGE;
+ return(errorstatus);
+ }
+ }
+
+ return(SD_OK);
}
/**
@@ -340,7 +375,7 @@ SD_Error SD_PowerOFF(void)
}
/**
- * @brief Intialises all cards or single card as the case may be.
+ * @brief Intialises all cards or single card as the case may be.
* Card(s) come into standby state.
* @param None
* @retval SD_Error: SD Card Error code.
@@ -397,6 +432,24 @@ SD_Error SD_InitializeCards(void)
return(errorstatus);
}
}
+ if (SDIO_MULTIMEDIA_CARD == CardType)
+ {
+ /* Send CMD3 SET_REL_ADDR with argument 0 */
+ /* SD Card publishes its RCA. */
+ SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)(rca << 16);
+ SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_REL_ADDR;
+ SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+ SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+ SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+ SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+ errorstatus = CmdResp2Error();
+
+ if (SD_OK != errorstatus)
+ {
+ return(errorstatus);
+ }
+ }
if (SDIO_SECURE_DIGITAL_IO_CARD != CardType)
{
@@ -430,7 +483,7 @@ SD_Error SD_InitializeCards(void)
/**
* @brief Returns information about specific card.
- * @param cardinfo : pointer to a SD_CardInfo structure
+ * @param cardinfo : pointer to a SD_CardInfo structure
* that contains all SD card information.
* @retval SD_Error: SD Card Error code.
*/
@@ -500,7 +553,7 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
/* Byte 10 */
tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8);
cardinfo->SD_csd.DeviceSizeMul |= (tmp & 0x80) >> 7;
-
+
cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) ;
cardinfo->CardCapacity *= (1 << (cardinfo->SD_csd.DeviceSizeMul + 2));
cardinfo->CardBlockSize = 1 << (cardinfo->SD_csd.RdBlockLen);
@@ -524,9 +577,9 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
/* Byte 10 */
tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8);
-
+
cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) * 512 * 1024;
- cardinfo->CardBlockSize = 512;
+ cardinfo->CardBlockSize = 512;
}
@@ -632,14 +685,14 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
tmp = (uint8_t)(CID_Tab[3] & 0x000000FF);
cardinfo->SD_cid.CID_CRC = (tmp & 0xFE) >> 1;
cardinfo->SD_cid.Reserved2 = 1;
-
+
return(errorstatus);
}
/**
- * @brief Enables wide bus opeartion for the requeseted card if
+ * @brief Enables wide bus opeartion for the requeseted card if
* supported by card.
- * @param WideMode: Specifies the SD card wide bus mode.
+ * @param WideMode: Specifies the SD card wide bus mode.
* This parameter can be one of the following values:
* @arg SDIO_BusWide_8b: 8-bit data transfer (Only for MMC)
* @arg SDIO_BusWide_4b: 4-bit data transfer
@@ -670,7 +723,7 @@ SD_Error SD_EnableWideBusOperation(uint32_t WideMode)
if (SD_OK == errorstatus)
{
/* Configure the SDIO peripheral */
- SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
+ SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
@@ -686,7 +739,7 @@ SD_Error SD_EnableWideBusOperation(uint32_t WideMode)
if (SD_OK == errorstatus)
{
/* Configure the SDIO peripheral */
- SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
+ SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
@@ -751,7 +804,7 @@ SD_Error SD_SelectDeselect(uint32_t addr)
/**
* @brief Allows to read one block from a specified address in a card.
* @param addr: Address from where data are to be read.
- * @param readbuff: pointer to the buffer that will contain the
+ * @param readbuff: pointer to the buffer that will contain the
* received data
* @param BlockSize: the SD card Data block size.
* @retval SD_Error: SD Card Error code.
@@ -787,7 +840,7 @@ SD_Error SD_ReadBlock(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize)
errorstatus = SD_LOCK_UNLOCK_FAILED;
return(errorstatus);
}
-
+
if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
{
BlockSize = 512;
@@ -904,12 +957,30 @@ SD_Error SD_ReadBlock(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize)
}
}
else if (DeviceMode == SD_DMA_MODE)
- {
+ {
+ int cnt = 0;
SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
SDIO_DMACmd(ENABLE);
DMA_RxConfiguration(readbuff, BlockSize);
while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
- {}
+ {
+ cnt ++;
+ if (cnt > 10 * 50000)
+ {
+ rt_kprintf("DMA flag 0x%08x\n", DMA_GetFlagStatus(DMA2_FLAG_TC4));
+ /* Clear all DPSM configuration */
+ SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+ SDIO_DataInitStructure.SDIO_DataLength = 0;
+ SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
+ SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+ SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+ SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
+ SDIO_DataConfig(&SDIO_DataInitStructure);
+ SDIO_DMACmd(DISABLE);
+ errorstatus = SD_ERROR;
+ break;
+ }
+ }
}
return(errorstatus);
}
@@ -917,7 +988,7 @@ SD_Error SD_ReadBlock(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize)
/**
* @brief Allows to read blocks from a specified address in a card.
* @param addr: Address from where data are to be read.
- * @param readbuff: pointer to the buffer that will contain the
+ * @param readbuff: pointer to the buffer that will contain the
* received data.
* @param BlockSize: the SD card Data block size.
* @param NumberOfBlocks: number of blocks to be read.
@@ -960,7 +1031,7 @@ SD_Error SD_ReadMultiBlocks(uint32_t addr, uint32_t *readbuff, uint16_t BlockSiz
BlockSize = 512;
addr /= 512;
}
-
+
if ((BlockSize > 0) && (BlockSize <= 2048) && (0 == (BlockSize & (BlockSize - 1))))
{
power = convert_from_bytes_to_power_of_two(BlockSize);
@@ -1120,7 +1191,7 @@ SD_Error SD_ReadMultiBlocks(uint32_t addr, uint32_t *readbuff, uint16_t BlockSiz
}
/**
- * @brief Allows to write one block starting from a specified address
+ * @brief Allows to write one block starting from a specified address
* in a card.
* @param addr: Address from where data are to be read.
* @param writebuff: pointer to the buffer that contain the data to be
@@ -1166,7 +1237,7 @@ SD_Error SD_WriteBlock(uint32_t addr, uint32_t *writebuff, uint16_t BlockSize)
BlockSize = 512;
addr /= 512;
}
-
+
/* Set the block size, both on controller and card */
if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
{
@@ -1354,7 +1425,7 @@ SD_Error SD_WriteBlock(uint32_t addr, uint32_t *writebuff, uint16_t BlockSize)
}
/**
- * @brief Allows to write blocks starting from a specified address in
+ * @brief Allows to write blocks starting from a specified address in
* a card.
* @param addr: Address from where data are to be read.
* @param writebuff: pointer to the buffer that contain the data to be
@@ -1401,7 +1472,7 @@ SD_Error SD_WriteMultiBlocks(uint32_t addr, uint32_t *writebuff, uint16_t BlockS
BlockSize = 512;
addr /= 512;
}
-
+
/* Set the block size, both on controller and card */
if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
{
@@ -1629,7 +1700,7 @@ SD_Error SD_WriteMultiBlocks(uint32_t addr, uint32_t *writebuff, uint16_t BlockS
* @brief Gets the cuurent data transfer state.
* @param None
* @retval SDTransferState: Data Transfer state.
- * This value can be:
+ * This value can be:
* - SD_NO_TRANSFER: No data transfer is acting
* - SD_TRANSFER_IN_PROGRESS: Data transfer is acting
*/
@@ -1700,7 +1771,7 @@ SD_Error SD_Erase(uint32_t startaddr, uint32_t endaddr)
startaddr /= 512;
endaddr /= 512;
}
-
+
/* According to sd-card spec 1.0 ERASE_GROUP_START (CMD32) and erase_group_end(CMD33) */
if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
{
@@ -1764,7 +1835,7 @@ SD_Error SD_Erase(uint32_t startaddr, uint32_t endaddr)
/**
* @brief Returns the current card's status.
- * @param pcardstatus: pointer to the buffer that will contain the SD
+ * @param pcardstatus: pointer to the buffer that will contain the SD
* card status (Card Status register).
* @retval SD_Error: SD Card Error code.
*/
@@ -1800,7 +1871,7 @@ SD_Error SD_SendStatus(uint32_t *pcardstatus)
/**
* @brief Returns the current SD card's status.
- * @param psdstatus: pointer to the buffer that will contain the SD
+ * @param psdstatus: pointer to the buffer that will contain the SD
* card status (SD Status register).
* @retval SD_Error: SD Card Error code.
*/
@@ -2338,7 +2409,7 @@ static SD_Error CmdResp2Error(void)
* response.
* @param cmd: The sent command index.
* @param prca: pointer to the variable that will contain the SD
- * card relative address RCA.
+ * card relative address RCA.
* @retval SD_Error: SD Card Error code.
*/
static SD_Error CmdResp6Error(uint8_t cmd, uint16_t *prca)
@@ -2890,7 +2961,7 @@ static void DMA_RxConfiguration(uint32_t *BufferDST, uint32_t BufferSize)
DMA_InitStructure.DMA_Priority = DMA_Priority_High;
DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
DMA_Init(DMA2_Channel4, &DMA_InitStructure);
-
+
/* DMA2 Channel4 enable */
DMA_Cmd(DMA2_Channel4, ENABLE);
}
@@ -2915,6 +2986,7 @@ static void DMA_RxConfiguration(uint32_t *BufferDST, uint32_t BufferSize)
static struct rt_device sdcard_device;
static SD_CardInfo SDCardInfo;
static struct dfs_partition part;
+static struct rt_semaphore sd_lock;
/* RT-Thread Device Driver Interface */
static rt_err_t rt_sdcard_init(rt_device_t dev)
@@ -2926,6 +2998,11 @@ static rt_err_t rt_sdcard_init(rt_device_t dev)
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
NVIC_Init(&NVIC_InitStructure);
+
+ if (rt_sem_init(&sd_lock, "sdlock", 1, RT_IPC_FLAG_FIFO) != RT_EOK)
+ {
+ rt_kprintf("init sd lock semaphore failed\n");
+ }
return RT_EOK;
}
@@ -2946,26 +3023,32 @@ static rt_err_t rt_sdcard_close(rt_device_t dev)
static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
{
SD_Error status;
- rt_uint32_t i;
-
+ rt_uint32_t i, retry;
+
// rt_kprintf("read: 0x%x, size %d\n", pos, size);
- /* read all sectors */
+ rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
+ retry = 3;
+ /* read all sectors */
for (i = 0; i < size / SECTOR_SIZE; i ++)
{
- status = SD_ReadBlock((part.offset + i)* SECTOR_SIZE + pos,
- (uint32_t*)((rt_uint8_t*)buffer + i * SECTOR_SIZE),
+__retry:
+ status = SD_ReadBlock((part.offset + i)* SECTOR_SIZE + pos,
+ (uint32_t*)((rt_uint8_t*)buffer + i * SECTOR_SIZE),
SECTOR_SIZE);
if (status != SD_OK)
- {
- rt_kprintf("sd card read failed\n");
- return 0;
+ {
+ -- retry;
+ if (retry != 0) goto __retry;
+ else break;
}
}
+ rt_sem_release(&sd_lock);
+
if (status == SD_OK) return size;
-
- rt_kprintf("read failed: %d\n", status);
+
+ rt_kprintf("read failed: %d, buffer 0x%08x\n", status, buffer);
return 0;
}
@@ -2973,25 +3056,28 @@ static rt_size_t rt_sdcard_write (rt_device_t dev, rt_off_t pos, const void* buf
{
SD_Error status;
rt_uint32_t i;
-
+
// rt_kprintf("write: 0x%x, size %d\n", pos, size);
- /* read all sectors */
+ rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
+
+ /* write all sectors */
for (i = 0; i < size / SECTOR_SIZE; i ++)
{
- status = SD_WriteBlock((part.offset + i)* SECTOR_SIZE + pos,
- (uint32_t*)((rt_uint8_t*)buffer + i * SECTOR_SIZE),
+ status = SD_WriteBlock((part.offset + i)* SECTOR_SIZE + pos,
+ (uint32_t*)((rt_uint8_t*)buffer + i * SECTOR_SIZE),
SECTOR_SIZE);
if (status != SD_OK)
{
rt_kprintf("sd card write failed\n");
- return 0;
+ break;
}
}
+ rt_sem_release(&sd_lock);
if (status == SD_OK) return size;
- rt_kprintf("write failed: %d\n", status);
+ rt_kprintf("write failed: %d, buffer 0x%08x\n", status, buffer);
return 0;
}
@@ -3002,23 +3088,24 @@ static rt_err_t rt_sdcard_control(rt_device_t dev, rt_uint8_t cmd, void *args)
void rt_hw_sdcard_init()
{
- if (SD_Init())
+ if ( SD_Init() == SD_OK )
{
SD_Error status;
rt_uint8_t *sector;
-
+
+ SD_EnableWideBusOperation(SDIO_BusWide_1b);
+
status = SD_GetCardInfo(&SDCardInfo);
if (status != SD_OK) goto __return;
status = SD_SelectDeselect((u32) (SDCardInfo.RCA << 16));
if (status != SD_OK) goto __return;
- SD_EnableWideBusOperation(SDIO_BusWide_4b);
SD_SetDeviceMode(SD_DMA_MODE);
/* get the first sector to read partition table */
sector = (rt_uint8_t*) rt_malloc (512);
- if (sector == RT_NULL)
+ if (sector == RT_NULL)
{
rt_kprintf("allocate partition sector buffer failed\n");
return;
@@ -3040,10 +3127,10 @@ void rt_hw_sdcard_init()
part.offset = 0;
part.size = 0;
}
-
+
/* release sector buffer */
rt_free(sector);
-
+
/* register sdcard device */
sdcard_device.init = rt_sdcard_init;
sdcard_device.open = rt_sdcard_open;
@@ -3051,13 +3138,13 @@ void rt_hw_sdcard_init()
sdcard_device.read = rt_sdcard_read;
sdcard_device.write = rt_sdcard_write;
sdcard_device.control = rt_sdcard_control;
-
+
/* no private */
sdcard_device.private = RT_NULL;
-
- rt_device_register(&sdcard_device, "sd0",
+
+ rt_device_register(&sdcard_device, "sd0",
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE);
-
+
return;
}
diff --git a/bsp/stm3210/startup.c b/bsp/stm3210/startup.c
index 0ee8ddbde4..4b0a81f1d4 100644
--- a/bsp/stm3210/startup.c
+++ b/bsp/stm3210/startup.c
@@ -25,22 +25,12 @@
/*@{*/
-#ifdef RT_USING_LWIP
-#ifdef STM32F10X_CL
- extern void rt_hw_stm32_eth_init(void);
-#else
- #include "enc28j60.h"
-#endif
-#include <netif/ethernetif.h>
-#endif
-
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif
-/* bss end definitions for heap init */
#ifdef __CC_ARM
extern int Image$$RW_IRAM1$$ZI$$Limit;
#elif __ICCARM__
@@ -109,26 +99,12 @@ void rtthread_startup(void)
/* init hardware serial device */
rt_hw_usart_init();
-
-#ifdef RT_USING_DFS
/* init sdcard driver */
#if STM32_USE_SDIO
rt_hw_sdcard_init();
#else
rt_hw_msd_init();
#endif
-#endif
-
-#ifdef RT_USING_LWIP
- eth_system_device_init();
-
- /* register ethernetif device */
-#ifdef STM32F10X_CL
- rt_hw_stm32_eth_init();
-#else
- rt_hw_enc28j60_init();
-#endif
-#endif
rt_hw_rtc_init();
@@ -141,7 +117,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
- finsh_set_device(FINSH_DEVICE_NAME);
+ finsh_set_device("uart1");
#endif
/* init idle thread */
diff --git a/bsp/stm3210/stm32f10x_it.c b/bsp/stm3210/stm32f10x_it.c
index 3b787c3a52..c51749f401 100644
--- a/bsp/stm3210/stm32f10x_it.c
+++ b/bsp/stm3210/stm32f10x_it.c
@@ -1,11 +1,11 @@
/**
******************************************************************************
- * @file Project/Template/stm32f10x_it.c
+ * @file Project/Template/stm32f10x_it.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @brief Main Interrupt Service Routines.
- * This file provides template for all exceptions handler and
+ * This file provides template for all exceptions handler and
* peripherals interrupt service routine.
******************************************************************************
* @copy
@@ -18,12 +18,12 @@
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
*
* <h2><center>&copy; COPYRIGHT 2009 STMicroelectronics</center></h2>
- */
+ */
/* Includes ------------------------------------------------------------------*/
#include "stm32f10x_it.h"
+#include <board.h>
#include <rtthread.h>
-#include "board.h"
/** @addtogroup Template_Project
* @{
@@ -193,7 +193,7 @@ void USART1_IRQHandler(void)
#ifdef RT_USING_UART1
extern struct rt_device uart1_device;
extern void rt_hw_serial_isr(struct rt_device *device);
-
+
/* enter interrupt */
rt_interrupt_enter();
@@ -259,7 +259,7 @@ void USART3_IRQHandler(void)
*******************************************************************************/
void SDIO_IRQHandler(void)
{
-#if defined(RT_USING_DFS) && STM32_USE_SDIO
+#ifdef RT_USING_DFS
extern int SD_ProcessIRQSrc(void);
/* enter interrupt */
@@ -273,6 +273,8 @@ void SDIO_IRQHandler(void)
#endif
}
+#ifdef RT_USING_LWIP
+#if (STM32_ETH_IF == 0)
/*******************************************************************************
* Function Name : EXTI0_IRQHandler
* Description : This function handles External interrupt Line 0 request.
@@ -282,7 +284,6 @@ void SDIO_IRQHandler(void)
*******************************************************************************/
void EXTI0_IRQHandler(void)
{
-#if defined(RT_USING_LWIP) && !defined(STM32F10X_CL)
extern void enc28j60_isr(void);
/* enter interrupt */
@@ -295,34 +296,38 @@ void EXTI0_IRQHandler(void)
/* leave interrupt */
rt_interrupt_leave();
-#endif
}
+#endif
+#if (STM32_ETH_IF == 1)
/*******************************************************************************
-* Function Name : ETH_IRQHandler
-* Description : This function handles ETH interrupt request.
+* Function Name : EXTI9_5_IRQHandler
+* Description : This function handles External lines 9 to 5 interrupt request.
* Input : None
* Output : None
* Return : None
*******************************************************************************/
-void ETH_IRQHandler(void)
+void EXTI9_5_IRQHandler(void)
{
-#if defined(RT_USING_LWIP) && defined(STM32F10X_CL)
- extern void rt_hw_stm32_eth_isr(void);
-
- /* enter interrupt */
- rt_interrupt_enter();
-
- rt_hw_stm32_eth_isr();
+ extern void rt_dm9000_isr(void);
- /* leave interrupt */
- rt_interrupt_leave();
-#endif
+ /* enter interrupt */
+ rt_interrupt_enter();
+
+ rt_dm9000_isr();
+
+ /* Clear the Key Button EXTI line pending bit */
+ EXTI_ClearITPendingBit(EXTI_Line7);
+
+ /* leave interrupt */
+ rt_interrupt_leave();
}
+#endif
+#endif /* end of RT_USING_LWIP */
/**
* @}
- */
+ */
/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/
diff --git a/bsp/stm3210/stm32f10x_it.h b/bsp/stm3210/stm32f10x_it.h
index ad935ba382..fd60234ba0 100644
--- a/bsp/stm3210/stm32f10x_it.h
+++ b/bsp/stm3210/stm32f10x_it.h
@@ -1,6 +1,6 @@
/**
******************************************************************************
- * @file Project/Template/stm32f10x_it.h
+ * @file Project/Template/stm32f10x_it.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
@@ -16,7 +16,7 @@
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
*
* <h2><center>&copy; COPYRIGHT 2009 STMicroelectronics</center></h2>
- */
+ */
/* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_IT_H
@@ -24,7 +24,7 @@
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
/* Includes ------------------------------------------------------------------*/
#include "stm32f10x.h"
diff --git a/bsp/stm3210/usart.c b/bsp/stm3210/usart.c
index 623f3a7f7f..efa426deb8 100644
--- a/bsp/stm3210/usart.c
+++ b/bsp/stm3210/usart.c
@@ -38,7 +38,7 @@ struct stm32_serial_device uart2 =
{
USART2,
&uart2_int_rx,
- &uart2_dma_rx,
+ RT_NULL,
RT_NULL,
RT_NULL
};
@@ -180,12 +180,6 @@ static void NVIC_Configuration(void)
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
NVIC_Init(&NVIC_InitStructure);
-
- /* Enable the DMA1 Channel6 Interrupt */
- NVIC_InitStructure.NVIC_IRQChannel = DMA1_Channel6_IRQn;
- NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1;
- NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
- NVIC_Init(&NVIC_InitStructure);
#endif
#ifdef RT_USING_UART3
@@ -205,7 +199,7 @@ static void NVIC_Configuration(void)
static void DMA_Configuration(void)
{
-#if defined(RT_USING_UART2) || defined (RT_USING_UART3)
+#if defined (RT_USING_UART3)
DMA_InitTypeDef DMA_InitStructure;
/* fill init structure */
@@ -216,21 +210,7 @@ static void DMA_Configuration(void)
DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
DMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh;
DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
-#endif
-
-#ifdef RT_USING_UART2
- /* DMA1 Channel4 (triggered by USART2 Rx event) Config */
- DMA_DeInit(UART2_RX_DMA);
- DMA_InitStructure.DMA_PeripheralBaseAddr = USART2_DR_Base;
- DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC;
- DMA_InitStructure.DMA_MemoryBaseAddr = (u32)0;
- DMA_InitStructure.DMA_BufferSize = 0;
- DMA_Init(UART2_RX_DMA, &DMA_InitStructure);
- DMA_ITConfig(UART2_RX_DMA, DMA_IT_TC | DMA_IT_TE, ENABLE);
- DMA_ClearFlag(DMA1_FLAG_TC4);
-#endif
-#ifdef RT_USING_UART3
/* DMA1 Channel5 (triggered by USART3 Tx event) Config */
DMA_DeInit(UART3_TX_DMA);
DMA_InitStructure.DMA_PeripheralBaseAddr = USART3_DR_Base;
@@ -298,15 +278,13 @@ void rt_hw_usart_init()
USART_Init(USART2, &USART_InitStructure);
USART_ClockInit(USART2, &USART_ClockInitStructure);
- uart2_dma_rx.dma_channel= UART2_RX_DMA;
-
/* register uart2 */
rt_hw_serial_register(&uart2_device, "uart2",
- RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_DMA_RX,
+ RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
&uart2);
/* Enable USART2 DMA Rx request */
- USART_DMACmd(USART2, USART_DMAReq_Rx , ENABLE);
+ USART_ITConfig(USART2, USART_IT_RXNE, ENABLE);
#endif
#ifdef RT_USING_UART3
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-30 22:07:54 +0000