From 142ce48771206a362988f1745a33b9ada74f66dd Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Thu, 22 Aug 2013 17:50:59 +0200 Subject: regtools: fix several bugs in qeditor Change-Id: I1bef76d30eb47c4ebc8a2baca356d9c135b234ae --- utils/regtools/qeditor/std_analysers.cpp | 9 ++++++--- utils/regtools/qeditor/std_analysers.h | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'utils/regtools/qeditor') 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 EmiAnalyser::EmiAnalyser(const soc_t& soc, IoBackend *backend) :Analyser(soc, backend) { + m_display_mode = DisplayCycles; m_group = new QGroupBox("EMI Analyser"); QVBoxLayout *layout = new QVBoxLayout; m_group->setLayout(layout); @@ -347,6 +348,8 @@ bool EmiAnalyser::SupportSoc(const QString& soc_name) void EmiAnalyser::OnChangeDisplayMode(int index) { + if(index == -1) + return; m_display_mode = (DisplayMode)m_display_selector->itemData(index).toInt(); int idx = m_panel->currentIndex(); FillTable(); @@ -492,11 +495,11 @@ void EmiAnalyser::FillTable() if(helper.ReadRegisterField("DRAM", "CTL10", "ADDR_PINS", value)) AddLine("Address Pins", 13 - value, ""); - if(helper.ReadRegisterField("DRAM", "CTL11", "ADDR_PINS", value)) + if(helper.ReadRegisterField("DRAM", "CTL11", "COLUMN_SIZE", value)) AddLine("Column Size", 12 - value, "-bit"); - if(helper.ReadRegisterField("DRAM", "CTL11", "ADDR_PINS", value)) - AddLine("Encoded CAS", value, "Memory device dependent"); + if(helper.ReadRegisterField("DRAM", "CTL11", "CASLAT", value)) + AddLine("Encoded CAS", value, "", "Memory device dependent"); if(helper.ReadRegisterField("DRAM", "CTL14", "CS_MAP", value)) { 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 @@ #include #include #include "analyser.h" -#include "collapsiblepanel.h" /** * Clock analyser -- cgit v1.2.3