ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename inconveniently-named select() to more correct mmc_select()

This commit is contained in:
Stefan `Sec` Zehl 2011-07-24 10:26:04 +02:00
parent 3204b537b5
commit abfe5342c9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/filesystem/mmc.c
View File

@ -145,7 +145,7 @@ BYTE wait_ready (void)
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static static
void deselect (void) void mmc_deselect (void)
{ {
CS_HIGH(); CS_HIGH();
rcvr_spi(); rcvr_spi();
@ -158,11 +158,11 @@ void deselect (void)
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static static
BOOL select (void) /* TRUE:Successful, FALSE:Timeout */ BOOL mmc_select (void) /* TRUE:Successful, FALSE:Timeout */
{ {
CS_LOW(); CS_LOW();
if (wait_ready() != 0xFF) { if (wait_ready() != 0xFF) {
deselect(); mmc_deselect();
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -283,8 +283,8 @@ BYTE send_cmd (
} }
/* Select the card and wait for ready */ /* Select the card and wait for ready */
deselect(); mmc_deselect();
if (!select()) return 0xFF; if (!mmc_select()) return 0xFF;
/* Send command packet */ /* Send command packet */
xmit_spi(cmd); /* Start + Command index */ xmit_spi(cmd); /* Start + Command index */
@ -363,7 +363,7 @@ DSTATUS mmc_initialize ()
} }
} }
CardType = ty; CardType = ty;
deselect(); mmc_deselect();
if (ty) { /* Initialization succeded */ if (ty) { /* Initialization succeded */
Stat &= ~STA_NOINIT; /* Clear STA_NOINIT */ Stat &= ~STA_NOINIT; /* Clear STA_NOINIT */
@ -417,7 +417,7 @@ DRESULT mmc_read (
send_cmd(CMD12, 0); /* STOP_TRANSMISSION */ send_cmd(CMD12, 0); /* STOP_TRANSMISSION */
} }
} }
deselect(); mmc_deselect();
return count ? RES_ERROR : RES_OK; return count ? RES_ERROR : RES_OK;
} }
@ -457,7 +457,7 @@ DRESULT mmc_write (
count = 1; count = 1;
} }
} }
deselect(); mmc_deselect();
return count ? RES_ERROR : RES_OK; return count ? RES_ERROR : RES_OK;
} }
@ -505,9 +505,9 @@ DRESULT mmc_ioctl (
switch (ctrl) { switch (ctrl) {
case CTRL_SYNC : /* Make sure that no pending write process. Do not remove this or written sector might not left updated. */ case CTRL_SYNC : /* Make sure that no pending write process. Do not remove this or written sector might not left updated. */
if (select()) { if (mmc_select()) {
res = RES_OK; res = RES_OK;
deselect(); mmc_deselect();
} }
break; break;
@ -588,7 +588,7 @@ DRESULT mmc_ioctl (
res = RES_PARERR; res = RES_PARERR;
} }
deselect(); mmc_deselect();
} }
return res; return res;