mhu/stm32f4-sdio
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Compare commits

base: mhu:d0c488645c456928ba5f6b7895f19230b578f26b
Branches Tags
mhu:master
mhu:qtproject
...
compare: mhu:6021c9e1e2f1bef5898d8656a0c89ee626eba78e
Branches Tags
mhu:master
mhu:qtproject

2 Commits
d0c488645c ... 6021c9e1e2

Author SHA1 Message Date
Mario Hüttel
6021c9e1e2 Merge branch 'master' of git.shimatta.de:mhu/stm32f4-sdio 2020-02-22 19:32:43 +01:00
Mario Hüttel
cd986ff984 Edit linker script and fix read function in SDIO 2020-02-22 19:30:13 +01:00
2 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

9
fatfs/shimatta_sdio_driver/shimatta_sdio.c
View File

@ -626,15 +626,16 @@ DRESULT sdio_disk_read(BYTE *buff, DWORD sector, UINT count){
SDIO->DLEN = (1 << BLOCKSIZE); SDIO->DLEN = (1 << BLOCKSIZE);
/* Init Transfer */
if (sdio_send_read_block_cmd17(addr)) {
return RES_ERROR;
}
SDIO->ICR = SDIO_ICR_CCRCFAILC | SDIO_ICR_DCRCFAILC | SDIO_ICR_CTIMEOUTC | SDIO_ICR_DTIMEOUTC | SDIO->ICR = SDIO_ICR_CCRCFAILC | SDIO_ICR_DCRCFAILC | SDIO_ICR_CTIMEOUTC | SDIO_ICR_DTIMEOUTC |
SDIO_ICR_TXUNDERRC | SDIO_ICR_RXOVERRC | SDIO_ICR_CMDRENDC | SDIO_ICR_CMDSENTC | SDIO_ICR_DATAENDC | SDIO_ICR_TXUNDERRC | SDIO_ICR_RXOVERRC | SDIO_ICR_CMDRENDC | SDIO_ICR_CMDSENTC | SDIO_ICR_DATAENDC |
SDIO_ICR_STBITERRC | SDIO_ICR_DBCKENDC | SDIO_ICR_SDIOITC | SDIO_ICR_CEATAENDC; SDIO_ICR_STBITERRC | SDIO_ICR_DBCKENDC | SDIO_ICR_SDIOITC | SDIO_ICR_CEATAENDC;
SDIO->DCTRL = (BLOCKSIZE<<4) | SDIO_DCTRL_DTDIR | /*SDIO_DCTRL_DMAEN |*/ SDIO_DCTRL_DTEN; SDIO->DCTRL = (BLOCKSIZE<<4) | SDIO_DCTRL_DTDIR | /*SDIO_DCTRL_DMAEN |*/ SDIO_DCTRL_DTEN;
/* Init Transfer */
if (sdio_send_read_block_cmd17(addr)) {
return RES_ERROR;
}
counter = 0; counter = 0;
while (counter < (1<<(BLOCKSIZE-2)) || !(SDIO->STA & (SDIO_STA_DBCKEND | SDIO_STA_DATAEND))) { // TODO: Handle errors while (counter < (1<<(BLOCKSIZE-2)) || !(SDIO->STA & (SDIO_STA_DBCKEND | SDIO_STA_DATAEND))) { // TODO: Handle errors
if (SDIO->STA & (SDIO_STA_DCRCFAIL | SDIO_STA_DTIMEOUT | SDIO_STA_STBITERR)) if (SDIO->STA & (SDIO_STA_DCRCFAIL | SDIO_STA_DTIMEOUT | SDIO_STA_STBITERR))

4
stm32f407vgt6_flash.ld
View File

@ -152,7 +152,7 @@ SECTIONS
/* Uninitialized data section */ /* Uninitialized data section */
. = ALIGN(4); . = ALIGN(4);
.bss : .bss (NOLOAD):
{ {
/* This is used by the startup in order to initialize the .bss secion */ /* This is used by the startup in order to initialize the .bss secion */
_sbss = .; /* define a global symbol at bss start */ _sbss = .; /* define a global symbol at bss start */
@ -167,7 +167,7 @@ SECTIONS
} >RAM } >RAM
/* User_heap_stack section, used to check that there is enough RAM left */ /* User_heap_stack section, used to check that there is enough RAM left */
._user_heap_stack : ._user_heap_stack (NOLOAD):
{ {
. = ALIGN(4); . = ALIGN(4);
PROVIDE (heap_low = .); /* for _sbrk */ PROVIDE (heap_low = .); /* for _sbrk */