Further style improvements. Tested: Read still works
This commit is contained in:
parent
6021c9e1e2
commit
d722738de9
@ -28,8 +28,6 @@ DSTATUS disk_status (
|
||||
BYTE pdrv /* Physical drive nmuber to identify the drive */
|
||||
)
|
||||
{
|
||||
DSTATUS stat;
|
||||
int result;
|
||||
|
||||
switch (pdrv) {
|
||||
case DEV_SD:
|
||||
@ -48,9 +46,6 @@ DSTATUS disk_initialize (
|
||||
BYTE pdrv /* Physical drive nmuber to identify the drive */
|
||||
)
|
||||
{
|
||||
DSTATUS stat;
|
||||
int result;
|
||||
|
||||
switch (pdrv) {
|
||||
case DEV_SD:
|
||||
return sdio_initialize();
|
||||
@ -71,9 +66,6 @@ DRESULT disk_read (
|
||||
UINT count /* Number of sectors to read */
|
||||
)
|
||||
{
|
||||
DRESULT res;
|
||||
int result;
|
||||
|
||||
switch (pdrv) {
|
||||
case DEV_SD:
|
||||
return sdio_disk_read(buff, sector, count);
|
||||
@ -96,12 +88,9 @@ DRESULT disk_write (
|
||||
UINT count /* Number of sectors to write */
|
||||
)
|
||||
{
|
||||
DRESULT res;
|
||||
int result;
|
||||
|
||||
switch (pdrv) {
|
||||
case DEV_SD:
|
||||
return SDIO_disk_write(buff, sector, count);
|
||||
return sdio_disk_write(buff, sector, count);
|
||||
}
|
||||
|
||||
return RES_PARERR;
|
||||
@ -120,9 +109,6 @@ DRESULT disk_ioctl (
|
||||
void *buff /* Buffer to send/receive control data */
|
||||
)
|
||||
{
|
||||
DRESULT res;
|
||||
int result;
|
||||
|
||||
switch (pdrv) {
|
||||
case DEV_SD:
|
||||
return sdio_disk_ioctl(cmd, buff);
|
||||
|
||||
@ -1,10 +1,3 @@
|
||||
/*
|
||||
* shimatta_sdio-driver.c
|
||||
*
|
||||
* Created on: Apr 30, 2015
|
||||
* Mario Hüttel
|
||||
*/
|
||||
|
||||
#include "shimatta_sdio.h"
|
||||
#include "shimatta_sdio_config.h"
|
||||
#include <cmsis/core_cm4.h>
|
||||
@ -33,35 +26,6 @@ enum acmd41_ret {ACMD41_RESP_INIT = 0, ACMD41_RESP_ERR, ACMD41_RESP_SDSC, ACMD41
|
||||
enum cmd8_ret {CMD8_RESP_TIMEOUT = 0, CMD8_VOLTAGE_ACCEPTED, CMD8_VOLTAGE_DENIED};
|
||||
typedef uint8_t CID_t;
|
||||
|
||||
/*
|
||||
void SDIO_init_hw();
|
||||
|
||||
int SDIO_send_cmd(uint8_t CMD, uint32_t arg, uint8_t expectedAns);
|
||||
int SDIO_get_response(uint8_t expectedCMD, uint8_t typeOfAns, uint32_t* responseBuffer);
|
||||
|
||||
|
||||
void SDIO_wait_cmd_sent(void);
|
||||
ACMD41_RESP_t SDIO_init_card_ACMD41(uint8_t HCS);
|
||||
int SDIO_switch_appmode_CMD55(void);
|
||||
int SDIO_send_all_send_cid_CMD2(void);
|
||||
int SDIO_send_relative_address_CMD3(uint16_t* rca);
|
||||
int SDIO_send_go_idle_CMD0(void);
|
||||
CMD8_RESP_t SDIO_send_iface_condition_CMD8(void);
|
||||
int SDIO_send_block_length_CMD16(uint32_t blocklen);
|
||||
int SDIO_send_bus_width_ACMD6(uint8_t bus_width);
|
||||
int SDIO_send_csd_CMD9(uint16_t rca, uint32_t *responsebuffer);
|
||||
int SDIO_send_select_card_CMD7(uint16_t rca);
|
||||
int SDIO_check_status_register_CMD13(uint16_t rca, uint32_t *status);
|
||||
void SDIO_init_detect_pins(void);
|
||||
int checkNotInserted(void); // Returns 0 if inserted!
|
||||
int checkWriteProtection(void); // returns 0 if write protected
|
||||
void switchPrescaler(uint8_t clkdiv);
|
||||
int SDIO_send_write_block_CMD24(uint32_t addr);
|
||||
int SDIO_send_read_block_CMD17(uint32_t addr);
|
||||
int SDIO_get_sector_count(uint16_t rca, uint32_t *sector_count);
|
||||
*/
|
||||
|
||||
//BYTE rxtxbuffer[1<<BLOCKSIZE]; //Data RX and TX Buffer not needed anymore. thanks to DMA
|
||||
static struct sd_info card_info; // = {.type = CARD_NONE};
|
||||
|
||||
/**
|
||||
@ -94,12 +58,12 @@ static void sdio_wait_cmd_sent()
|
||||
SDIO->ICR |= SDIO_ICR_CMDSENTC;
|
||||
}
|
||||
|
||||
static int sdio_send_cmd(uint8_t CMD, uint32_t arg, uint8_t expectedAns){
|
||||
//Clear Flags
|
||||
static int sdio_send_cmd(uint8_t cmd, uint32_t arg, uint8_t expected_ans){
|
||||
/* Clear Flags */
|
||||
SDIO->ICR = SDIO_ICR_CCRCFAILC | SDIO_ICR_CMDRENDC | SDIO_ICR_CTIMEOUTC | SDIO_ICR_CMDSENTC;
|
||||
//Send command
|
||||
/* Send command */
|
||||
SDIO->ARG = arg;
|
||||
SDIO->CMD = (CMD & SDIO_CMD_CMDINDEX) | SDIO_CMD_CPSMEN | /*SDIO_CMD_WAITPEND |*/ ((expectedAns << 6) & SDIO_CMD_WAITRESP);
|
||||
SDIO->CMD = (cmd & SDIO_CMD_CMDINDEX) | SDIO_CMD_CPSMEN | ((expected_ans << 6) & SDIO_CMD_WAITRESP);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -132,12 +96,14 @@ static int sdio_get_response(uint8_t expected_command, uint8_t type_of_answer, u
|
||||
if (sdio_status & SDIO_STA_CTIMEOUT)
|
||||
return -CTIMEOUT;
|
||||
}
|
||||
//Valid Respone Received
|
||||
|
||||
/* Valid Respone Received */
|
||||
if (((SDIO->RESPCMD & SDIO_RESPCMD_RESPCMD) != expected_command) && (expected_command != 0xff))
|
||||
return -CNOTEXPETED; //Not the expected respose
|
||||
|
||||
/* If case of a correct Response */
|
||||
*(response_buffer++) = SDIO->RESP1;
|
||||
|
||||
/* Long response */
|
||||
if (type_of_answer == LONG_ANS) {
|
||||
*(response_buffer++) = SDIO->RESP2;
|
||||
@ -148,23 +114,27 @@ static int sdio_get_response(uint8_t expected_command, uint8_t type_of_answer, u
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Switch the card to application mode. It now accepts ACMDXX commands
|
||||
* @return 0 if successfuls
|
||||
*/
|
||||
static int sdio_switch_appmode_cmd55()
|
||||
{
|
||||
int retry = 0x20;
|
||||
union sdio_status_conv converter;
|
||||
uint32_t response;
|
||||
do {
|
||||
//Execute Command and check for valid response
|
||||
/* Execute Command and check for valid response */
|
||||
sdio_send_cmd(55, (card_info.rca<<16)&0xFFFF0000, SHORT_ANS);
|
||||
|
||||
if (!sdio_get_response(55, SHORT_ANS, &response))
|
||||
{
|
||||
//Response valid. Check if Card has accepted switch to application command mode
|
||||
/* Response valid. Check if Card has accepted switch to application command mode */
|
||||
converter.value = response;
|
||||
if (converter.statusstruct.APP_CMD == 1)
|
||||
return 0;
|
||||
}
|
||||
}while(--retry > 0);
|
||||
} while (--retry > 0);
|
||||
|
||||
return -1;
|
||||
}
|
||||
@ -172,11 +142,14 @@ static int sdio_switch_appmode_cmd55()
|
||||
enum acmd41_ret sdio_init_card_acmd41(uint8_t HCS){
|
||||
uint32_t response;
|
||||
int retry = 0x20;
|
||||
if (sdio_switch_appmode_cmd55()) return ACMD41_RESP_ERR;
|
||||
if (sdio_switch_appmode_cmd55())
|
||||
return ACMD41_RESP_ERR;
|
||||
|
||||
do {
|
||||
sdio_send_cmd(41, (HCS ? (1<<30) : 0) | (1<<28) | (1<<20) |(1<<21)|(1<<22) |(1<<23)|(1<<19), SHORT_ANS);
|
||||
if (!sdio_get_response(0xFF, SHORT_ANS, &response)) {
|
||||
if (response & OCS_BUSY) { // Card is ready... Who knows why this bit is called busy...
|
||||
if (response & OCS_BUSY) {
|
||||
/* Card is ready... Who knows why this bit is called busy */
|
||||
if (response & OCS_CCS) {
|
||||
return ACMD41_RESP_SDXC;
|
||||
} else {
|
||||
@ -186,28 +159,34 @@ enum acmd41_ret sdio_init_card_acmd41(uint8_t HCS){
|
||||
return ACMD41_RESP_INIT;
|
||||
}
|
||||
}
|
||||
}while(--retry > 0);
|
||||
} while (--retry > 0);
|
||||
|
||||
return ACMD41_RESP_ERR;
|
||||
}
|
||||
|
||||
static int sdio_send_csd_cmd9(uint16_t rca, uint32_t *responsebuffer) {
|
||||
static int sdio_send_csd_cmd9(uint16_t rca, uint32_t *response_buffer) {
|
||||
int timeout = 0x20;
|
||||
int res;
|
||||
|
||||
do {
|
||||
sdio_send_cmd(9, (rca<<16)&0xFFFF0000, LONG_ANS);
|
||||
if (!(res = sdio_get_response(0xFF, LONG_ANS, responsebuffer))) {
|
||||
res = sdio_get_response(0xFF, LONG_ANS, response_buffer);
|
||||
if (!res)
|
||||
break;
|
||||
}
|
||||
} while(--timeout > 0);
|
||||
} while (--timeout > 0);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Send data buffer to SD card
|
||||
* @param dlen Data length. Must be a multiple of 4 bytes
|
||||
* @param blklen Block length
|
||||
* @param buff Buffer to send
|
||||
*/
|
||||
static void sdio_write_buffer(uint32_t dlen, uint32_t blklen, uint8_t *buff)
|
||||
{
|
||||
int count;
|
||||
uint32_t count;
|
||||
int byte_count;
|
||||
int byte_max;
|
||||
uint32_t fifo;
|
||||
@ -228,24 +207,26 @@ static void sdio_write_buffer(uint32_t dlen, uint32_t blklen, uint8_t *buff)
|
||||
else
|
||||
byte_max = 4;
|
||||
|
||||
for (byte_count = 0; byte_count < byte_max; byte_count++)
|
||||
{
|
||||
for (byte_count = 0; byte_count < byte_max; byte_count++) {
|
||||
fifo >>= 8;
|
||||
fifo |= (((uint32_t)*(buff++)) << 24) & 0xFF000000;
|
||||
}
|
||||
|
||||
/* Wait as long as FIFO is full */
|
||||
while (SDIO->STA & SDIO_STA_TXFIFOF);
|
||||
|
||||
/* Write data to FIFO */
|
||||
SDIO->FIFO = fifo;
|
||||
|
||||
}
|
||||
|
||||
/* Wait for TX to complete */
|
||||
while (SDIO->STA & SDIO_STA_TXACT);
|
||||
|
||||
}
|
||||
|
||||
static int sdio_send_write_block_cmd24(uint32_t addr)
|
||||
{
|
||||
(void)addr;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -254,13 +235,14 @@ static int sdio_check_status_register_cmd13(uint16_t rca, uint32_t *status)
|
||||
int timeout = 0x20;
|
||||
uint32_t response;
|
||||
int res;
|
||||
|
||||
do {
|
||||
sdio_send_cmd(13, (rca<<16)&0xFFFF0000, SHORT_ANS);
|
||||
if (!(res = sdio_get_response(13, SHORT_ANS, &response))) {
|
||||
*status = response;
|
||||
break;
|
||||
}
|
||||
} while(--timeout > 0);
|
||||
} while (--timeout > 0);
|
||||
|
||||
return res;
|
||||
}
|
||||
@ -269,15 +251,14 @@ static int sdio_send_bus_width_acmd6(uint8_t bus_width)
|
||||
{
|
||||
uint32_t response;
|
||||
int retry = 0x20;
|
||||
union sdio_status_conv status;
|
||||
int ret;
|
||||
|
||||
if (sdio_switch_appmode_cmd55()) return -1;
|
||||
do {
|
||||
sdio_send_cmd(0x6, (bus_width == 4 ? 0x2 : 0x0), SHORT_ANS);
|
||||
if (!(ret = sdio_get_response(0x6, SHORT_ANS, &response))) {
|
||||
status.value = response;
|
||||
ret = sdio_get_response(0x6, SHORT_ANS, &response);
|
||||
if (!ret)
|
||||
return 0;
|
||||
}
|
||||
|
||||
} while (--retry > 0);
|
||||
|
||||
@ -297,12 +278,14 @@ static int sdio_get_sector_count(uint16_t rca, uint32_t *sector_count)
|
||||
|
||||
csd_rev = ((csd[0] >> 30) & (0x3));
|
||||
|
||||
if (csd_rev == 0) { // SD v1 Card
|
||||
if (csd_rev == 0) {
|
||||
/* SD v1 Card */
|
||||
size = ((csd[1] & 0x3FF) <<2) | (((csd[2]) & ((1<<31) | (1<<30)))>>30);
|
||||
mult = ((csd[2] & ((1<<17)|(1<<16)|(1<<15)))>>15);
|
||||
read_len = (1<<((csd[1] & ((1<<19)|(1<<18)|(1<<17)|(1<<16)))>>16));
|
||||
*sector_count = (((size +1)*(1<<(mult+2))*read_len) >> BLOCKSIZE);
|
||||
} else if (csd_rev == 1) { // SD v2 Card
|
||||
} else if (csd_rev == 1) {
|
||||
/* SD v2 Card */
|
||||
size = (((csd[1] & 0x3F)<<16) | ((csd[2] & 0xFFFF0000) >> 16));
|
||||
*sector_count = (size << (19-BLOCKSIZE));
|
||||
}
|
||||
@ -310,6 +293,10 @@ static int sdio_get_sector_count(uint16_t rca, uint32_t *sector_count)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Switch the SDIo prescaler
|
||||
* @param Prescaler value
|
||||
*/
|
||||
static void sdio_switch_prescaler(uint8_t clkdiv)
|
||||
{
|
||||
uint32_t reg;
|
||||
@ -394,16 +381,21 @@ static int sdio_send_all_send_cid_cmd2()
|
||||
uint32_t response[4];
|
||||
int ret;
|
||||
int retry = 0x20;
|
||||
|
||||
do {
|
||||
sdio_send_cmd(2, 0, LONG_ANS);
|
||||
if (!(ret = sdio_get_response(0xFF, LONG_ANS, response))) return 0;
|
||||
}while(retry-- > 0);
|
||||
if (!(ret = sdio_get_response(0xFF, LONG_ANS, response)))
|
||||
return 0;
|
||||
} while (retry-- > 0);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int sdio_send_relative_address_cmd3(uint16_t* rca) {
|
||||
static int sdio_send_relative_address_cmd3(uint16_t* rca)
|
||||
{
|
||||
uint32_t response;
|
||||
int retry = 0x20;
|
||||
|
||||
do {
|
||||
sdio_send_cmd(3, 0, SHORT_ANS);
|
||||
if (!sdio_get_response(3, SHORT_ANS, &response)) {
|
||||
@ -411,7 +403,7 @@ static int sdio_send_relative_address_cmd3(uint16_t* rca) {
|
||||
*rca = ((response & 0xFFFF0000) >> 16);
|
||||
return 0;
|
||||
}
|
||||
}while(retry-- > 0);
|
||||
} while (retry-- > 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -421,10 +413,12 @@ static int sdio_send_go_idle_cmd0() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static enum cmd8_ret sdio_send_iface_condition_cmd8() {
|
||||
static enum cmd8_ret sdio_send_iface_condition_cmd8()
|
||||
{
|
||||
uint32_t response;
|
||||
int res = 0;
|
||||
int retry = 0x20;
|
||||
|
||||
do {
|
||||
sdio_send_cmd(8, 0x1CC, SHORT_ANS); // 3.3V supply requesR
|
||||
res = sdio_get_response(8, SHORT_ANS, &response);
|
||||
@ -434,7 +428,7 @@ static enum cmd8_ret sdio_send_iface_condition_cmd8() {
|
||||
else
|
||||
return CMD8_VOLTAGE_DENIED;
|
||||
}
|
||||
}while(retry-- > 0);
|
||||
} while (retry-- > 0);
|
||||
|
||||
return CMD8_RESP_TIMEOUT;
|
||||
}
|
||||
@ -480,20 +474,21 @@ DSTATUS sdio_status()
|
||||
{
|
||||
DSTATUS returnval = 0;
|
||||
|
||||
if (sdio_check_inserted()) {
|
||||
if (sdio_check_inserted())
|
||||
returnval |= STA_NODISK;
|
||||
}
|
||||
if (card_info.type == CARD_NONE) {
|
||||
|
||||
if (card_info.type == CARD_NONE)
|
||||
returnval |= STA_NOINIT;
|
||||
}
|
||||
if (sdio_check_write_protection()) {
|
||||
|
||||
if (sdio_check_write_protection())
|
||||
returnval |= STA_PROTECT;
|
||||
}
|
||||
|
||||
return returnval;
|
||||
}
|
||||
|
||||
DRESULT sdio_disk_ioctl(BYTE cmd, void* buff){
|
||||
DRESULT res = RES_OK;
|
||||
|
||||
switch(cmd) {
|
||||
case GET_BLOCK_SIZE:
|
||||
*((DWORD*)buff) = (DWORD)0x01;
|
||||
@ -510,13 +505,12 @@ DRESULT sdio_disk_ioctl(BYTE cmd, void* buff){
|
||||
break;
|
||||
case CTRL_SYNC:
|
||||
res = RES_OK;
|
||||
//No cache
|
||||
//Nothing to do
|
||||
break;
|
||||
default:
|
||||
res = RES_PARERR;
|
||||
break;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
@ -542,7 +536,9 @@ DSTATUS sdio_initialize(){
|
||||
}
|
||||
|
||||
sdio_send_go_idle_cmd0();
|
||||
|
||||
sdio_wait_ms(2);
|
||||
|
||||
res8 = sdio_send_iface_condition_cmd8();
|
||||
switch (res8) {
|
||||
case CMD8_VOLTAGE_ACCEPTED: // SDV2 Card
|
||||
@ -562,7 +558,7 @@ DSTATUS sdio_initialize(){
|
||||
do {
|
||||
//SDIO_wait_ms(2);
|
||||
resa41 = sdio_init_card_acmd41(hcs_flag);
|
||||
} while((resa41 == ACMD41_RESP_INIT) && (--timeout > 0));
|
||||
} while ((resa41 == ACMD41_RESP_INIT) && (--timeout > 0));
|
||||
|
||||
switch (resa41) {
|
||||
case ACMD41_RESP_SDSC:
|
||||
@ -589,9 +585,6 @@ DSTATUS sdio_initialize(){
|
||||
if (sdio_send_block_length_cmd16((uint32_t)(1<<BLOCKSIZE)))
|
||||
return STA_NOINIT;
|
||||
|
||||
//sdio_unlock_card();
|
||||
|
||||
|
||||
if (sdio_send_bus_width_acmd6(BUSWIDTH))
|
||||
return STA_NOINIT;
|
||||
|
||||
@ -615,14 +608,14 @@ DRESULT sdio_disk_read(BYTE *buff, DWORD sector, UINT count){
|
||||
for (; count > 0; count--) {
|
||||
|
||||
/* configure read DMA */
|
||||
// DMA2->LIFCR = 0xffffffff;
|
||||
// DMA2->HIFCR = 0xffffffff;
|
||||
// DMASTREAM->NDTR = 0;
|
||||
// DMASTREAM->FCR = DMA_SxFCR_FTH_0 | DMA_SxFCR_FTH_1 | DMA_SxFCR_DMDIS;
|
||||
// DMASTREAM->M0AR = (uint32_t)(buff);
|
||||
// DMASTREAM->PAR = (uint32_t)&(SDIO->FIFO);
|
||||
// DMASTREAM->CR = DMAP2M | DMA_SxCR_PL_1 | DMA_SxCR_PL_1;
|
||||
// DMASTREAM->CR |= DMA_SxCR_EN;
|
||||
// DMA2->LIFCR = 0xffffffff;
|
||||
// DMA2->HIFCR = 0xffffffff;
|
||||
// DMASTREAM->NDTR = 0;
|
||||
// DMASTREAM->FCR = DMA_SxFCR_FTH_0 | DMA_SxFCR_FTH_1 | DMA_SxFCR_DMDIS;
|
||||
// DMASTREAM->M0AR = (uint32_t)(buff);
|
||||
// DMASTREAM->PAR = (uint32_t)&(SDIO->FIFO);
|
||||
// DMASTREAM->CR = DMAP2M | DMA_SxCR_PL_1 | DMA_SxCR_PL_1;
|
||||
// DMASTREAM->CR |= DMA_SxCR_EN;
|
||||
|
||||
SDIO->DLEN = (1 << BLOCKSIZE);
|
||||
|
||||
@ -637,7 +630,8 @@ DRESULT sdio_disk_read(BYTE *buff, DWORD sector, UINT count){
|
||||
}
|
||||
|
||||
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))
|
||||
{
|
||||
return RES_ERROR;
|
||||
@ -678,7 +672,6 @@ DRESULT sdio_disk_read(BYTE *buff, DWORD sector, UINT count){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (card_info.type == SD_V2_HC) {
|
||||
addr++;
|
||||
} else {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user