diff --git a/trunk/CommandTest.cpp b/trunk/CommandTest.cpp index 2137653..98beecf 100644 --- a/trunk/CommandTest.cpp +++ b/trunk/CommandTest.cpp @@ -48,6 +48,17 @@ public: if (pad.IsTrigger(KeyPad::A)) { #ifdef INTEGRATION_TEST + setting.up_down = 0; + setting.StartAddress = 0; + setting.size = 0; + setting.EndAddress = 0; + setting.data = 0; + setting.reserved1 = 0; + setting.reserved2 = 0; + + // パラメータ設定 + cardSettingMenu( TID_FUNC_RDID1, &setting ); + // 引数:buffer, BUFFER_SIZE, TestCaseID(TID_FUNC_RDID1), detailInfo cardFunctionTestStart( (u8*)card_test_buffer, BUFFER_SIZE, TID_FUNC_RDID1, &detail); #endif @@ -109,6 +120,17 @@ public: if (pad.IsTrigger(KeyPad::A)) { #ifdef INTEGRATION_TEST + setting.up_down = 0; + setting.StartAddress = 0; + setting.size = 0; + setting.EndAddress = 0; + setting.data = 0; + setting.reserved1 = 0; + setting.reserved2 = 0; + + // パラメータ設定 + cardSettingMenu( TID_FUNC_RDID2, &setting ); + // 引数:buffer, BUFFER_SIZE, TestCaseID(TID_FUNC_RDID2), detailInfo cardFunctionTestStart( (u8*)card_test_buffer, BUFFER_SIZE, TID_FUNC_RDID2, &detail); #endif @@ -194,19 +216,23 @@ public: if (pad.IsTrigger(KeyPad::A)) { - setting.up_down = 0; - setting.StartAddress = address.GetValue(); - setting.size = read_size.GetValue(); - setting.EndAddress = setting.StartAddress + setting.size; - setting.data = 0; - setting.reserved1 = 0; - setting.reserved2 = 0; - + #ifdef INTEGRATION_TEST - cardSettingMenu( &setting ); + setting.up_down = 0; + setting.StartAddress = address.GetValue(); + setting.size = read_size.GetValue(); + setting.EndAddress = setting.StartAddress + setting.size; + setting.data = 0; + setting.reserved1 = 0; + setting.reserved2 = 0; + + // パラメータ設定 + cardSettingMenu( TID_FUNC_RDSEQ_WITH_VERIFY, &setting ); + // 処理開始 cardFunctionTestStart( (u8*)card_test_buffer, BUFFER_SIZE, TID_FUNC_RDSEQ_WITH_VERIFY, &detail); #endif + // ダンプ表示開始アドレス & 表示サイズ dump_start_address = address.GetValue(); show_size = read_size.GetValue() > ONE_PAGE_SIZE ? ONE_PAGE_SIZE : read_size.GetValue(); @@ -256,7 +282,11 @@ public: if(refresh && done) { NN_TLOG_("[ofs : 0x%08x]\n", ofs); +#ifdef INTEGRATION_TEST + ShowMemDump( &page, dump, dump_start_address + ofs, card_test_buffer + ofs, show_size ); +#else ShowMemDump( &page, dump, dump_start_address + ofs, temp_buffer + ofs, show_size ); +#endif refresh = false; } diff --git a/trunk/FunctionTest.cpp b/trunk/FunctionTest.cpp index 5bb7a6b..9fb0b44 100644 --- a/trunk/FunctionTest.cpp +++ b/trunk/FunctionTest.cpp @@ -56,13 +56,27 @@ public: run = true; #ifdef INTEGRATION_TEST + setting.up_down = 0; + setting.StartAddress = 0; + setting.size = 0; + setting.EndAddress = 0; + setting.data = 0; + setting.reserved1 = 0; + setting.reserved2 = 0; + if ( card_type == CARD_TYPE_S1 ) { + // パラメータ設定 + cardSettingMenu( TID_FUNC_TEST1, &setting ); + // S1なら 引数:buffer, BUFFER_SIZE, TestCaseID(TID_FUNC_TEST1), detailInfo cardFunctionTestStart( (u8*)card_test_buffer, BUFFER_SIZE, TID_FUNC_TEST1, &detail); } else { + // パラメータ設定 + cardSettingMenu( TID_FUNC_TEST2, &setting ); + // S2なら 引数:buffer, BUFFER_SIZE, TestCaseID(TID_FUNC_TEST2), detailInfo cardFunctionTestStart( (u8*)card_test_buffer, BUFFER_SIZE, TID_FUNC_TEST2, &detail); } @@ -134,7 +148,18 @@ public: run = true; #ifdef INTEGRATION_TEST - // 引数:buffer, BUFFER_SIZE, TestCaseID(TID_FUNC_INTEG), detailInfo + setting.up_down = 0; + setting.StartAddress = 0; + setting.size = 0; + setting.EndAddress = 0; + setting.data = 0; + setting.reserved1 = 0; + setting.reserved2 = 0; + + // パラメータ設定 + cardSettingMenu( TID_FUNC_INTEG, &setting ); + + // 処理開始 cardFunctionTestStart( (u8*)card_test_buffer, BUFFER_SIZE, TID_FUNC_INTEG, &detail); #endif }