update STM32F107 project.

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

bsp/stm3210/project_107/application.c

@@ -19,6 +19,17 @@
 
 #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 */
+#include <dfs_fs.h>
+#endif
+
 #ifdef RT_USING_LWIP
 #include <lwip/sys.h>
 #include <lwip/api.h>
@@ -26,6 +37,25 @@
 
 void rt_init_thread_entry(void* parameter)
 {
+/* Filesystem Initialization */
+#ifdef RT_USING_DFS
+	{
+		/* init the device filesystem */
+		dfs_init();
+		/* init the efsl filesystam*/
+		efsl_init();
+
+		/* mount sd card fat partition 1 as root directory */
+		if (dfs_mount("sd0", "/", "efs", 0, 0) == 0)
+		{
+			rt_kprintf("File System initialized!\n");
+		}
+		else
+			rt_kprintf("File System initialzation failed!\n");
+
+	}
+#endif
+
 /* LwIP Initialization */
 #ifdef RT_USING_LWIP
 	{

bsp/stm3210/project_107/board.h

@@ -40,7 +40,7 @@
 
 // <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3
 // 	<i>Default: 1
-#define STM32_CONSOLE_USART		2
+#define STM32_CONSOLE_USART		1
 
 void rt_hw_board_led_on(int n);
 void rt_hw_board_led_off(int n);

bsp/stm3210/project_107/msd.h

+/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
+* File Name          : msd.h
+* Author             : MCD Application Team
+* Version            : V2.1
+* Date               : 05/30/2008
+* Description        : Header for msd.c file.
+********************************************************************************
+* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
+* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
+* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
+* CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
+* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+* FOR MORE INFORMATION PLEASE CAREFULLY READ THE LICENSE AGREEMENT FILE LOCATED 
+* IN THE ROOT DIRECTORY OF THIS FIRMWARE PACKAGE.
+*******************************************************************************/
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MSD_H
+#define __MSD_H
+
+/* Includes ------------------------------------------------------------------*/
+#include <stm32f10x.h>
+
+/* Private define ------------------------------------------------------------*/
+/* Block Size */
+#define BLOCK_SIZE    512
+
+/* Dummy byte */
+#define DUMMY   0xFF
+
+/* Start Data tokens  */
+/* Tokens (necessary because at nop/idle (and CS active) only 0xff is on the data/command line) */
+#define MSD_START_DATA_SINGLE_BLOCK_READ 0xFE  /* Data token start byte, Start Single Block Read */
+#define MSD_START_DATA_MULTIPLE_BLOCK_READ  0xFE  /* Data token start byte, Start Multiple Block Read */
+#define MSD_START_DATA_SINGLE_BLOCK_WRITE 0xFE  /* Data token start byte, Start Single Block Write */
+#define MSD_START_DATA_MULTIPLE_BLOCK_WRITE 0xFD  /* Data token start byte, Start Multiple Block Write */
+#define MSD_STOP_DATA_MULTIPLE_BLOCK_WRITE 0xFD  /* Data toke stop byte, Stop Multiple Block Write */
+
+/* MSD functions return */
+#define MSD_SUCCESS       0x00
+#define MSD_FAIL          0xFF
+
+/* MSD reponses and error flags */
+#define MSD_RESPONSE_NO_ERROR      0x00
+#define MSD_IN_IDLE_STATE          0x01
+#define MSD_ERASE_RESET            0x02
+#define MSD_ILLEGAL_COMMAND        0x04
+#define MSD_COM_CRC_ERROR          0x08
+#define MSD_ERASE_SEQUENCE_ERROR   0x10
+#define MSD_ADDRESS_ERROR          0x20
+#define MSD_PARAMETER_ERROR        0x40
+#define MSD_RESPONSE_FAILURE       0xFF
+
+/* Data response error */
+#define MSD_DATA_OK                0x05
+#define MSD_DATA_CRC_ERROR         0x0B
+#define MSD_DATA_WRITE_ERROR       0x0D
+#define MSD_DATA_OTHER_ERROR       0xFF
+
+/* Commands: CMDxx = CMD-number | 0x40 */
+#define MSD_GO_IDLE_STATE          0   /* CMD0=0x40 */
+#define MSD_SEND_OP_COND           1   /* CMD1=0x41 */
+#define MSD_SEND_CSD               9   /* CMD9=0x49 */
+#define MSD_SEND_CID               10  /* CMD10=0x4A */
+#define MSD_STOP_TRANSMISSION      12  /* CMD12=0x4C */
+#define MSD_SEND_STATUS            13  /* CMD13=0x4D */
+#define MSD_SET_BLOCKLEN           16  /* CMD16=0x50 */
+#define MSD_READ_SINGLE_BLOCK      17  /* CMD17=0x51 */
+#define MSD_READ_MULTIPLE_BLOCK    18  /* CMD18=0x52 */
+#define MSD_SET_BLOCK_COUNT        23  /* CMD23=0x57 */
+#define MSD_WRITE_BLOCK            24  /* CMD24=0x58 */
+#define MSD_WRITE_MULTIPLE_BLOCK   25  /* CMD25=0x59 */
+#define MSD_PROGRAM_CSD            27  /* CMD27=0x5B */
+#define MSD_SET_WRITE_PROT         28  /* CMD28=0x5C */
+#define MSD_CLR_WRITE_PROT         29  /* CMD29=0x5D */
+#define MSD_SEND_WRITE_PROT        30  /* CMD30=0x5E */
+#define MSD_TAG_SECTOR_START       32  /* CMD32=0x60 */
+#define MSD_TAG_SECTOR_END         33  /* CMD33=0x61 */
+#define MSD_UNTAG_SECTOR           34  /* CMD34=0x62 */
+#define MSD_TAG_ERASE_GROUP_START  35  /* CMD35=0x63 */
+#define MSD_TAG_ERASE_GROUP_END    36  /* CMD36=0x64 */
+#define MSD_UNTAG_ERASE_GROUP      37  /* CMD37=0x65 */
+#define MSD_ERASE                  38  /* CMD38=0x66 */
+#define MSD_READ_OCR               39  /* CMD39=0x67 */
+#define MSD_CRC_ON_OFF             40  /* CMD40=0x68 */
+
+/* Exported types ------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+typedef struct _MSD_CSD      /*Card Specific Data*/
+{
+  vu8  CSDStruct;            /* CSD structure */
+  vu8  SysSpecVersion;       /* System specification version */
+  vu8  Reserved1;            /* Reserved */
+  vu8  TAAC;                 /* Data read access-time 1 */
+  vu8  NSAC;                 /* Data read access-time 2 in CLK cycles */
+  vu8  MaxBusClkFrec;        /* Max. bus clock frequency */
+  vu16 CardComdClasses;      /* Card command classes */
+  vu8  RdBlockLen;           /* Max. read data block length */
+  vu8  PartBlockRead;        /* Partial blocks for read allowed */
+  vu8  WrBlockMisalign;      /* Write block misalignment */
+  vu8  RdBlockMisalign;      /* Read block misalignment */
+  vu8  DSRImpl;              /* DSR implemented */
+  vu8  Reserved2;            /* Reserved */
+  vu16 DeviceSize;           /* Device Size */
+  vu8  MaxRdCurrentVDDMin;   /* Max. read current @ VDD min */
+  vu8  MaxRdCurrentVDDMax;   /* Max. read current @ VDD max */
+  vu8  MaxWrCurrentVDDMin;   /* Max. write current @ VDD min */
+  vu8  MaxWrCurrentVDDMax;   /* Max. write current @ VDD max */
+  vu8  DeviceSizeMul;        /* Device size multiplier */
+  vu8  EraseGrSize;          /* Erase group size */
+  vu8  EraseGrMul;           /* Erase group size multiplier */
+  vu8  WrProtectGrSize;      /* Write protect group size */
+  vu8  WrProtectGrEnable;    /* Write protect group enable */
+  vu8  ManDeflECC;           /* Manufacturer default ECC */
+  vu8  WrSpeedFact;          /* Write speed factor */
+  vu8  MaxWrBlockLen;        /* Max. write data block length */
+  vu8  WriteBlockPaPartial;  /* Partial blocks for write allowed */
+  vu8  Reserved3;            /* Reserded */
+  vu8  ContentProtectAppli;  /* Content protection application */
+  vu8  FileFormatGrouop;     /* File format group */
+  vu8  CopyFlag;             /* Copy flag (OTP) */
+  vu8  PermWrProtect;        /* Permanent write protection */
+  vu8  TempWrProtect;        /* Temporary write protection */
+  vu8  FileFormat;           /* File Format */
+  vu8  ECC;                  /* ECC code */
+  vu8  msd_CRC;                  /* CRC */
+  vu8  Reserved4;            /* always 1*/
+}
+sMSD_CSD;
+
+typedef struct _MSD_CID      /*Card Identification Data*/
+{
+  vu8  ManufacturerID;       /* ManufacturerID */
+  vu16 OEM_AppliID;          /* OEM/Application ID */
+  vu32 ProdName1;            /* Product Name part1 */
+  vu8  ProdName2;            /* Product Name part2*/
+  vu8  ProdRev;              /* Product Revision */
+  vu32 ProdSN;               /* Product Serial Number */
+  vu8  Reserved1;            /* Reserved1 */
+  vu16 ManufactDate;         /* Manufacturing Date */
+  vu8  msd_CRC;                  /* CRC */
+  vu8  Reserved2;            /* always 1*/
+}
+sMSD_CID;
+
+/* Exported constants --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+/*----- High layer function -----*/
+u8 MSD_Init(void);
+u8 MSD_WriteBlock(u8* pBuffer, u32 WriteAddr, u16 NumByteToWrite);
+u8 MSD_ReadBlock(u8* pBuffer, u32 ReadAddr, u16 NumByteToRead);
+u8 MSD_WriteBuffer(u8* pBuffer, u32 WriteAddr, u32 NumByteToWrite);
+u8 MSD_ReadBuffer(u8* pBuffer, u32 ReadAddr, u32 NumByteToRead);
+u8 MSD_GetCSDRegister(sMSD_CSD* MSD_csd);
+u8 MSD_GetCIDRegister(sMSD_CID* MSD_cid);
+
+/*----- Medium layer function -----*/
+void MSD_SendCmd(u8 Cmd, u32 Arg, u8 Crc);
+u8 MSD_GetResponse(u8 Response);
+u8 MSD_GetDataResponse(void);
+u8 MSD_GoIdleState(void);
+u16 MSD_GetStatus(void);
+
+/*----- Low layer function -----*/
+void MSD_WriteByte(u8 byte);
+u8 MSD_ReadByte(void);
+
+#endif /* __MSD_H */
+
+/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/

bsp/stm3210/project_107/project.eww

+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<workspace>
+  <project>
+    <path>$WS_DIR$\project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
+
+

bsp/stm3210/project_107/rtconfig.h

@@ -54,18 +54,26 @@
 /* Using Device System */
 #define RT_USING_DEVICE
 #define RT_USING_UART1
-#define RT_USING_UART2
 
 /* SECTION: Console options */
 /* the buffer size of console*/
 #define RT_CONSOLEBUF_SIZE	128
 
-/* SECTION: finsh shell */
+/* SECTION: finsh, a C-Express shell */
 #define RT_USING_FINSH
 /* Using symbol table */
 #define FINSH_USING_SYMTAB
 #define FINSH_USING_DESCRIPTION
-#define FINSH_DEVICE_NAME	"uart2"
+#define FINSH_DEVICE_NAME	"uart1"
+
+/* SECTION: device filesystem */
+#define RT_USING_DFS
+/* the max number of mounted filesystem */
+#define DFS_FILESYSTEMS_MAX			2
+/* the max number of opened files 		*/
+#define DFS_FD_MAX					4
+/* the max number of cached sector 		*/
+#define DFS_CACHE_MAX_NUM   		4
 
 /* SECTION: lwip, a lighwight TCP/IP protocol stack */
 #define RT_USING_LWIP

bsp/stm3210/project_107/startup.c

@@ -27,7 +27,7 @@
 
 #ifdef RT_USING_LWIP
 #ifdef STM32F10X_CL
-	void rt_hw_stm32_eth_init(void);
+	extern void rt_hw_stm32_eth_init(void);
 #else
 	#include "enc28j60.h"
 #endif
@@ -40,6 +40,7 @@ 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,7 +110,7 @@ void rtthread_startup(void)
 	/* init hardware serial device */
 	rt_hw_usart_init();
 
-#ifdef RT_USINS_DFS
+#ifdef RT_USING_DFS
 	/* init sdcard driver */
 #if STM32_USE_SDIO
 	rt_hw_sdcard_init();
@@ -121,13 +122,13 @@ void rtthread_startup(void)
 #ifdef RT_USING_LWIP
 	eth_system_device_init();
 
+	/* register ethernetif device */
 #ifdef STM32F10X_CL
 	rt_hw_stm32_eth_init();
 #else
-	/* register ethernetif device */
 	rt_hw_enc28j60_init();
 #endif
-#endif // end of RT_USING_LWIP
+#endif
 
     rt_hw_rtc_init();
 

bsp/stm3210/project_107/stm32f10x_it.c

@@ -22,9 +22,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f10x_it.h"
-#include "stm32f10x_dma.h"
-
 #include <rtthread.h>
+#include "board.h"
 
 /** @addtogroup Template_Project
   * @{
@@ -251,6 +250,54 @@ void USART3_IRQHandler(void)
 #endif
 }
 
+/*******************************************************************************
+* Function Name  : SDIO_IRQHandler
+* Description    : This function handles SDIO global interrupt request.
+* Input          : None
+* Output         : None
+* Return         : None
+*******************************************************************************/
+void SDIO_IRQHandler(void)
+{
+#if defined(RT_USING_DFS) && STM32_USE_SDIO
+    extern int SD_ProcessIRQSrc(void);
+
+    /* enter interrupt */
+    rt_interrupt_enter();
+
+    /* Process All SDIO Interrupt Sources */
+    SD_ProcessIRQSrc();
+
+    /* leave interrupt */
+    rt_interrupt_leave();
+#endif
+}
+
+/*******************************************************************************
+* Function Name  : EXTI0_IRQHandler
+* Description    : This function handles External interrupt Line 0 request.
+* Input          : None
+* Output         : None
+* Return         : None
+*******************************************************************************/
+void EXTI0_IRQHandler(void)
+{
+#if defined(RT_USING_LWIP) && !defined(STM32F10X_CL)
+    extern void enc28j60_isr(void);
+
+    /* enter interrupt */
+    rt_interrupt_enter();
+
+    enc28j60_isr();
+
+    /* Clear the Key Button EXTI line pending bit */
+    EXTI_ClearITPendingBit(EXTI_Line0);
+
+    /* leave interrupt */
+    rt_interrupt_leave();
+#endif
+}
+
 /*******************************************************************************
 * Function Name  : ETH_IRQHandler
 * Description    : This function handles ETH interrupt request.
@@ -260,7 +307,7 @@ void USART3_IRQHandler(void)
 *******************************************************************************/
 void ETH_IRQHandler(void)
 {
-#ifdef RT_USING_LWIP
+#if defined(RT_USING_LWIP) && defined(STM32F10X_CL)
 	extern void rt_hw_stm32_eth_isr(void);
 	
     /* enter interrupt */