diff options
Diffstat (limited to 'utils/regtools')
-rw-r--r-- | utils/regtools/qeditor/regtab.cpp | 2 | ||||
-rw-r--r-- | utils/regtools/qeditor/std_analysers.cpp | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/utils/regtools/qeditor/regtab.cpp b/utils/regtools/qeditor/regtab.cpp index d535f6cdff..4f7a73cffc 100644 --- a/utils/regtools/qeditor/regtab.cpp +++ b/utils/regtools/qeditor/regtab.cpp | |||
@@ -35,6 +35,7 @@ RegTab::RegTab(Backend *backend, QTabWidget *parent) | |||
35 | m_splitter = new QSplitter(); | 35 | m_splitter = new QSplitter(); |
36 | QWidget *left = new QWidget; | 36 | QWidget *left = new QWidget; |
37 | m_splitter->addWidget(left); | 37 | m_splitter->addWidget(left); |
38 | m_splitter->setStretchFactor(0, 1); | ||
38 | QVBoxLayout *left_layout = new QVBoxLayout; | 39 | QVBoxLayout *left_layout = new QVBoxLayout; |
39 | left->setLayout(left_layout); | 40 | left->setLayout(left_layout); |
40 | 41 | ||
@@ -85,6 +86,7 @@ RegTab::RegTab(Backend *backend, QTabWidget *parent) | |||
85 | QWidget *w = new QWidget; | 86 | QWidget *w = new QWidget; |
86 | w->setLayout(m_right_panel); | 87 | w->setLayout(m_right_panel); |
87 | m_splitter->addWidget(w); | 88 | m_splitter->addWidget(w); |
89 | m_splitter->setStretchFactor(1, 2); | ||
88 | 90 | ||
89 | m_io_backend = m_backend->CreateDummyIoBackend(); | 91 | m_io_backend = m_backend->CreateDummyIoBackend(); |
90 | 92 | ||
diff --git a/utils/regtools/qeditor/std_analysers.cpp b/utils/regtools/qeditor/std_analysers.cpp index ba33d723b9..76ee070710 100644 --- a/utils/regtools/qeditor/std_analysers.cpp +++ b/utils/regtools/qeditor/std_analysers.cpp | |||
@@ -741,13 +741,14 @@ void PinAnalyser::FillList() | |||
741 | for(int bank = 0; bank < 4; bank++) | 741 | for(int bank = 0; bank < 4; bank++) |
742 | { | 742 | { |
743 | QTableWidget *table = new QTableWidget; | 743 | QTableWidget *table = new QTableWidget; |
744 | table->setColumnCount(6); | 744 | table->setColumnCount(7); |
745 | table->setHorizontalHeaderItem(0, new QTableWidgetItem("Pin")); | 745 | table->setHorizontalHeaderItem(0, new QTableWidgetItem("Pin")); |
746 | table->setHorizontalHeaderItem(1, new QTableWidgetItem("Function")); | 746 | table->setHorizontalHeaderItem(1, new QTableWidgetItem("Function")); |
747 | table->setHorizontalHeaderItem(2, new QTableWidgetItem("Drive")); | 747 | table->setHorizontalHeaderItem(2, new QTableWidgetItem("Direction")); |
748 | table->setHorizontalHeaderItem(3, new QTableWidgetItem("Voltage")); | 748 | table->setHorizontalHeaderItem(3, new QTableWidgetItem("Drive")); |
749 | table->setHorizontalHeaderItem(4, new QTableWidgetItem("Value")); | 749 | table->setHorizontalHeaderItem(4, new QTableWidgetItem("Voltage")); |
750 | table->setHorizontalHeaderItem(5, new QTableWidgetItem("Pull")); | 750 | table->setHorizontalHeaderItem(5, new QTableWidgetItem("Pull")); |
751 | table->setHorizontalHeaderItem(6, new QTableWidgetItem("Value")); | ||
751 | table->verticalHeader()->setVisible(false); | 752 | table->verticalHeader()->setVisible(false); |
752 | table->horizontalHeader()->setStretchLastSection(true); | 753 | table->horizontalHeader()->setStretchLastSection(true); |
753 | m_panel->addItem(table, QString("Bank %1").arg(bank)); | 754 | m_panel->addItem(table, QString("Bank %1").arg(bank)); |
@@ -792,24 +793,27 @@ void PinAnalyser::FillList() | |||
792 | table->setItem(row, 1, new QTableWidgetItem(QString(map[bank].pins[pin].function[fn].name))); | 793 | table->setItem(row, 1, new QTableWidgetItem(QString(map[bank].pins[pin].function[fn].name))); |
793 | table->item(row, 1)->setBackground(QBrush(color_map[map[bank].pins[pin].function[fn].group])); | 794 | table->item(row, 1)->setBackground(QBrush(color_map[map[bank].pins[pin].function[fn].group])); |
794 | table->item(row, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | 795 | table->item(row, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); |
796 | /* direction */ | ||
797 | table->setItem(row, 2, new QTableWidgetItem(fn != 3 ? "" : (oe & (1 << pin)) ? "Output" : "Input")); | ||
798 | table->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | ||
795 | /* drive */ | 799 | /* drive */ |
796 | int drv = (drive[pin / 8] >> ((pin % 8) * 4)) & 3; | 800 | int drv = (drive[pin / 8] >> ((pin % 8) * 4)) & 3; |
797 | const char *strength[4] = {"4 mA", "8 mA", "12 mA", "16 mA"}; | 801 | const char *strength[4] = {"4 mA", "8 mA", "12 mA", "16 mA"}; |
798 | table->setItem(row, 2, new QTableWidgetItem(QString(strength[drv]))); | 802 | table->setItem(row, 3, new QTableWidgetItem(QString(strength[drv]))); |
799 | table->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | 803 | table->item(row, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); |
800 | /* voltage */ | 804 | /* voltage */ |
801 | int volt = (drive[pin / 8] >> (((pin % 8) * 4) + 2)) & 1; | 805 | int volt = (drive[pin / 8] >> (((pin % 8) * 4) + 2)) & 1; |
802 | if(m_io_backend->GetSocName() == "imx233") | 806 | if(m_io_backend->GetSocName() == "imx233") |
803 | volt = 1; /* cannot change voltage on imx233 */ | 807 | volt = 1; /* cannot change voltage on imx233 */ |
804 | const char *voltage[2] = {"1.8 V", "3.3 V"}; | 808 | const char *voltage[2] = {"1.8 V", "3.3 V"}; |
805 | table->setItem(row, 3, new QTableWidgetItem(QString(voltage[volt]))); | 809 | table->setItem(row, 4, new QTableWidgetItem(QString(voltage[volt]))); |
806 | table->item(row, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | ||
807 | /* value */ | ||
808 | table->setItem(row, 4, new QTableWidgetItem(QString("%1").arg((in >> pin) & 1))); | ||
809 | table->item(row, 4)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | 810 | table->item(row, 4)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); |
810 | /* pull */ | 811 | /* pull */ |
811 | table->setItem(row, 5, new QTableWidgetItem(QString("%1").arg((pull >> pin) & 1))); | 812 | table->setItem(row, 5, new QTableWidgetItem(QString("%1").arg((pull >> pin) & 1))); |
812 | table->item(row, 5)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | 813 | table->item(row, 5)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); |
814 | /* input */ | ||
815 | table->setItem(row, 6, new QTableWidgetItem(QString("%1").arg((in >> pin) & 1))); | ||
816 | table->item(row, 6)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | ||
813 | } | 817 | } |
814 | } | 818 | } |
815 | } | 819 | } |