From a09a62bc4a03ca1c673a254d1fa4d6cb576e83c8 Mon Sep 17 00:00:00 2001 From: "D. Shah" Date: Wed, 3 Feb 2021 10:21:45 +0000 Subject: ice40: Use snake case for arch-specific functions This makes the difference clearer between the general arch API that everyone must implement; and helper functions specific to one arch. Signed-off-by: D. Shah --- gui/ice40/mainwindow.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gui') diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index f251fd28..c715fd51 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -77,29 +77,29 @@ void MainWindow::createMenu() void MainWindow::new_proj() { QMap arch; - if (Arch::isAvailable(ArchArgs::LP384)) + if (Arch::is_available(ArchArgs::LP384)) arch.insert("Lattice iCE40LP384", ArchArgs::LP384); - if (Arch::isAvailable(ArchArgs::LP1K)) + if (Arch::is_available(ArchArgs::LP1K)) arch.insert("Lattice iCE40LP1K", ArchArgs::LP1K); - if (Arch::isAvailable(ArchArgs::HX1K)) + if (Arch::is_available(ArchArgs::HX1K)) arch.insert("Lattice iCE40HX1K", ArchArgs::HX1K); - if (Arch::isAvailable(ArchArgs::U1K)) + if (Arch::is_available(ArchArgs::U1K)) arch.insert("Lattice iCE5LP1K", ArchArgs::U1K); - if (Arch::isAvailable(ArchArgs::U2K)) + if (Arch::is_available(ArchArgs::U2K)) arch.insert("Lattice iCE5LP2K", ArchArgs::U2K); - if (Arch::isAvailable(ArchArgs::U4K)) + if (Arch::is_available(ArchArgs::U4K)) arch.insert("Lattice iCE5LP4K", ArchArgs::U4K); - if (Arch::isAvailable(ArchArgs::UP3K)) + if (Arch::is_available(ArchArgs::UP3K)) arch.insert("Lattice iCE40UP3K", ArchArgs::UP3K); - if (Arch::isAvailable(ArchArgs::UP5K)) + if (Arch::is_available(ArchArgs::UP5K)) arch.insert("Lattice iCE40UP5K", ArchArgs::UP5K); - if (Arch::isAvailable(ArchArgs::LP4K)) + if (Arch::is_available(ArchArgs::LP4K)) arch.insert("Lattice iCE40LP4K", ArchArgs::LP4K); - if (Arch::isAvailable(ArchArgs::LP8K)) + if (Arch::is_available(ArchArgs::LP8K)) arch.insert("Lattice iCE40LP8K", ArchArgs::LP8K); - if (Arch::isAvailable(ArchArgs::HX4K)) + if (Arch::is_available(ArchArgs::HX4K)) arch.insert("Lattice iCE40HX4K", ArchArgs::HX4K); - if (Arch::isAvailable(ArchArgs::HX8K)) + if (Arch::is_available(ArchArgs::HX8K)) arch.insert("Lattice iCE40HX8K", ArchArgs::HX8K); bool ok; @@ -109,7 +109,7 @@ void MainWindow::new_proj() chipArgs.type = (ArchArgs::ArchArgsTypes)arch.value(item); QStringList packages; - for (auto package : Arch::getSupportedPackages(chipArgs.type)) + for (auto package : Arch::get_supported_packages(chipArgs.type)) packages.append(QLatin1String(package.data(), package.size())); QString package = QInputDialog::getItem(this, "Select package", "Package:", packages, 0, false, &ok); -- cgit v1.2.3 From f05d024666ba4ece6d37d49d7168f47c3ae2b51f Mon Sep 17 00:00:00 2001 From: "D. Shah" Date: Wed, 3 Feb 2021 10:33:06 +0000 Subject: ecp5: Use snake case for arch-specific functions This makes the difference clearer between the general arch API that everyone must implement; and helper functions specific to one arch. Signed-off-by: D. Shah --- gui/ecp5/mainwindow.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gui') diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc index 782cfb65..31afd936 100644 --- a/gui/ecp5/mainwindow.cc +++ b/gui/ecp5/mainwindow.cc @@ -79,23 +79,23 @@ void MainWindow::createMenu() void MainWindow::new_proj() { QMap arch; - if (Arch::isAvailable(ArchArgs::LFE5U_25F)) + if (Arch::is_available(ArchArgs::LFE5U_25F)) arch.insert("Lattice ECP5 LFE5U-25F", ArchArgs::LFE5U_25F); - if (Arch::isAvailable(ArchArgs::LFE5U_45F)) + if (Arch::is_available(ArchArgs::LFE5U_45F)) arch.insert("Lattice ECP5 LFE5U-45F", ArchArgs::LFE5U_45F); - if (Arch::isAvailable(ArchArgs::LFE5U_85F)) + if (Arch::is_available(ArchArgs::LFE5U_85F)) arch.insert("Lattice ECP5 LFE5U-85F", ArchArgs::LFE5U_85F); - if (Arch::isAvailable(ArchArgs::LFE5UM_25F)) + if (Arch::is_available(ArchArgs::LFE5UM_25F)) arch.insert("Lattice ECP5 LFE5UM-25F", ArchArgs::LFE5UM_25F); - if (Arch::isAvailable(ArchArgs::LFE5UM_45F)) + if (Arch::is_available(ArchArgs::LFE5UM_45F)) arch.insert("Lattice ECP5 LFE5UM-45F", ArchArgs::LFE5UM_45F); - if (Arch::isAvailable(ArchArgs::LFE5UM_85F)) + if (Arch::is_available(ArchArgs::LFE5UM_85F)) arch.insert("Lattice ECP5 LFE5UM-85F", ArchArgs::LFE5UM_85F); - if (Arch::isAvailable(ArchArgs::LFE5UM5G_25F)) + if (Arch::is_available(ArchArgs::LFE5UM5G_25F)) arch.insert("Lattice ECP5 LFE5UM5G-25F", ArchArgs::LFE5UM5G_25F); - if (Arch::isAvailable(ArchArgs::LFE5UM5G_45F)) + if (Arch::is_available(ArchArgs::LFE5UM5G_45F)) arch.insert("Lattice ECP5 LFE5UM5G-45F", ArchArgs::LFE5UM5G_45F); - if (Arch::isAvailable(ArchArgs::LFE5UM5G_85F)) + if (Arch::is_available(ArchArgs::LFE5UM5G_85F)) arch.insert("Lattice ECP5 LFE5UM5G-85F", ArchArgs::LFE5UM5G_85F); bool ok; @@ -105,7 +105,7 @@ void MainWindow::new_proj() chipArgs.type = (ArchArgs::ArchArgsTypes)arch.value(item); QStringList packages; - for (auto package : Arch::getSupportedPackages(chipArgs.type)) + for (auto package : Arch::get_supported_packages(chipArgs.type)) packages.append(QLatin1String(package.data(), package.size())); QString package = QInputDialog::getItem(this, "Select package", "Package:", packages, 0, false, &ok); @@ -127,7 +127,7 @@ void MainWindow::open_lpf() QString fileName = QFileDialog::getOpenFileName(this, QString("Open LPF"), QString(), QString("*.lpf")); if (!fileName.isEmpty()) { std::ifstream in(fileName.toStdString()); - if (ctx->applyLPF(fileName.toStdString(), in)) { + if (ctx->apply_lpf(fileName.toStdString(), in)) { log("Loading LPF successful.\n"); actionPack->setEnabled(true); actionLoadLPF->setEnabled(false); -- cgit v1.2.3