From d088d60152e2a0e4c45fc0a5c00955261a160bac Mon Sep 17 00:00:00 2001
From: wuyangyong <wuyangyong@gmail.com>
Date: Thu, 21 Jan 2010 16:57:32 +0000
Subject: [PATCH] usb msc ghost

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@331 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 .../Libraries/Mass_Storage/src/mass_mal.c      |  8 ++++----
 .../Libraries/Mass_Storage/src/usb_main.c      | 18 +++++++++---------
 bsp/stm32_radio/board.c                        |  2 +-
 bsp/stm32_radio/spi_flash.c                    |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bsp/stm32_radio/Libraries/Mass_Storage/src/mass_mal.c b/bsp/stm32_radio/Libraries/Mass_Storage/src/mass_mal.c
index f2a7816d4..bc5281564 100644
--- a/bsp/stm32_radio/Libraries/Mass_Storage/src/mass_mal.c
+++ b/bsp/stm32_radio/Libraries/Mass_Storage/src/mass_mal.c
@@ -56,12 +56,12 @@ uint16_t MAL_Write(uint8_t lun, uint32_t Memory_Offset, uint32_t *Writebuff, uin
     {
     case 0:
     {
-        dev_spi_flash->write(dev_spi_flash,Memory_Offset,Writebuff,Transfer_Length);
+        dev_sdio->write(dev_sdio,Memory_Offset,Writebuff,Transfer_Length);
     }
     break;
     case 1:
     {
-        dev_sdio->write(dev_sdio,Memory_Offset,Writebuff,Transfer_Length);
+        dev_spi_flash->write(dev_spi_flash,Memory_Offset,Writebuff,Transfer_Length);
     }
     break;
     default:
@@ -77,12 +77,12 @@ uint16_t MAL_Read(uint8_t lun, uint32_t Memory_Offset, uint32_t *Readbuff, uint1
     {
     case 0:
     {
-        dev_spi_flash->read(dev_spi_flash,Memory_Offset,Readbuff,Transfer_Length);
+        dev_sdio->read(dev_sdio,Memory_Offset,Readbuff,Transfer_Length);
     }
     break;
     case 1:
     {
-        dev_sdio->read(dev_sdio,Memory_Offset,Readbuff,Transfer_Length);
+        dev_spi_flash->read(dev_spi_flash,Memory_Offset,Readbuff,Transfer_Length);
     }
     break;
     default:
diff --git a/bsp/stm32_radio/Libraries/Mass_Storage/src/usb_main.c b/bsp/stm32_radio/Libraries/Mass_Storage/src/usb_main.c
index ce12e54e2..f805f39ad 100644
--- a/bsp/stm32_radio/Libraries/Mass_Storage/src/usb_main.c
+++ b/bsp/stm32_radio/Libraries/Mass_Storage/src/usb_main.c
@@ -6,9 +6,9 @@
 
 #include "rtthread.h"
 
-extern uint32_t Mass_Memory_Size[2];
-extern uint32_t Mass_Block_Size[2];
-extern uint32_t Mass_Block_Count[2];
+extern uint32_t Mass_Memory_Size[3];
+extern uint32_t Mass_Block_Size[3];
+extern uint32_t Mass_Block_Count[3];
 extern rt_device_t dev_sdio;
 extern rt_device_t dev_spi_flash;
 
@@ -23,17 +23,17 @@ void USB_cable(void)
 
     /* SPI_FLASH */
     dev_spi_flash = rt_device_find("spi0");
-    Mass_Block_Size[0]  = 512;
-    Mass_Block_Count[0] = 4096;
-    Mass_Memory_Size[0] = 4096*512;
+    Mass_Block_Size[1]  = 512;
+    Mass_Block_Count[1] = 4096;
+    Mass_Memory_Size[1] = 4096*512;
 
     if(dev != RT_NULL)
     {
         dev_sdio = dev;
         sdio_info = (SD_CardInfo *)dev->private;
-        Mass_Memory_Size[1] = sdio_info->CardCapacity;
-        Mass_Block_Size[1]  = sdio_info->CardBlockSize;
-        Mass_Block_Count[1] = Mass_Memory_Size[0] / Mass_Block_Size[0];
+        Mass_Memory_Size[0] = sdio_info->CardCapacity;
+        Mass_Block_Size[0]  = sdio_info->CardBlockSize;
+        Mass_Block_Count[0] = Mass_Memory_Size[0] / Mass_Block_Size[0];
     }
     else
     {
diff --git a/bsp/stm32_radio/board.c b/bsp/stm32_radio/board.c
index 5636c1c36..8b15d23b4 100644
--- a/bsp/stm32_radio/board.c
+++ b/bsp/stm32_radio/board.c
@@ -243,7 +243,7 @@ void rt_hw_board_init()
         SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low;
         SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge;
         SPI_InitStructure.SPI_NSS  = SPI_NSS_Soft;
-        SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_256;
+        SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_64;/* 72M/64=1.125M */
         SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
         SPI_InitStructure.SPI_CRCPolynomial = 7;
         SPI_Init(SPI1, &SPI_InitStructure);
diff --git a/bsp/stm32_radio/spi_flash.c b/bsp/stm32_radio/spi_flash.c
index 924b8eb92..f2f0d5185 100644
--- a/bsp/stm32_radio/spi_flash.c
+++ b/bsp/stm32_radio/spi_flash.c
@@ -73,7 +73,7 @@ static unsigned char AT45DB_StatusRegisterRead(void)
 static void wait_busy(void)
 {
     unsigned int    i=0;
-    while (i++<255)
+    while (i++<2000)
     {
         if (AT45DB_StatusRegisterRead()&0x80)
         {
-- 
GitLab