diff --git a/build/libraries/devices/sdmc/ARM7/sdmc.c b/build/libraries/devices/sdmc/ARM7/sdmc.c index eb7c267..6a8d045 100644 --- a/build/libraries/devices/sdmc/ARM7/sdmc.c +++ b/build/libraries/devices/sdmc/ARM7/sdmc.c @@ -962,23 +962,20 @@ void i_sdmcCalcSize( 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 > SDCARD_PORT1)) - { - SDCARD_ErrStatus = SDMC_NORMAL; /* エラーステータスをクリア */ - SDCARD_OutFlag = TRUE; /* 排出フラグをセット */ - }else{ - if( SD_CheckFPGAReg( SD_INFO1, SD_INFO1_DETECT)) { - sdmcSelect( (u16)SDMC_PORT_CARD); - SDCARD_ErrStatus = SDCARD_Layer_Init(); - } - if( SD_CheckFPGAReg( EXT_CD, EXT_CD_PORT1_DETECT)) { - sdmcSelect( (u16)SDMC_PORT_NAND); - SDCARD_ErrStatus = SDCARD_Layer_Init(); - } - SDCARD_OutFlag = FALSE; /* 排出フラグをリセット */ + /*ポート選択状態、挿抜状態 + SD_port_number, SD_CheckFPGAReg(SD_INFO1,SD_INFO1_DETECT), + SD_CheckFPGAReg(EXT_CD,EXT_CD_PORT1_DETECT) + */ + + if( SD_CheckFPGAReg( SD_INFO1, SD_INFO1_DETECT)) { + sdmcSelect( (u16)SDMC_PORT_CARD); + SDCARD_ErrStatus = SDCARD_Layer_Init(); } + if( SD_CheckFPGAReg( EXT_CD, EXT_CD_PORT1_DETECT)) { + sdmcSelect( (u16)SDMC_PORT_NAND); + SDCARD_ErrStatus = SDCARD_Layer_Init(); + } + SDCARD_OutFlag = FALSE; /* 排出フラグをリセット */ SDCARD_TimerStop(); /* タイムアウト判定用タイマストップ */ SD_DisableClock(); /* SD-CLK Disable */ diff --git a/build/tests/fatfs/nand_formatter_kmc/ARM7/src/main.c b/build/tests/fatfs/nand_formatter_kmc/ARM7/src/main.c index 6b33c3f..128c5ec 100644 --- a/build/tests/fatfs/nand_formatter_kmc/ARM7/src/main.c +++ b/build/tests/fatfs/nand_formatter_kmc/ARM7/src/main.c @@ -269,7 +269,7 @@ void TwlSpMain(void) (((nand_firm_size % (1024*1024)) != 0)? 1:0); // 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) -> "); if( FALSE == getchar_yes_no_prompt()) {