libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update sdcard driver. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@423 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-02-19 11:54:17 +00:00
parent 8e7da44914
commit 39c53a4b71
2 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bsp/stm32_radio/mp3.c
View File

@ -158,7 +158,7 @@ int mp3_decoder_run(struct mp3_decoder* decoder)
if (decoder->read_offset < 0) if (decoder->read_offset < 0)
{ {
/* discard this data */ /* discard this data */
rt_kprintf("outof sync\n"); rt_kprintf("outof sync, byte left: %d\n", decoder->bytes_left);
decoder->bytes_left = 0; decoder->bytes_left = 0;
return 0; return 0;
@ -439,8 +439,14 @@ void mp3_get_info(const char* filename, struct tag_info* info)
rt_size_t fd_fetch(void* parameter, rt_uint8_t *buffer, rt_size_t length) rt_size_t fd_fetch(void* parameter, rt_uint8_t *buffer, rt_size_t length)
{ {
int fd = (int)parameter; int fd = (int)parameter;
return read(fd, (char*)buffer, length); int read_bytes;
read_bytes = read(fd, (char*)buffer, length);
if (read_bytes <= 0) return 0;
return read_bytes;
} }
void mp3(char* filename) void mp3(char* filename)
{ {
int fd; int fd;
@ -492,6 +498,7 @@ rt_size_t http_data_fetch(void* parameter, rt_uint8_t *buffer, rt_size_t length)
{ {
return net_buf_read(buffer, length); return net_buf_read(buffer, length);
} }
void http_mp3(char* url) void http_mp3(char* url)
{ {
struct http_session* session; struct http_session* session;

85
bsp/stm32_radio/sdcard.c
View File

@ -175,7 +175,7 @@ SD_Error SD_Init(void)
SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable; SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable; SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b; SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable; SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Enable;
SDIO_Init(&SDIO_InitStructure); SDIO_Init(&SDIO_InitStructure);
return(errorstatus); return(errorstatus);
@ -953,11 +953,21 @@ SD_Error SD_ReadBlock(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize)
} }
else if (DeviceMode == SD_DMA_MODE) else if (DeviceMode == SD_DMA_MODE)
{ {
rt_tick_t tick;
SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE); SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
SDIO_DMACmd(ENABLE); SDIO_DMACmd(ENABLE);
tick = rt_tick_get();
DMA_RxConfiguration(readbuff, BlockSize); DMA_RxConfiguration(readbuff, BlockSize);
while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET) while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
{} {
if ((TransferError != SD_OK) || (rt_tick_get() - tick > 2))
{
errorstatus = SD_ERROR;
// rt_kprintf("sd error\n");
break;
}
}
} }
return(errorstatus); return(errorstatus);
} }
@ -1151,11 +1161,21 @@ SD_Error SD_ReadMultiBlocks(uint32_t addr, uint32_t *readbuff, uint16_t BlockSiz
} }
else if (DeviceMode == SD_DMA_MODE) else if (DeviceMode == SD_DMA_MODE)
{ {
rt_tick_t tick;
SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE); SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
SDIO_DMACmd(ENABLE); SDIO_DMACmd(ENABLE);
tick = rt_tick_get();
DMA_RxConfiguration(readbuff, (NumberOfBlocks * BlockSize)); DMA_RxConfiguration(readbuff, (NumberOfBlocks * BlockSize));
while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET) while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
{} {
if ((TransferError != SD_OK) || (rt_tick_get() - tick > 2))
{
errorstatus = SD_ERROR;
// rt_kprintf("sd error\n");
return errorstatus;
}
}
while ((TransferEnd == 0) && (TransferError == SD_OK)) while ((TransferEnd == 0) && (TransferError == SD_OK))
{} {}
if (TransferError != SD_OK) if (TransferError != SD_OK)
@ -3001,42 +3021,49 @@ 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) static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
{ {
SD_Error status; SD_Error status;
rt_uint32_t nr = size / SECTOR_SIZE; rt_uint32_t nr = size / SECTOR_SIZE, retry;
rt_sem_take(&sd_lock, RT_WAITING_FOREVER); rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
/* read all sectors */ retry = 3;
if (((rt_uint32_t)buffer % 4 != 0) || while(retry)
((rt_uint32_t)buffer > 0x20080000)) {
{ /* read all sectors */
rt_uint32_t index; if (((rt_uint32_t)buffer % 4 != 0) ||
((rt_uint32_t)buffer > 0x20080000))
/* which is not alignment with 4 or chip SRAM */
for (index = 0; index < nr; index ++)
{ {
status = SD_ReadBlock((part.offset + index) * SECTOR_SIZE + pos, rt_uint32_t index;
(uint32_t*)_sdcard_buffer, SECTOR_SIZE);
if (status != SD_OK) break; /* which is not alignment with 4 or chip SRAM */
for (index = 0; index < nr; index ++)
{
status = SD_ReadBlock((part.offset + index) * SECTOR_SIZE + pos,
(uint32_t*)_sdcard_buffer, SECTOR_SIZE);
/* copy to the buffer */ if (status != SD_OK) break;
rt_memcpy(((rt_uint8_t*)buffer + index * SECTOR_SIZE), _sdcard_buffer, SECTOR_SIZE);
} /* copy to the buffer */
} rt_memcpy(((rt_uint8_t*)buffer + index * SECTOR_SIZE), _sdcard_buffer, SECTOR_SIZE);
else }
{
if (nr == 1)
{
status = SD_ReadBlock(part.offset * SECTOR_SIZE + pos,
(uint32_t*)buffer, SECTOR_SIZE);
} }
else else
{ {
status = SD_ReadMultiBlocks(part.offset * SECTOR_SIZE + pos, if (nr == 1)
(uint32_t*)buffer, SECTOR_SIZE, nr); {
status = SD_ReadBlock(part.offset * SECTOR_SIZE + pos,
(uint32_t*)buffer, SECTOR_SIZE);
}
else
{
status = SD_ReadMultiBlocks(part.offset * SECTOR_SIZE + pos,
(uint32_t*)buffer, SECTOR_SIZE, nr);
}
} }
}
if (status == SD_OK) break;
retry --;
}
rt_sem_release(&sd_lock); rt_sem_release(&sd_lock);
if (status == SD_OK) return size; if (status == SD_OK) return size;
@ -3110,7 +3137,7 @@ void rt_hw_sdcard_init()
status = SD_SelectDeselect((u32) (SDCardInfo.RCA << 16)); status = SD_SelectDeselect((u32) (SDCardInfo.RCA << 16));
if (status != SD_OK) goto __return; if (status != SD_OK) goto __return;
SD_EnableWideBusOperation(SDIO_BusWide_4b); SD_EnableWideBusOperation(SDIO_BusWide_1b);
SD_SetDeviceMode(SD_DMA_MODE); SD_SetDeviceMode(SD_DMA_MODE);
/* get the first sector to read partition table */ /* get the first sector to read partition table */