rvtr/twl_wrapsdk
1
Fork 0
mirror of https://github.com/rvtr/twl_wrapsdk.git synced 2025-10-31 06:11:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

small fix

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@149 4ee2a332-4b2b-5046-8439-1ba90f034370
This commit is contained in:
shirait 2007-06-29 06:21:59 +00:00
parent 4b2f3bbc3e
commit 959ca77a9c
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/libraries/devices/sdmc/ARM7/sdmc.c
View File

@ -962,13 +962,11 @@ void i_sdmcCalcSize( void)
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static SDMC_ERR_CODE i_sdmcMPInit( void) static SDMC_ERR_CODE i_sdmcMPInit( void)
{ {
if(((SD_port_number == SDCARD_PORT0) && (!SD_CheckFPGAReg(SD_INFO1,SD_INFO1_DETECT))) || /*ポート選択状態、挿抜状態
((SD_port_number == SDCARD_PORT1) && (!SD_CheckFPGAReg(EXT_CD,EXT_CD_PORT1_DETECT))) || SD_port_number, SD_CheckFPGAReg(SD_INFO1,SD_INFO1_DETECT),
(SD_port_number > SDCARD_PORT1)) SD_CheckFPGAReg(EXT_CD,EXT_CD_PORT1_DETECT)
{ */
SDCARD_ErrStatus = SDMC_NORMAL; /* エラーステータスをクリア */
SDCARD_OutFlag = TRUE; /* 排出フラグをセット */
}else{
if( SD_CheckFPGAReg( SD_INFO1, SD_INFO1_DETECT)) { if( SD_CheckFPGAReg( SD_INFO1, SD_INFO1_DETECT)) {
sdmcSelect( (u16)SDMC_PORT_CARD); sdmcSelect( (u16)SDMC_PORT_CARD);
SDCARD_ErrStatus = SDCARD_Layer_Init(); SDCARD_ErrStatus = SDCARD_Layer_Init();
@ -978,7 +976,6 @@ static SDMC_ERR_CODE i_sdmcMPInit( void)
SDCARD_ErrStatus = SDCARD_Layer_Init(); SDCARD_ErrStatus = SDCARD_Layer_Init();
} }
SDCARD_OutFlag = FALSE; /* 排出フラグをリセット */ SDCARD_OutFlag = FALSE; /* 排出フラグをリセット */
}
SDCARD_TimerStop(); /* タイムアウト判定用タイマストップ */ SDCARD_TimerStop(); /* タイムアウト判定用タイマストップ */
SD_DisableClock(); /* SD-CLK Disable */ SD_DisableClock(); /* SD-CLK Disable */

2
build/tests/fatfs/nand_formatter_kmc/ARM7/src/main.c
View File

@ -269,7 +269,7 @@ void TwlSpMain(void)
(((nand_firm_size % (1024*1024)) != 0)? 1:0); (((nand_firm_size % (1024*1024)) != 0)? 1:0);
// DBG_PRINTF( "firm %dMB, raw %dMB\n", nand_firm_size, partition_MB_size[INDEX_RAW_PARTITION]); // DBG_PRINTF( "firm %dMB, raw %dMB\n", nand_firm_size, partition_MB_size[INDEX_RAW_PARTITION]);
if( nand_firm_size >= partition_MB_size[INDEX_RAW_PARTITION]) { if( nand_firm_size > partition_MB_size[INDEX_RAW_PARTITION]) {
DBG_PRINTF( "YOUR SETTING WILL ERASE NAND FIRM, OK?(y/n) -> "); DBG_PRINTF( "YOUR SETTING WILL ERASE NAND FIRM, OK?(y/n) -> ");
if( FALSE == getchar_yes_no_prompt()) { if( FALSE == getchar_yes_no_prompt()) {