diff options
-rw-r--r-- | utils/regtools/qeditor/std_analysers.cpp | 9 | ||||
-rw-r--r-- | utils/regtools/qeditor/std_analysers.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/utils/regtools/qeditor/std_analysers.cpp b/utils/regtools/qeditor/std_analysers.cpp index 49df671146..814ef309f4 100644 --- a/utils/regtools/qeditor/std_analysers.cpp +++ b/utils/regtools/qeditor/std_analysers.cpp | |||
@@ -303,6 +303,7 @@ static TmplAnalyserFactory< ClockAnalyser > g_clock_factory(true, "Clock Analyse | |||
303 | EmiAnalyser::EmiAnalyser(const soc_t& soc, IoBackend *backend) | 303 | EmiAnalyser::EmiAnalyser(const soc_t& soc, IoBackend *backend) |
304 | :Analyser(soc, backend) | 304 | :Analyser(soc, backend) |
305 | { | 305 | { |
306 | m_display_mode = DisplayCycles; | ||
306 | m_group = new QGroupBox("EMI Analyser"); | 307 | m_group = new QGroupBox("EMI Analyser"); |
307 | QVBoxLayout *layout = new QVBoxLayout; | 308 | QVBoxLayout *layout = new QVBoxLayout; |
308 | m_group->setLayout(layout); | 309 | m_group->setLayout(layout); |
@@ -347,6 +348,8 @@ bool EmiAnalyser::SupportSoc(const QString& soc_name) | |||
347 | 348 | ||
348 | void EmiAnalyser::OnChangeDisplayMode(int index) | 349 | void EmiAnalyser::OnChangeDisplayMode(int index) |
349 | { | 350 | { |
351 | if(index == -1) | ||
352 | return; | ||
350 | m_display_mode = (DisplayMode)m_display_selector->itemData(index).toInt(); | 353 | m_display_mode = (DisplayMode)m_display_selector->itemData(index).toInt(); |
351 | int idx = m_panel->currentIndex(); | 354 | int idx = m_panel->currentIndex(); |
352 | FillTable(); | 355 | FillTable(); |
@@ -492,11 +495,11 @@ void EmiAnalyser::FillTable() | |||
492 | if(helper.ReadRegisterField("DRAM", "CTL10", "ADDR_PINS", value)) | 495 | if(helper.ReadRegisterField("DRAM", "CTL10", "ADDR_PINS", value)) |
493 | AddLine("Address Pins", 13 - value, ""); | 496 | AddLine("Address Pins", 13 - value, ""); |
494 | 497 | ||
495 | if(helper.ReadRegisterField("DRAM", "CTL11", "ADDR_PINS", value)) | 498 | if(helper.ReadRegisterField("DRAM", "CTL11", "COLUMN_SIZE", value)) |
496 | AddLine("Column Size", 12 - value, "-bit"); | 499 | AddLine("Column Size", 12 - value, "-bit"); |
497 | 500 | ||
498 | if(helper.ReadRegisterField("DRAM", "CTL11", "ADDR_PINS", value)) | 501 | if(helper.ReadRegisterField("DRAM", "CTL11", "CASLAT", value)) |
499 | AddLine("Encoded CAS", value, "Memory device dependent"); | 502 | AddLine("Encoded CAS", value, "", "Memory device dependent"); |
500 | 503 | ||
501 | if(helper.ReadRegisterField("DRAM", "CTL14", "CS_MAP", value)) | 504 | if(helper.ReadRegisterField("DRAM", "CTL14", "CS_MAP", value)) |
502 | { | 505 | { |
diff --git a/utils/regtools/qeditor/std_analysers.h b/utils/regtools/qeditor/std_analysers.h index 98c5fa0f98..20bc07da24 100644 --- a/utils/regtools/qeditor/std_analysers.h +++ b/utils/regtools/qeditor/std_analysers.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <QLabel> | 14 | #include <QLabel> |
15 | #include <QLineEdit> | 15 | #include <QLineEdit> |
16 | #include "analyser.h" | 16 | #include "analyser.h" |
17 | #include "collapsiblepanel.h" | ||
18 | 17 | ||
19 | /** | 18 | /** |
20 | * Clock analyser | 19 | * Clock analyser |