Merge pull request #2 from RT-Thread/master

sync

8 files changed, 511 insertions, 416 deletions

diff --git a/bsp/lpc176x/drivers/sd.c b/bsp/lpc176x/drivers/sd.c
index a777ef70d2..018c4d411e 100644
--- a/bsp/lpc176x/drivers/sd.c
+++ b/bsp/lpc176x/drivers/sd.c
@@ -5,12 +5,12 @@
 #include "sd.h"
 
 /* 512 bytes for each sector */
-#define SD_SECTOR_SIZE	512
+#define SD_SECTOR_SIZE  512
 
 /* token for write operation */
-#define TOKEN_SINGLE_BLOCK	0xFE
-#define TOKEN_MULTI_BLOCK	0xFC
-#define TOKEN_STOP_TRAN		0xFD
+#define TOKEN_SINGLE_BLOCK  0xFE
+#define TOKEN_MULTI_BLOCK   0xFC
+#define TOKEN_STOP_TRAN     0xFD
 
 /* Local variables */
 static uint8_t CardType;
@@ -19,440 +19,511 @@ static struct rt_device sdcard_device;
 static struct dfs_partition part;
 
 /* Local Function Prototypes */
-static bool 	LPC17xx_SD_Init (void);
-static uint8_t  LPC17xx_SD_SendCmd     (uint8_t cmd, uint32_t arg);
-static bool 	LPC17xx_SD_ReadSector (uint32_t sector, uint8_t *buff, uint32_t count);
-static bool 	LPC17xx_SD_ReadDataBlock ( uint8_t *buff,	uint32_t cnt);
-static bool 	LPC17xx_SD_WriteSector (uint32_t sector, const uint8_t *buff, uint32_t count);
-static bool 	LPC17xx_SD_WirteDataBlock (const uint8_t *buff, uint8_t token);
-static bool 	LPC17xx_SD_ReadCfg (SDCFG *cfg);
-static bool 	LPC17xx_SD_WaitForReady (void);
+static bool     LPC17xx_SD_Init(void);
+static uint8_t  LPC17xx_SD_SendCmd(uint8_t cmd, uint32_t arg);
+static bool     LPC17xx_SD_ReadSector(uint32_t sector, uint8_t *buff, uint32_t count);
+static bool     LPC17xx_SD_ReadDataBlock(uint8_t *buff,    uint32_t cnt);
+static bool     LPC17xx_SD_WriteSector(uint32_t sector, const uint8_t *buff, uint32_t count);
+static bool     LPC17xx_SD_WirteDataBlock(const uint8_t *buff, uint8_t token);
+static bool     LPC17xx_SD_ReadCfg(SDCFG *cfg);
+static bool     LPC17xx_SD_WaitForReady(void);
 
 /* wait until the card is not busy */
-static bool LPC17xx_SD_WaitForReady (void)
+static bool LPC17xx_SD_WaitForReady(void)
 {
-	uint8_t res;
-	/* timeout should be large enough to make sure the write operaion can be completed. */
-	uint32_t timeout = 400000;
+    uint8_t res;
+    /* timeout should be large enough to make sure the write operaion can be completed. */
+    uint32_t timeout = 400000;
 
-	LPC17xx_SPI_SendByte(0xFF);
-	do {
-		res = LPC17xx_SPI_RecvByte();
-	} while ((res != 0xFF) && timeout--);
+    LPC17xx_SPI_SendByte(0xFF);
+    do
+    {
+        res = LPC17xx_SPI_RecvByte();
+    }
+    while ((res != 0xFF) && timeout--);
 
-	return (res == 0xFF ? true : false);
+    return (res == 0xFF ? true : false);
 }
 
 /* Initialize SD/MMC card. */
-static bool LPC17xx_SD_Init (void)
+static bool LPC17xx_SD_Init(void)
 {
-	uint32_t i, timeout;
-	uint8_t cmd, ct, ocr[4];
-	bool ret = false;
+    uint32_t i, timeout;
+    uint8_t cmd, ct, ocr[4];
+    bool ret = false;
 
-	/* Initialize SPI interface and enable Flash Card SPI mode. */
-	LPC17xx_SPI_Init ();
+    /* Initialize SPI interface and enable Flash Card SPI mode. */
+    LPC17xx_SPI_Init();
 
-	/* At least 74 clock cycles are required prior to starting bus communication */
-	for (i = 0; i < 80; i++) {	   /* 80 dummy clocks */
-		LPC17xx_SPI_SendByte (0xFF);
-	}
+    /* At least 74 clock cycles are required prior to starting bus communication */
+    for (i = 0; i < 80; i++)       /* 80 dummy clocks */
+    {
+        LPC17xx_SPI_SendByte(0xFF);
+    }
 
-	ct = CT_NONE;
-	if (LPC17xx_SD_SendCmd (GO_IDLE_STATE, 0) == 0x1)
-	{
-		timeout = 50000;
-		if (LPC17xx_SD_SendCmd(CMD8, 0x1AA) == 1) {	/* SDHC */
-			/* Get trailing return value of R7 resp */
-			for (i = 0; i < 4; i++) ocr[i] = LPC17xx_SPI_RecvByte();
-			if (ocr[2] == 0x01 && ocr[3] == 0xAA) {	/* The card can work at vdd range of 2.7-3.6V */
-				/* Wait for leaving idle state (ACMD41 with HCS bit) */
-				while (timeout-- && LPC17xx_SD_SendCmd(SD_SEND_OP_COND, 1UL << 30));
-				/* Check CCS bit in the OCR */
-				if (timeout && LPC17xx_SD_SendCmd(READ_OCR, 0) == 0) {
-					for (i = 0; i < 4; i++) ocr[i] = LPC17xx_SPI_RecvByte();
-					ct = (ocr[0] & 0x40) ? CT_SD2 | CT_BLOCK : CT_SD2;
-				}
-			} else {  /* SDSC or MMC */
-				if (LPC17xx_SD_SendCmd(SD_SEND_OP_COND, 0) <= 1) 	{
-					ct = CT_SD1; cmd = SD_SEND_OP_COND;	/* SDSC */
-				} else {
-					ct = CT_MMC; cmd = SEND_OP_COND;	/* MMC */
-				}
-				/* Wait for leaving idle state */
-				while (timeout-- && LPC17xx_SD_SendCmd(cmd, 0));
-				/* Set R/W block length to 512 */
-				if (!timeout || LPC17xx_SD_SendCmd(SET_BLOCKLEN, SD_SECTOR_SIZE) != 0)
-					ct = CT_NONE;
-			}
-		}
-		else {  /* SDSC or MMC */
-			if (LPC17xx_SD_SendCmd(SD_SEND_OP_COND, 0) <= 1) 	{
-				ct = CT_SD1; cmd = SD_SEND_OP_COND;	/* SDSC */
-			} else {
-				ct = CT_MMC; cmd = SEND_OP_COND;	/* MMC */
-			}
-			/* Wait for leaving idle state */
-			while (timeout-- && LPC17xx_SD_SendCmd(cmd, 0));
-			/* Set R/W block length to 512 */
-			if (!timeout || LPC17xx_SD_SendCmd(SET_BLOCKLEN, SD_SECTOR_SIZE) != 0)
-				ct = CT_NONE;
-		}
-	}
-	CardType = ct;
-	LPC17xx_SPI_Release();
+    ct = CT_NONE;
+    if (LPC17xx_SD_SendCmd(GO_IDLE_STATE, 0) == 0x1)
+    {
+        timeout = 50000;
+        if (LPC17xx_SD_SendCmd(CMD8, 0x1AA) == 1)   /* SDHC */
+        {
+            /* Get trailing return value of R7 resp */
+            for (i = 0; i < 4; i++) ocr[i] = LPC17xx_SPI_RecvByte();
+            if (ocr[2] == 0x01 && ocr[3] == 0xAA)   /* The card can work at vdd range of 2.7-3.6V */
+            {
+                /* Wait for leaving idle state (ACMD41 with HCS bit) */
+                while (timeout-- && LPC17xx_SD_SendCmd(SD_SEND_OP_COND, 1UL << 30));
+                /* Check CCS bit in the OCR */
+                if (timeout && LPC17xx_SD_SendCmd(READ_OCR, 0) == 0)
+                {
+                    for (i = 0; i < 4; i++) ocr[i] = LPC17xx_SPI_RecvByte();
+                    ct = (ocr[0] & 0x40) ? CT_SD2 | CT_BLOCK : CT_SD2;
+                }
+            }
+            else      /* SDSC or MMC */
+            {
+                if (LPC17xx_SD_SendCmd(SD_SEND_OP_COND, 0) <= 1)
+                {
+                    ct = CT_SD1;
+                    cmd = SD_SEND_OP_COND; /* SDSC */
+                }
+                else
+                {
+                    ct = CT_MMC;
+                    cmd = SEND_OP_COND;    /* MMC */
+                }
+                /* Wait for leaving idle state */
+                while (timeout-- && LPC17xx_SD_SendCmd(cmd, 0));
+                /* Set R/W block length to 512 */
+                if (!timeout || LPC17xx_SD_SendCmd(SET_BLOCKLEN, SD_SECTOR_SIZE) != 0)
+                    ct = CT_NONE;
+            }
+        }
+        else    /* SDSC or MMC */
+        {
+            if (LPC17xx_SD_SendCmd(SD_SEND_OP_COND, 0) <= 1)
+            {
+                ct = CT_SD1;
+                cmd = SD_SEND_OP_COND; /* SDSC */
+            }
+            else
+            {
+                ct = CT_MMC;
+                cmd = SEND_OP_COND;    /* MMC */
+            }
+            /* Wait for leaving idle state */
+            while (timeout-- && LPC17xx_SD_SendCmd(cmd, 0));
+            /* Set R/W block length to 512 */
+            if (!timeout || LPC17xx_SD_SendCmd(SET_BLOCKLEN, SD_SECTOR_SIZE) != 0)
+                ct = CT_NONE;
+        }
+    }
+    CardType = ct;
+    LPC17xx_SPI_Release();
 
-	if (ct) {			/* Initialization succeeded */
-		ret = true;
-		if ( ct == CT_MMC ) {
-			LPC17xx_SPI_SetSpeed(SPI_SPEED_20MHz);
-		} else {
-			LPC17xx_SPI_SetSpeed(SPI_SPEED_20MHz);
-		}
-	} else {			/* Initialization failed */
-		LPC17xx_SPI_Select ();
-		LPC17xx_SD_WaitForReady ();
-		LPC17xx_SPI_DeInit();
-	}
+    if (ct)             /* Initialization succeeded */
+    {
+        ret = true;
+        if (ct == CT_MMC)
+        {
+            LPC17xx_SPI_SetSpeed(SPI_SPEED_20MHz);
+        }
+        else
+        {
+            LPC17xx_SPI_SetSpeed(SPI_SPEED_20MHz);
+        }
+    }
+    else                /* Initialization failed */
+    {
+        LPC17xx_SPI_Select();
+        LPC17xx_SD_WaitForReady();
+        LPC17xx_SPI_DeInit();
+    }
 
-	return ret;
+    return ret;
 }
 
 /*****************************************************************************
-	Send a Command to Flash card and get a Response
-	cmd:  cmd index
-	arg: argument for the cmd
-	return the received response of the commond
+    Send a Command to Flash card and get a Response
+    cmd:  cmd index
+    arg: argument for the cmd
+    return the received response of the commond
 *****************************************************************************/
-static uint8_t LPC17xx_SD_SendCmd (uint8_t cmd, uint32_t arg)
+static uint8_t LPC17xx_SD_SendCmd(uint8_t cmd, uint32_t arg)
 {
-	uint32_t r1, n;
+    uint32_t r1, n;
 
-	if (cmd & 0x80) {	/* ACMD<n> is the command sequence of CMD55-CMD<n> */
-		cmd &= 0x7F;
-		r1 = LPC17xx_SD_SendCmd(APP_CMD, 0);   /* CMD55 */
-		if (r1 > 1) return r1; /* cmd send failed */
-	}
+    if (cmd & 0x80)     /* ACMD<n> is the command sequence of CMD55-CMD<n> */
+    {
+        cmd &= 0x7F;
+        r1 = LPC17xx_SD_SendCmd(APP_CMD, 0);   /* CMD55 */
+        if (r1 > 1) return r1; /* cmd send failed */
+    }
 
-	/* Select the card and wait for ready */
-	LPC17xx_SPI_DeSelect();
-	LPC17xx_SPI_Select();
-	if (LPC17xx_SD_WaitForReady() == false ) return 0xFF;
+    /* Select the card and wait for ready */
+    LPC17xx_SPI_DeSelect();
+    LPC17xx_SPI_Select();
+    if (LPC17xx_SD_WaitForReady() == false) return 0xFF;
 
-	LPC17xx_SPI_SendByte (0xFF);	 /* prepare 8 clocks */
-	LPC17xx_SPI_SendByte (cmd);
-	LPC17xx_SPI_SendByte (arg >> 24);
-	LPC17xx_SPI_SendByte (arg >> 16);
-	LPC17xx_SPI_SendByte (arg >> 8);
-	LPC17xx_SPI_SendByte (arg);
-   /* Checksum, should only be valid for the first command.CMD0 */
-	n = 0x01;							/* Dummy CRC + Stop */
-	if (cmd == GO_IDLE_STATE) n = 0x95;			/* Valid CRC for CMD0(0) */
-	if (cmd == CMD8) n = 0x87;			/* Valid CRC for CMD8(0x1AA) */
-	LPC17xx_SPI_SendByte(n);
+    LPC17xx_SPI_SendByte(0xFF);      /* prepare 8 clocks */
+    LPC17xx_SPI_SendByte(cmd);
+    LPC17xx_SPI_SendByte(arg >> 24);
+    LPC17xx_SPI_SendByte(arg >> 16);
+    LPC17xx_SPI_SendByte(arg >> 8);
+    LPC17xx_SPI_SendByte(arg);
+    /* Checksum, should only be valid for the first command.CMD0 */
+    n = 0x01;                           /* Dummy CRC + Stop */
+    if (cmd == GO_IDLE_STATE) n = 0x95;         /* Valid CRC for CMD0(0) */
+    if (cmd == CMD8) n = 0x87;          /* Valid CRC for CMD8(0x1AA) */
+    LPC17xx_SPI_SendByte(n);
 
-	if (cmd == STOP_TRAN) LPC17xx_SPI_RecvByte ();		/* Skip a stuff byte when stop reading */
+    if (cmd == STOP_TRAN) LPC17xx_SPI_RecvByte();       /* Skip a stuff byte when stop reading */
 
-	n = 10;		/* Wait for a valid response in timeout of 10 attempts */
-	do {
-		r1 = LPC17xx_SPI_RecvByte ();
-	} while ((r1 & 0x80) && --n);
+    n = 10;     /* Wait for a valid response in timeout of 10 attempts */
+    do
+    {
+        r1 = LPC17xx_SPI_RecvByte();
+    }
+    while ((r1 & 0x80) && --n);
 
-	return (r1);		/* Return with the response value */
+    return (r1);        /* Return with the response value */
 }
 
 /*****************************************************************************
-	Read "count" Sector(s) starting from sector index "sector",
-	buff <- [sector, sector+1, ... sector+count-1]
-	if success, return true, otherwise return false
+    Read "count" Sector(s) starting from sector index "sector",
+    buff <- [sector, sector+1, ... sector+count-1]
+    if success, return true, otherwise return false
 *****************************************************************************/
-static bool LPC17xx_SD_ReadSector (uint32_t sector, uint8_t *buff, uint32_t count)
+static bool LPC17xx_SD_ReadSector(uint32_t sector, uint8_t *buff, uint32_t count)
 {
-	/* Convert to byte address if needed */
-	if (!(CardType & CT_BLOCK)) sector *= SD_SECTOR_SIZE;
+    /* Convert to byte address if needed */
+    if (!(CardType & CT_BLOCK)) sector *= SD_SECTOR_SIZE;
 
-	if (count == 1) {	/* Single block read */
-		if ((LPC17xx_SD_SendCmd(READ_BLOCK, sector) == 0)
-			&& LPC17xx_SD_ReadDataBlock(buff, SD_SECTOR_SIZE))
-			count = 0;
-	} else {				/* Multiple block read */
-		if (LPC17xx_SD_SendCmd(READ_MULT_BLOCK, sector) == 0) {
-			do {
-				if (!LPC17xx_SD_ReadDataBlock(buff, SD_SECTOR_SIZE)) break;
-				buff += SD_SECTOR_SIZE;
-			} while (--count);
-			LPC17xx_SD_SendCmd(STOP_TRAN, 0);	/* STOP_TRANSMISSION */
-		}
-	}
-	LPC17xx_SPI_Release();
+    if (count == 1)     /* Single block read */
+    {
+        if ((LPC17xx_SD_SendCmd(READ_BLOCK, sector) == 0)
+                && LPC17xx_SD_ReadDataBlock(buff, SD_SECTOR_SIZE))
+            count = 0;
+    }
+    else                    /* Multiple block read */
+    {
+        if (LPC17xx_SD_SendCmd(READ_MULT_BLOCK, sector) == 0)
+        {
+            do
+            {
+                if (!LPC17xx_SD_ReadDataBlock(buff, SD_SECTOR_SIZE)) break;
+                buff += SD_SECTOR_SIZE;
+            }
+            while (--count);
+            LPC17xx_SD_SendCmd(STOP_TRAN, 0);   /* STOP_TRANSMISSION */
+        }
+    }
+    LPC17xx_SPI_Release();
 
-	return count ? false : true;
+    return count ? false : true;
 }
 
 /*****************************************************************************
-	read specified number of data to specified buffer.
-	buff:  Data buffer to store received data
-	cnt:   Byte count (must be multiple of 4, normally 512)
+    read specified number of data to specified buffer.
+    buff:  Data buffer to store received data
+    cnt:   Byte count (must be multiple of 4, normally 512)
 *****************************************************************************/
-static bool LPC17xx_SD_ReadDataBlock ( uint8_t *buff,	uint32_t cnt)
+static bool LPC17xx_SD_ReadDataBlock(uint8_t *buff,    uint32_t cnt)
 {
-	uint8_t token;
-	uint32_t timeout;
+    uint8_t token;
+    uint32_t timeout;
 
-	timeout = 20000;
-	do {							/* Wait for data packet in timeout of 100ms */
-		token = LPC17xx_SPI_RecvByte();
-	} while ((token == 0xFF) && timeout--);
-	if(token != 0xFE) return false;	/* If not valid data token, return with error */
+    timeout = 20000;
+    do                              /* Wait for data packet in timeout of 100ms */
+    {
+        token = LPC17xx_SPI_RecvByte();
+    }
+    while ((token == 0xFF) && timeout--);
+    if (token != 0xFE) return false; /* If not valid data token, return with error */
 
 #if USE_FIFO
-	LPC17xx_SPI_RecvBlock_FIFO (buff, cnt);
+    LPC17xx_SPI_RecvBlock_FIFO(buff, cnt);
 #else
-	do {	/* Receive the data block into buffer */
-		*buff++ = LPC17xx_SPI_RecvByte ();
-		*buff++ = LPC17xx_SPI_RecvByte ();
-		*buff++ = LPC17xx_SPI_RecvByte ();
-		*buff++ = LPC17xx_SPI_RecvByte ();
-	} while (cnt -= 4);
+    do      /* Receive the data block into buffer */
+    {
+        *buff++ = LPC17xx_SPI_RecvByte();
+        *buff++ = LPC17xx_SPI_RecvByte();
+        *buff++ = LPC17xx_SPI_RecvByte();
+        *buff++ = LPC17xx_SPI_RecvByte();
+    }
+    while (cnt -= 4);
 #endif /* USE_FIFO */
-	LPC17xx_SPI_RecvByte ();						/* Discard CRC */
-	LPC17xx_SPI_RecvByte ();
+    LPC17xx_SPI_RecvByte();                         /* Discard CRC */
+    LPC17xx_SPI_RecvByte();
 
-	return true;					/* Return with success */
+    return true;                    /* Return with success */
 }
 
 /*****************************************************************************
-	Write "count" Sector(s) starting from sector index "sector",
-	buff -> [sector, sector+1, ... sector+count-1]
-	if success, return true, otherwise return false
+    Write "count" Sector(s) starting from sector index "sector",
+    buff -> [sector, sector+1, ... sector+count-1]
+    if success, return true, otherwise return false
 *****************************************************************************/
-static bool LPC17xx_SD_WriteSector (uint32_t sector, const uint8_t *buff, uint32_t count)
+static bool LPC17xx_SD_WriteSector(uint32_t sector, const uint8_t *buff, uint32_t count)
 {
-	if (!(CardType & CT_BLOCK)) sector *= 512;	/* Convert to byte address if needed */
+    if (!(CardType & CT_BLOCK)) sector *= 512;  /* Convert to byte address if needed */
 
-	if (count == 1) {	/* Single block write */
-		if ((LPC17xx_SD_SendCmd(WRITE_BLOCK, sector) == 0)
-			&& LPC17xx_SD_WirteDataBlock(buff, TOKEN_SINGLE_BLOCK))
-			count = 0;
-	} else {				/* Multiple block write */
-		if (CardType & CT_SDC) LPC17xx_SD_SendCmd(SET_WR_BLK_ERASE_COUNT, count);
-		if (LPC17xx_SD_SendCmd(WRITE_MULT_BLOCK, sector) == 0) {
-			do {
-				if (!LPC17xx_SD_WirteDataBlock(buff, TOKEN_MULTI_BLOCK)) break;
-				buff += 512;
-			} while (--count);
-		#if 1
-			if (!LPC17xx_SD_WirteDataBlock(0, TOKEN_STOP_TRAN))	/* STOP_TRAN token */
-				count = 1;
-		#else
-			LPC17xx_SPI_SendByte(TOKEN_STOP_TRAN);
-		#endif
-		}
-	}
-	LPC17xx_SPI_Release();
-	return count ? false : true;
+    if (count == 1)     /* Single block write */
+    {
+        if ((LPC17xx_SD_SendCmd(WRITE_BLOCK, sector) == 0)
+                && LPC17xx_SD_WirteDataBlock(buff, TOKEN_SINGLE_BLOCK))
+            count = 0;
+    }
+    else                    /* Multiple block write */
+    {
+        if (CardType & CT_SDC) LPC17xx_SD_SendCmd(SET_WR_BLK_ERASE_COUNT, count);
+        if (LPC17xx_SD_SendCmd(WRITE_MULT_BLOCK, sector) == 0)
+        {
+            do
+            {
+                if (!LPC17xx_SD_WirteDataBlock(buff, TOKEN_MULTI_BLOCK)) break;
+                buff += 512;
+            }
+            while (--count);
+#if 1
+            if (!LPC17xx_SD_WirteDataBlock(0, TOKEN_STOP_TRAN)) /* STOP_TRAN token */
+                count = 1;
+#else
+            LPC17xx_SPI_SendByte(TOKEN_STOP_TRAN);
+#endif
+        }
+    }
+    LPC17xx_SPI_Release();
+    return count ? false : true;
 }
 
 /*****************************************************************************
-	Write 512 bytes
-	buffer: 512 byte data block to be transmitted
-	token:  0xFE -> single block
-			0xFC -> multi block
-			0xFD -> Stop
+    Write 512 bytes
+    buffer: 512 byte data block to be transmitted
+    token:  0xFE -> single block
+            0xFC -> multi block
+            0xFD -> Stop
 *****************************************************************************/
-static bool LPC17xx_SD_WirteDataBlock (const uint8_t *buff, uint8_t token)
+static bool LPC17xx_SD_WirteDataBlock(const uint8_t *buff, uint8_t token)
 {
-	uint8_t resp, i;
+    uint8_t resp, i;
 
-	i = i; // avoid warning
+    i = i; // avoid warning
 
-	LPC17xx_SPI_SendByte (token);		/* send data token first*/
+    LPC17xx_SPI_SendByte(token);        /* send data token first*/
 
-	if (token != TOKEN_STOP_TRAN) {
+    if (token != TOKEN_STOP_TRAN)
+    {
 #if USE_FIFO
-		LPC17xx_SPI_SendBlock_FIFO (buff);
+        LPC17xx_SPI_SendBlock_FIFO(buff);
 #else
-      /* Send data. */
-      for (i = 512/4; i ; i--) {
-         LPC17xx_SPI_SendByte (*buff++);
-		 LPC17xx_SPI_SendByte (*buff++);
-		 LPC17xx_SPI_SendByte (*buff++);
-		 LPC17xx_SPI_SendByte (*buff++);
-      }
+        /* Send data. */
+        for (i = 512 / 4; i ; i--)
+        {
+            LPC17xx_SPI_SendByte(*buff++);
+            LPC17xx_SPI_SendByte(*buff++);
+            LPC17xx_SPI_SendByte(*buff++);
+            LPC17xx_SPI_SendByte(*buff++);
+        }
 #endif /* USE_FIFO */
-		LPC17xx_SPI_SendByte(0xFF);					/* 16-bit CRC (Dummy) */
-		LPC17xx_SPI_SendByte(0xFF);
+        LPC17xx_SPI_SendByte(0xFF);                 /* 16-bit CRC (Dummy) */
+        LPC17xx_SPI_SendByte(0xFF);
 
-		resp = LPC17xx_SPI_RecvByte();				/* Receive data response */
-		if ((resp & 0x1F) != 0x05)		/* If not accepted, return with error */
-			return false;
+        resp = LPC17xx_SPI_RecvByte();              /* Receive data response */
+        if ((resp & 0x1F) != 0x05)      /* If not accepted, return with error */
+            return false;
 
-		if ( LPC17xx_SD_WaitForReady() == false)  /* Wait while Flash Card is busy. */
-			return false;
-	}
+        if (LPC17xx_SD_WaitForReady() == false)   /* Wait while Flash Card is busy. */
+            return false;
+    }
 
-	return true;
+    return true;
 }
 
 /* Read MMC/SD Card device configuration. */
-static bool LPC17xx_SD_ReadCfg (SDCFG *cfg)
+static bool LPC17xx_SD_ReadCfg(SDCFG *cfg)
 {
-	uint8_t i;
-	uint16_t csize;
-	uint8_t n, csd[16];
-	bool retv = false;
+    uint8_t i;
+    uint16_t csize;
+    uint8_t n, csd[16];
+    bool retv = false;
 
-	/* Read the OCR - Operations Condition Register. */
-	if (LPC17xx_SD_SendCmd (READ_OCR, 0) != 0x00) goto x;
-	for (i = 0; i < 4; i++)	cfg->ocr[i] = LPC17xx_SPI_RecvByte ();
+    /* Read the OCR - Operations Condition Register. */
+    if (LPC17xx_SD_SendCmd(READ_OCR, 0) != 0x00) goto x;
+    for (i = 0; i < 4; i++) cfg->ocr[i] = LPC17xx_SPI_RecvByte();
 
-	/* Read the CID - Card Identification. */
-	if ((LPC17xx_SD_SendCmd (SEND_CID, 0) != 0x00) ||
-		(LPC17xx_SD_ReadDataBlock (cfg->cid, 16) == false))
-		goto x;
+    /* Read the CID - Card Identification. */
+    if ((LPC17xx_SD_SendCmd(SEND_CID, 0) != 0x00) ||
+            (LPC17xx_SD_ReadDataBlock(cfg->cid, 16) == false))
+        goto x;
 
     /* Read the CSD - Card Specific Data. */
-	if ((LPC17xx_SD_SendCmd (SEND_CSD, 0) != 0x00) ||
-		(LPC17xx_SD_ReadDataBlock (cfg->csd, 16) == false))
-		goto x;
+    if ((LPC17xx_SD_SendCmd(SEND_CSD, 0) != 0x00) ||
+            (LPC17xx_SD_ReadDataBlock(cfg->csd, 16) == false))
+        goto x;
 
-	cfg -> sectorsize = SD_SECTOR_SIZE;
+    cfg -> sectorsize = SD_SECTOR_SIZE;
 
-	/* Get number of sectors on the disk (DWORD) */
-	if ((cfg->csd[0] >> 6) == 1) {	/* SDC ver 2.00 */
-		csize = cfg->csd[9] + ((uint16_t)cfg->csd[8] << 8) + 1;
-		cfg -> sectorcnt = (uint32_t)csize << 10;
-	} else {					/* SDC ver 1.XX or MMC*/
-		n = (cfg->csd[5] & 15) + ((cfg->csd[10] & 128) >> 7) + ((cfg->csd[9] & 3) << 1) + 2;  // 19
-		csize = (cfg->csd[8] >> 6) + ((uint16_t)cfg->csd[7] << 2) + ((uint16_t)(cfg->csd[6] & 3) << 10) + 1; // 3752
-		cfg -> sectorcnt = (uint32_t)csize << (n - 9); // 3842048
-	}
+    /* Get number of sectors on the disk (DWORD) */
+    if ((cfg->csd[0] >> 6) == 1)    /* SDC ver 2.00 */
+    {
+        csize = cfg->csd[9] + ((uint16_t)cfg->csd[8] << 8) + 1;
+        cfg -> sectorcnt = (uint32_t)csize << 10;
+    }
+    else                        /* SDC ver 1.XX or MMC*/
+    {
+        n = (cfg->csd[5] & 15) + ((cfg->csd[10] & 128) >> 7) + ((cfg->csd[9] & 3) << 1) + 2;  // 19
+        csize = (cfg->csd[8] >> 6) + ((uint16_t)cfg->csd[7] << 2) + ((uint16_t)(cfg->csd[6] & 3) << 10) + 1; // 3752
+        cfg -> sectorcnt = (uint32_t)csize << (n - 9); // 3842048
+    }
 
-	cfg->size = cfg -> sectorcnt * cfg -> sectorsize; // 512*3842048=1967128576Byte (1.83GB)
+    cfg->size = cfg -> sectorcnt * cfg -> sectorsize; // 512*3842048=1967128576Byte (1.83GB)
 
-	/* Get erase block size in unit of sector (DWORD) */
-	if (CardType & CT_SD2) {			/* SDC ver 2.00 */
-		if (LPC17xx_SD_SendCmd(SD_STATUS /*ACMD13*/, 0) == 0) {		/* Read SD status */
-			LPC17xx_SPI_RecvByte();
-			if (LPC17xx_SD_ReadDataBlock(csd, 16)) {				/* Read partial block */
-				for (n = 64 - 16; n; n--) LPC17xx_SPI_RecvByte();	/* Purge trailing data */
-				cfg->blocksize = 16UL << (csd[10] >> 4);
-				retv = true;
-			}
-		}
-	} else {					/* SDC ver 1.XX or MMC */
-		if ((LPC17xx_SD_SendCmd(SEND_CSD, 0) == 0) && LPC17xx_SD_ReadDataBlock(csd, 16)) {	/* Read CSD */
-			if (CardType & CT_SD1) {			/* SDC ver 1.XX */
-				cfg->blocksize = (((csd[10] & 63) << 1) + ((uint16_t)(csd[11] & 128) >> 7) + 1) << ((csd[13] >> 6) - 1);
-			} else {					/* MMC */
-				// cfg->blocksize = ((uint16_t)((buf[10] & 124) >> 2) + 1) * (((buf[11] & 3) << 3) + ((buf[11] & 224) >> 5) + 1);
-				cfg->blocksize = ((uint16_t)((cfg->csd[10] & 124) >> 2) + 1) * (((cfg->csd[10] & 3) << 3) + ((cfg->csd[11] & 224) >> 5) + 1);
-			}
-			retv = true;
-		}
-	}
+    /* Get erase block size in unit of sector (DWORD) */
+    if (CardType & CT_SD2)              /* SDC ver 2.00 */
+    {
+        if (LPC17xx_SD_SendCmd(SD_STATUS /*ACMD13*/, 0) == 0)       /* Read SD status */
+        {
+            LPC17xx_SPI_RecvByte();
+            if (LPC17xx_SD_ReadDataBlock(csd, 16))                  /* Read partial block */
+            {
+                for (n = 64 - 16; n; n--) LPC17xx_SPI_RecvByte();   /* Purge trailing data */
+                cfg->blocksize = 16UL << (csd[10] >> 4);
+                retv = true;
+            }
+        }
+    }
+    else                        /* SDC ver 1.XX or MMC */
+    {
+        if ((LPC17xx_SD_SendCmd(SEND_CSD, 0) == 0) && LPC17xx_SD_ReadDataBlock(csd, 16))    /* Read CSD */
+        {
+            if (CardType & CT_SD1)              /* SDC ver 1.XX */
+            {
+                cfg->blocksize = (((csd[10] & 63) << 1) + ((uint16_t)(csd[11] & 128) >> 7) + 1) << ((csd[13] >> 6) - 1);
+            }
+            else                        /* MMC */
+            {
+                // cfg->blocksize = ((uint16_t)((buf[10] & 124) >> 2) + 1) * (((buf[11] & 3) << 3) + ((buf[11] & 224) >> 5) + 1);
+                cfg->blocksize = ((uint16_t)((cfg->csd[10] & 124) >> 2) + 1) * (((cfg->csd[10] & 3) << 3) + ((cfg->csd[11] & 224) >> 5) + 1);
+            }
+            retv = true;
+        }
+    }
 
-x:	LPC17xx_SPI_Release();
+x:
+    LPC17xx_SPI_Release();
     return (retv);
 }
 
 static rt_err_t rt_sdcard_init(rt_device_t dev)
 {
-	return RT_EOK;
+    return RT_EOK;
 }
 
 static rt_err_t rt_sdcard_open(rt_device_t dev, rt_uint16_t oflag)
 {
-	return RT_EOK;
+    return RT_EOK;
 }
 
 static rt_err_t rt_sdcard_close(rt_device_t dev)
 {
-	return RT_EOK;
+    return RT_EOK;
 }
 
-static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
+static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
 {
-	bool status;
+    bool status;
 
-	status = LPC17xx_SD_ReadSector(part.offset + pos, buffer, size);
+    status = LPC17xx_SD_ReadSector(part.offset + pos, buffer, size);
 
-	if (status == true) return size;
+    if (status == true) return size;
 
-	rt_kprintf("read failed: %d, pos 0x%08x, size %d\n", status, pos, size);
-	return 0;
+    rt_kprintf("read failed: %d, pos 0x%08x, size %d\n", status, pos, size);
+    return 0;
 }
 
-static rt_size_t rt_sdcard_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
+static rt_size_t rt_sdcard_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
 {
-	bool status;
+    bool status;
 
-	status = LPC17xx_SD_WriteSector(part.offset + pos, buffer, size);
+    status = LPC17xx_SD_WriteSector(part.offset + pos, buffer, size);
 
-	if (status == true) return size;
+    if (status == true) return size;
 
-	rt_kprintf("write failed: %d, pos 0x%08x, size %d\n", status, pos, size);
-	return 0;
+    rt_kprintf("write failed: %d, pos 0x%08x, size %d\n", status, pos, size);
+    return 0;
 }
 
 static rt_err_t rt_sdcard_control(rt_device_t dev, rt_uint8_t cmd, void *args)
 {
-	return RT_EOK;
+    if (cmd == RT_DEVICE_CTRL_BLK_GETGEOME)
+    {
+        struct rt_device_blk_geometry *geometry;
+        
+        geometry = (struct rt_device_blk_geometry *)args;
+        if (geometry == RT_NULL) return -RT_ERROR;
+
+        geometry->bytes_per_sector = SDCfg.sectorsize;
+        geometry->block_size = SDCfg.blocksize;
+        geometry->sector_count = SDCfg.sectorcnt;
+    }
+
+    return RT_EOK;
 }
 
 void rt_hw_sdcard_init()
 {
     if (LPC17xx_SD_Init() && LPC17xx_SD_ReadCfg(&SDCfg))
-	{
-		bool status;
-		rt_uint8_t *sector;
+    {
+        bool status;
+        rt_uint8_t *sector;
 
-		/* get the first sector to read partition table */
-		sector = (rt_uint8_t*) rt_malloc (512);
-		if (sector == RT_NULL)
-		{
-			rt_kprintf("allocate partition sector buffer failed\n");
-			return;
-		}
+        /* get the first sector to read partition table */
+        sector = (rt_uint8_t *) rt_malloc(512);
+        if (sector == RT_NULL)
+        {
+            rt_kprintf("allocate partition sector buffer failed\n");
+            return;
+        }
 
-		status = LPC17xx_SD_ReadSector(0, sector, 1);
-		if (status == true)
-		{
-			/* get the first partition */
-			if (dfs_filesystem_get_partition(&part, sector, 0) != 0)
+        status = LPC17xx_SD_ReadSector(0, sector, 1);
+        if (status == true)
+        {
+            /* get the first partition */
+            if (dfs_filesystem_get_partition(&part, sector, 0) != 0)
             {
                 /* there is no partition */
                 part.offset = 0;
                 part.size   = 0;
             }
-		}
-		else
-		{
-			/* there is no partition table */
-			part.offset = 0;
-			part.size   = 0;
-		}
+        }
+        else
+        {
+            /* there is no partition table */
+            part.offset = 0;
+            part.size   = 0;
+        }
 
-		/* release sector buffer */
-		rt_free(sector);
+        /* release sector buffer */
+        rt_free(sector);
 
-		/* register sdcard device */
-		sdcard_device.type  = RT_Device_Class_Block;
-		sdcard_device.init 	= rt_sdcard_init;
-		sdcard_device.open 	= rt_sdcard_open;
-		sdcard_device.close = rt_sdcard_close;
-		sdcard_device.read 	= rt_sdcard_read;
-		sdcard_device.write = rt_sdcard_write;
-		sdcard_device.control = rt_sdcard_control;
+        /* register sdcard device */
+        sdcard_device.type  = RT_Device_Class_Block;
+        sdcard_device.init  = rt_sdcard_init;
+        sdcard_device.open  = rt_sdcard_open;
+        sdcard_device.close = rt_sdcard_close;
+        sdcard_device.read  = rt_sdcard_read;
+        sdcard_device.write = rt_sdcard_write;
+        sdcard_device.control = rt_sdcard_control;
 
-		/* no private */
-		sdcard_device.user_data = &SDCfg;
+        /* no private */
+        sdcard_device.user_data = &SDCfg;
 
-		rt_device_register(&sdcard_device, "sd0",
-			RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE);
+        rt_device_register(&sdcard_device, "sd0",
+                           RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE);
 
-		return;
-	}
+        return;
+    }
 
-	rt_kprintf("sdcard init failed\n");
+    rt_kprintf("sdcard init failed\n");
 }
diff --git a/bsp/lpc176x/drivers/sd.h b/bsp/lpc176x/drivers/sd.h
index 6f7f759519..c57ae36155 100644
--- a/bsp/lpc176x/drivers/sd.h
+++ b/bsp/lpc176x/drivers/sd.h
@@ -4,42 +4,43 @@
 #include <stdint.h>
 
 /* SD/MMC Commands */
-#define GO_IDLE_STATE    		(0x40 + 0)		// CMD0
-#define SEND_OP_COND     		(0x40 + 1)
-#define CMD8			 		(0x40 + 8)		// CMD8
-#define SEND_CSD         		(0x40 + 9)
-#define SEND_CID         		(0x40 + 10)		// CMD10
-#define STOP_TRAN        		(0x40 + 12)		// CMD12
-#define SET_BLOCKLEN     		(0x40 + 16)		// CMD16
-#define READ_BLOCK       		(0x40 + 17)
-#define READ_MULT_BLOCK  		(0x40 + 18)
-#define WRITE_BLOCK      		(0x40 + 24)
-#define WRITE_MULT_BLOCK 		(0x40 + 25)
-#define APP_CMD          		(0x40 + 55)		// CMD55
-#define READ_OCR		 		(0x40 + 58)		// CMD58
-#define CRC_ON_OFF       		(0x40 + 59)
-#define SD_SEND_OP_COND  		(0xC0 + 41)		// ACMD41
-#define SD_STATUS		 		(0xC0 + 13)		// ACMD13, SD_STATUS (SDC)
-#define SET_WR_BLK_ERASE_COUNT	(0xC0 + 23)		// ACMD23 (SDC)
+#define GO_IDLE_STATE           (0x40 + 0)      // CMD0
+#define SEND_OP_COND            (0x40 + 1)
+#define CMD8                    (0x40 + 8)      // CMD8
+#define SEND_CSD                (0x40 + 9)
+#define SEND_CID                (0x40 + 10)     // CMD10
+#define STOP_TRAN               (0x40 + 12)     // CMD12
+#define SET_BLOCKLEN            (0x40 + 16)     // CMD16
+#define READ_BLOCK              (0x40 + 17)
+#define READ_MULT_BLOCK         (0x40 + 18)
+#define WRITE_BLOCK             (0x40 + 24)
+#define WRITE_MULT_BLOCK        (0x40 + 25)
+#define APP_CMD                 (0x40 + 55)     // CMD55
+#define READ_OCR                (0x40 + 58)     // CMD58
+#define CRC_ON_OFF              (0x40 + 59)
+#define SD_SEND_OP_COND         (0xC0 + 41)     // ACMD41
+#define SD_STATUS               (0xC0 + 13)     // ACMD13, SD_STATUS (SDC)
+#define SET_WR_BLK_ERASE_COUNT  (0xC0 + 23)     // ACMD23 (SDC)
 
 /* Card type flags (CardType) */
-#define CT_NONE				0x00
-#define CT_MMC				0x01
-#define CT_SD1				0x02
-#define CT_SD2				0x04
-#define CT_SDC				(CT_SD1|CT_SD2)
-#define CT_BLOCK			0x08
+#define CT_NONE             0x00
+#define CT_MMC              0x01
+#define CT_SD1              0x02
+#define CT_SD2              0x04
+#define CT_SDC              (CT_SD1|CT_SD2)
+#define CT_BLOCK            0x08
 
 /* MMC device configuration */
-typedef struct tagSDCFG{
-	uint32_t sernum;		// serial number
-	uint32_t size;			// size=sectorsize*sectorcnt
-	uint32_t sectorcnt;		//
-	uint32_t sectorsize; 	// 512
-	uint32_t blocksize;		// erase block size
-	uint8_t ocr[4];			// OCR
-	uint8_t cid[16];		// CID
-	uint8_t csd[16];		// CSD
+typedef struct tagSDCFG
+{
+    uint32_t sernum;        // serial number
+    uint32_t size;          // size=sectorsize*sectorcnt
+    uint32_t sectorcnt;     //
+    uint32_t sectorsize;    // 512
+    uint32_t blocksize;     // erase block size
+    uint8_t ocr[4];         // OCR
+    uint8_t cid[16];        // CID
+    uint8_t csd[16];        // CSD
 } SDCFG;
 
 void rt_hw_sdcard_init(void);
diff --git a/bsp/ls1bdev/applications/startup.c b/bsp/ls1bdev/applications/startup.c
index befa929d30..bfd8214027 100644
--- a/bsp/ls1bdev/applications/startup.c
+++ b/bsp/ls1bdev/applications/startup.c
@@ -38,49 +38,49 @@ extern void irq_exception(void);
  */
 void rtthread_startup(void)
 {
-	/* disable interrupt first */
-	rt_hw_interrupt_disable();
+    /* disable interrupt first */
+    rt_hw_interrupt_disable();
 
-	/* init cache */
-	rt_hw_cache_init();
-	/* init hardware interrupt */
-	rt_hw_interrupt_init();
+    /* init cache */
+    rt_hw_cache_init();
+    /* init hardware interrupt */
+    rt_hw_interrupt_init();
 
-	/* copy vector */
-	memcpy((void *)A_K0BASE, tlb_refill_exception, 0x20);
-	memcpy((void *)(A_K0BASE + 0x180), general_exception, 0x20);
-	memcpy((void *)(A_K0BASE + 0x200), irq_exception, 0x20);
+    /* copy vector */
+    rt_memcpy((void *)A_K0BASE, tlb_refill_exception, 0x20);
+    rt_memcpy((void *)(A_K0BASE + 0x180), general_exception, 0x20);
+    rt_memcpy((void *)(A_K0BASE + 0x200), irq_exception, 0x20);
 
-	/* init board */
-	rt_hw_board_init();
+    /* init board */
+    rt_hw_board_init();
 
-	/* show version */
-	rt_show_version();
+    /* show version */
+    rt_show_version();
 
 #ifdef RT_USING_HEAP
-	rt_system_heap_init((void*)&__bss_end, (void*)RT_HW_HEAP_END);
+    rt_system_heap_init((void*)&__bss_end, (void*)RT_HW_HEAP_END);
 #endif
 
-	/* init scheduler system */
-	rt_system_scheduler_init();
-
-	/* init application */
-	rt_application_init();
+    /* init scheduler system */
+    rt_system_scheduler_init();
 
     /* initialize timer */
     rt_system_timer_init();
 
-	/* initialize timer thread */
-	rt_system_timer_thread_init();
+    /* initialize timer thread */
+    rt_system_timer_thread_init();
+
+    /* init idle thread */
+    rt_thread_idle_init();
 
-	/* init idle thread */
-	rt_thread_idle_init();
+    /* init application */
+    rt_application_init();
 
-	/* start scheduler */
-	rt_system_scheduler_start();
+    /* start scheduler */
+    rt_system_scheduler_start();
 
-	/* never reach here */
-	return ;
+    /* never reach here */
+    return;
 }
 
 /*@}*/
diff --git a/bsp/ls1bdev/drivers/board.c b/bsp/ls1bdev/drivers/board.c
index 06a985cf1b..307d8d28b0 100644
--- a/bsp/ls1bdev/drivers/board.c
+++ b/bsp/ls1bdev/drivers/board.c
@@ -71,6 +71,23 @@ void rt_hw_board_init(void)
 	rt_kprintf("current sr: 0x%08x\n", read_c0_status());
 }
 
+#define __raw_out_put(unr) \
+	while (*ptr) \
+	{ \
+		if (*ptr == '\n') \
+		{ \
+			/* FIFO status, contain valid data */ \
+			while (!(UART_LSR(UART##unr##_BASE) & (UARTLSR_TE | UARTLSR_TFE))); \
+			/* write data */ \
+			UART_DAT(UART##unr##_BASE) = '\r'; \
+		} \
+		/* FIFO status, contain valid data */ \
+		while (!(UART_LSR(UART##unr##_BASE) & (UARTLSR_TE | UARTLSR_TFE))); \
+		/* write data */ \
+		UART_DAT(UART##unr##_BASE) = *ptr; \
+		ptr ++; \
+	}
+
 /* UART line status register value */
 #define UARTLSR_ERROR	(1 << 7)
 #define UARTLSR_TE		(1 << 6)
@@ -82,24 +99,13 @@ void rt_hw_board_init(void)
 #define UARTLSR_DR		(1 << 0)
 void rt_hw_console_output(const char *ptr)
 {
-	/* stream mode */
-	while (*ptr)
-	{
-		if (*ptr == '\n')
-		{
-			/* FIFO status, contain valid data */
-			while (!(UART_LSR(UART0_BASE) & (UARTLSR_TE | UARTLSR_TFE)));
-			/* write data */
-			UART_DAT(UART0_BASE) = '\r';
-		}
-
-		/* FIFO status, contain valid data */
-		while (!(UART_LSR(UART0_BASE) & (UARTLSR_TE | UARTLSR_TFE)));
-		/* write data */
-		UART_DAT(UART0_BASE) = *ptr;
-
-		ptr ++;
-	}
+#if defined(RT_USING_UART0)
+    __raw_out_put(0);
+#elif defined(RT_USING_UART1)
+    __raw_out_put(1);
+#elif defined(RT_USING_UART3)
+    __raw_out_put(3);
+#endif
 }
 
 /*@}*/
diff --git a/bsp/ls1bdev/drivers/uart.c b/bsp/ls1bdev/drivers/uart.c
index 4e897391fb..c4ddb581e6 100644
--- a/bsp/ls1bdev/drivers/uart.c
+++ b/bsp/ls1bdev/drivers/uart.c
@@ -249,13 +249,16 @@ void rt_hw_uart_init(void)
 	uart->parent.type = RT_Device_Class_Char;
 	rt_memset(uart->rx_buffer, 0, sizeof(uart->rx_buffer));
 	uart->read_index = uart->save_index = 0;
-	
+
 #if defined(RT_USING_UART0)
 	uart->hw_base = UART0_BASE;
 	uart->irq = LS1B_UART0_IRQ;
 #elif defined(RT_USING_UART1)
 	uart->hw_base = UART1_BASE;
 	uart->irq = LS1B_UART1_IRQ;
+#elif defined(RT_USING_UART3)
+	uart->hw_base = UART3_BASE;
+	uart->irq = LS1B_UART3_IRQ;
 #endif
 
 	/* device interface */
@@ -267,9 +270,9 @@ void rt_hw_uart_init(void)
 	uart->parent.control    = RT_NULL;
 	uart->parent.user_data  = RT_NULL;
 
-	rt_device_register(&uart->parent, "uart0", 
-						RT_DEVICE_FLAG_RDWR | 
-						RT_DEVICE_FLAG_STREAM | 
+	rt_device_register(&uart->parent, "uart0",
+						RT_DEVICE_FLAG_RDWR |
+						RT_DEVICE_FLAG_STREAM |
 						RT_DEVICE_FLAG_INT_RX);
 }
 #endif /* end of UART */
diff --git a/bsp/mb9bf618s/applications/startup.c b/bsp/mb9bf618s/applications/startup.c
index c95f4640fe..ad46ce7e39 100644
--- a/bsp/mb9bf618s/applications/startup.c
+++ b/bsp/mb9bf618s/applications/startup.c
@@ -43,6 +43,9 @@ void rtthread_startup(void)
 
     /* show version */
     rt_show_version();
+	
+    /* init timer system */
+    rt_system_timer_init();
 
 #ifdef RT_USING_HEAP
 #ifdef __CC_ARM
diff --git a/bsp/stm32f10x/drivers/SConscript b/bsp/stm32f10x/drivers/SConscript
index ef1e5a13fa..30a848fc40 100644
--- a/bsp/stm32f10x/drivers/SConscript
+++ b/bsp/stm32f10x/drivers/SConscript
@@ -4,7 +4,7 @@ from building import *
 
 cwd     = os.path.join(str(Dir('#')), 'drivers')
 
-# add the general drvers.
+# add the general drivers.
 src = Split("""
 board.c
 stm32f10x_it.c
@@ -12,19 +12,19 @@ led.c
 usart.c
 """)
 
-# add Ethernet drvers.
+# add Ethernet drivers.
 if GetDepend('RT_USING_LWIP'):
     src += ['dm9000a.c']
 
-# add Ethernet drvers.
+# add Ethernet drivers.
 if GetDepend('RT_USING_DFS'):
     src += ['sdcard.c']
 
-# add Ethernet drvers.
+# add Ethernet drivers.
 if GetDepend('RT_USING_RTC'):
     src += ['rtc.c']
 
-# add Ethernet drvers.
+# add Ethernet drivers.
 if GetDepend('RT_USING_RTGUI'):
     src += ['touch.c']
     if rtconfig.RT_USING_LCD_TYPE == 'ILI932X':
diff --git a/bsp/stm32f10x/drivers/usart.c b/bsp/stm32f10x/drivers/usart.c
index bbaf4ec032..4c6f24af30 100644
--- a/bsp/stm32f10x/drivers/usart.c
+++ b/bsp/stm32f10x/drivers/usart.c
@@ -21,19 +21,19 @@
 #include <rtdevice.h>
 
 /* USART1 */
-#define UART1_GPIO_TX		GPIO_Pin_9
-#define UART1_GPIO_RX		GPIO_Pin_10
-#define UART1_GPIO			GPIOA
+#define UART1_GPIO_TX       GPIO_Pin_9
+#define UART1_GPIO_RX       GPIO_Pin_10
+#define UART1_GPIO          GPIOA
 
 /* USART2 */
-#define UART2_GPIO_TX	    GPIO_Pin_2
-#define UART2_GPIO_RX	    GPIO_Pin_3
-#define UART2_GPIO	    	GPIOA
+#define UART2_GPIO_TX       GPIO_Pin_2
+#define UART2_GPIO_RX       GPIO_Pin_3
+#define UART2_GPIO          GPIOA
 
 /* USART3_REMAP[1:0] = 00 */
-#define UART3_GPIO_TX		GPIO_Pin_10
-#define UART3_GPIO_RX		GPIO_Pin_11
-#define UART3_GPIO			GPIOB
+#define UART3_GPIO_TX       GPIO_Pin_10
+#define UART3_GPIO_RX       GPIO_Pin_11
+#define UART3_GPIO          GPIOB
 
 /* STM32 uart driver */
 struct stm32_uart
@@ -163,7 +163,10 @@ void USART1_IRQHandler(void)
         /* clear interrupt */
         USART_ClearITPendingBit(uart->uart_device, USART_IT_TC);
     }
-
+    if (USART_GetFlagStatus(uart->uart_device, USART_FLAG_ORE) == SET)
+    {
+        stm32_getc(&serial1);
+    }
     /* leave interrupt */
     rt_interrupt_leave();
 }
@@ -197,6 +200,10 @@ void USART2_IRQHandler(void)
         /* clear interrupt */
         USART_ClearITPendingBit(uart->uart_device, USART_IT_TC);
     }
+    if (USART_GetFlagStatus(uart->uart_device, USART_FLAG_ORE) == SET)
+    {
+        stm32_getc(&serial2);
+    }
 
     /* leave interrupt */
     rt_interrupt_leave();
@@ -204,7 +211,7 @@ void USART2_IRQHandler(void)
 #endif /* RT_USING_UART2 */
 
 #if defined(RT_USING_UART3)
-/* UART1 device driver structure */
+/* UART3 device driver structure */
 struct stm32_uart uart3 =
 {
     USART3,
@@ -231,6 +238,10 @@ void USART3_IRQHandler(void)
         /* clear interrupt */
         USART_ClearITPendingBit(uart->uart_device, USART_IT_TC);
     }
+    if (USART_GetFlagStatus(uart->uart_device, USART_FLAG_ORE) == SET)
+    {
+        stm32_getc(&serial3);
+    }
 
     /* leave interrupt */
     rt_interrupt_leave();
@@ -282,7 +293,7 @@ static void GPIO_Configuration(void)
     /* Configure USART Rx/tx PIN */
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;
     GPIO_InitStructure.GPIO_Pin = UART2_GPIO_RX;
-    GPIO_Init(UART1_GPIO, &GPIO_InitStructure);
+    GPIO_Init(UART2_GPIO, &GPIO_InitStructure);
 
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
     GPIO_InitStructure.GPIO_Pin = UART2_GPIO_TX;