From b8c2109f2ef6c096786abb56f5db8902dae60ab6 Mon Sep 17 00:00:00 2001 From: Toshifumi NISHINAGA Date: Thu, 22 Sep 2022 03:15:46 +0900 Subject: [PATCH] simplify BrainGen enum types --- BrainLILODrv.cpp | 40 ++++++---------------------------------- models.h | 9 +-------- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/BrainLILODrv.cpp b/BrainLILODrv.cpp index 6a71560..9d57955 100644 --- a/BrainLILODrv.cpp +++ b/BrainLILODrv.cpp @@ -198,48 +198,20 @@ static void SetAddress(BrainGen gen) static BrainGen SelectGen(std::wstring model) { - BrainGen brain_gen = UnknownGen; + BrainGen brainGen = UnknownGen; if (model == L"gen1.bin") { - brain_gen = Gen1; + brainGen = Gen1; } - else if (model == L"gen2.bin") + else if (model == L"u-boot.bin") { - brain_gen = Gen2; - } - else if (model == L"gen3_1.bin") - { - brain_gen = Gen3_1; - } - else if (model == L"gen3_2.bin") - { - brain_gen = Gen3_2; - } - else if (model == L"gen3_3.bin") - { - brain_gen = Gen3_3; - } - else if (model == L"gen3_4.bin") - { - brain_gen = Gen3_4; - } - else if (model == L"gen3_5.bin") - { - brain_gen = Gen3_5; - } - else if (model == L"gen3_6.bin") - { - brain_gen = Gen3_6; - } - else if (model == L"gen3_7.bin") - { - brain_gen = Gen3_7; + brainGen = UnknownGen; } else { - brain_gen = UnknownGen; + brainGen = Gen2Or3; } - return brain_gen; + return brainGen; } static bool doLinux() diff --git a/models.h b/models.h index 45f6277..07d6b8d 100644 --- a/models.h +++ b/models.h @@ -77,12 +77,5 @@ typedef enum { UnknownGen, Gen1, - Gen2, - Gen3_1, - Gen3_2, - Gen3_3, - Gen3_4, - Gen3_5, - Gen3_6, - Gen3_7, + Gen2Or3 } BrainGen; \ No newline at end of file