・settingInfo と detailInfo をクラス変数に変更。

・enumをちょっと変更。

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_card_test@9 ff8ce827-af98-4349-adb5-4c00699b5328
This commit is contained in:
(no author) 2010-02-23 00:36:52 +00:00
parent 4a3a2a1d4d
commit 32c7306c62
3 changed files with 45 additions and 68 deletions

View File

@ -80,22 +80,22 @@ struct settingData {
************************************************** */
enum TestCaseID {
TID_FUNC_TEST1,
TID_FUNC_TEST2,
TID_FUNC_INTEG,
TID_FUNC_RDID1,
TID_FUNC_RDID2,
TID_FUNC_RDSEQ_WITH_VERIFY,
TID_FUNC_RDSEQ,
TID_WR_PAGE_START,
TID_WR_PAGE,
TID_RD_WREXE,
TID_FUNC_TEST1,
TID_FUNC_TEST2,
TID_FUNC_INTEG,
TID_FUNC_RDID1,
TID_FUNC_RDID2,
TID_FUNC_RDSEQ_WITH_VERIFY,
TID_FUNC_RDSEQ,
TID_WR_PAGE_START,
TID_WR_PAGE,
TID_RD_WREXE,
TID_RD_UID,
TID_RD_REFRESH,
TID_AGING_TEST,
TID_READ_TEST,
TID_READ_SPEED,
TID_READ_READONLY
TID_RD_REFRESH,
TID_AGING_TEST,
TID_READ_TEST,
TID_READ_SPEED,
TID_READ_READONLY,
};
@ -107,72 +107,50 @@ enum CardType {
// アクセスパターン
enum CardAccessPattern {
SETTING_ACCESS_PATTERN_INC,
SETTING_ACCESS_PATTERN_DEC,
SETTING_ACCESS_PATTERN_COMP,
SETTING_ACCESS_PATTERN_RAMDOM1,
SETTING_ACCESS_PATTERN_RAMDOM2,
SETTING_ACCESS_PATTERN_ID1,
SETTING_ACCESS_PATTERN_ID2,
SETTING_ACCESS_PATTERN_REPEAT
SETTING_ACCESS_PATTERN_INC = 0x00000000,
SETTING_ACCESS_PATTERN_DEC = 0x00000001,
SETTING_ACCESS_PATTERN_COMP = 0x00000002,
SETTING_ACCESS_PATTERN_RAMDOM1 = 0x00000004,
SETTING_ACCESS_PATTERN_RAMDOM2 = 0x00000008,
SETTING_ACCESS_PATTERN_ID1 = 0x00000010,
SETTING_ACCESS_PATTERN_ID2 = 0x00000020,
SETTING_ACCESS_PATTERN_REPEAT = 0x00000040
};
// DMAƒ^ƒCƒv
enum CardDmaType {
SETTING_DMA_TYPE_REPEAT,
SETTING_DMA_TYPE_DMA0,
SETTING_DMA_TYPE_DMA1,
SETTING_DMA_TYPE_DMA2,
SETTING_DMA_TYPE_DMA3,
SETTING_DMA_TYPE_DMA4,
SETTING_DMA_TYPE_DMA5,
SETTING_DMA_TYPE_DMA6,
SETTING_DMA_TYPE_DMA7,
SETTING_DMA_TYPE_CPU
};
// ループ
enum CardLoopType {
SETTING_LOOP_TYPE_ONCE,
SETTING_LOOP_TYPE_REPEAT
SETTING_LOOP_TYPE_ONCE = 0x00000080,
SETTING_LOOP_TYPE_REPEAT = 0x00000100
};
// リードカウント
enum CardReadCount {
SETTING_READ_COUNT_10000,
SETTING_READ_COUNT_100000,
SETTING_READ_COUNT_1000000,
SETTING_READ_COUNT_10000000
SETTING_READ_COUNT_10000 = 0x00000200,
SETTING_READ_COUNT_100000 = 0x00000400,
SETTING_READ_COUNT_1000000 = 0x00000800,
SETTING_READ_COUNT_10000000 = 0x00001000
};
// バックアップメモリ
enum CardBackupMemType {
SETTING_BACKUP_MEM_TYPE_NO,
SETTING_BACKUP_MEM_TYPE_64K_EEP,
SETTING_BACKUP_MEM_TYPE_1M_FLASH,
SETTING_BACKUP_MEM_TYPE_4M_FLASH
};
SETTING_BACKUP_MEM_TYPE_NO = 0x00002000,
SETTING_BACKUP_MEM_TYPE_64K_EEP = 0x00004000,
SETTING_BACKUP_MEM_TYPE_1M_FLASH = 0x00008000,
SETTING_BACKUP_MEM_TYPE_4M_FLASH = 0x00010000
};
// ライトデータ
enum CardWriteData {
SETTING_WRITE_DATA_0000,
SETTING_WRITE_DATA_55AA,
SETTING_WRITE_DATA_00FF,
SETTING_WRITE_DATA_FFFF,
SETTING_WRITE_DATA_DEC,
SETTING_WRITE_DATA_INC,
SETTING_WRITE_DATA_REPEAT
SETTING_WRITE_DATA_0000 = 0x00020000,
SETTING_WRITE_DATA_55AA = 0x00040000,
SETTING_WRITE_DATA_00FF = 0x00080000,
SETTING_WRITE_DATA_FFFF = 0x00100000,
SETTING_WRITE_DATA_DEC = 0x00200000,
SETTING_WRITE_DATA_INC = 0x00400000,
SETTING_WRITE_DATA_REPEAT = 0x00800000
};
} /* nakayama */
} /* red */
} /* nn */

View File

@ -22,7 +22,8 @@ namespace red{
namespace nakayama{
settingInfo CardTestProgram::setting;
detailInfo CardTestProgram::detail;
/*!--------------------------------------------------------------------------*

View File

@ -1480,15 +1480,13 @@ public:
class CardTestProgram : public Program{
public:
settingInfo setting;
detailInfo detail;
static settingInfo setting;
static detailInfo detail;
CardType card_type;
bool verify_result;
void* card_test_buffer;
};
//settingInfo CardTestProgram::setting;
//detailInfo CardTestProgram::detail;
/*!--------------------------------------------------------------------------*