aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp')
-rw-r--r--src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp115
1 files changed, 79 insertions, 36 deletions
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
index aaad906214..8d0e610fb3 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
@@ -67,8 +67,26 @@ static QString extractPackVersion(const QString &packFilePath)
static QStringList findKeilPackFiles(const QString &path)
{
QStringList files;
- // Search for the STMicroelectronics devices.
- QDirIterator it(path, {"STM*_DFP"}, QDir::Dirs);
+ // Search for STMicroelectronics and NXP S32 devices.
+ QDirIterator it(path, {"STM*_DFP", "S32*_DFP"}, QDir::Dirs);
+ while (it.hasNext()) {
+ const QDir dfpDir(it.next());
+ const QFileInfoList entries = dfpDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot,
+ QDir::Name);
+ if (entries.isEmpty())
+ continue;
+ QDirIterator fit(entries.last().absoluteFilePath(), {"*.pdsc"},
+ QDir::Files | QDir::NoSymLinks);
+ while (fit.hasNext())
+ files.push_back(fit.next());
+ }
+ return files;
+}
+
+static QStringList findNordicSemiconductorPackFiles(const QString &path)
+{
+ QStringList files;
+ QDirIterator it(path, {"*_DeviceFamilyPack"}, QDir::Dirs);
while (it.hasNext()) {
const QDir dfpDir(it.next());
const QFileInfoList entries = dfpDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot,
@@ -115,8 +133,10 @@ static void fillAlgorithms(QXmlStreamReader &in, DeviceSelection::Algorithms &al
in.skipCurrentElement();
DeviceSelection::Algorithm algorithm;
algorithm.path = attrs.value("name").toString();
- algorithm.start = attrs.value("start").toString();
- algorithm.size = attrs.value("size").toString();
+ algorithm.flashStart = attrs.value("start").toString();
+ algorithm.flashSize = attrs.value("size").toString();
+ algorithm.ramStart = attrs.value("RAMstart").toString();
+ algorithm.ramSize = attrs.value("RAMsize").toString();
algorithms.push_back(algorithm);
}
@@ -147,9 +167,10 @@ static void fillSvd(QXmlStreamReader &in, QString &svd)
class DeviceSelectionItem final : public TreeItem
{
public:
+ enum Type { Root, Package, Family, SubFamily, Device, DeviceVariant };
enum Column { NameColumn, VersionColumn, VendorNameColumn };
- explicit DeviceSelectionItem()
- {}
+ explicit DeviceSelectionItem(const Type &type = Root)
+ : type(type) {}
QVariant data(int column, int role) const final
{
@@ -170,6 +191,7 @@ public:
return hasChildren() ? Qt::ItemIsEnabled : (Qt::ItemIsEnabled | Qt::ItemIsSelectable);
}
+ const Type type;
QString desc;
QString fullPath;
QString name;
@@ -204,11 +226,13 @@ void DeviceSelectionModel::fillAllPacks(const FilePath &toolsIniFile)
return;
QStringList allPackFiles;
- QDirIterator it(packsPath, {"Keil"}, QDir::Dirs | QDir::NoDotAndDotDot);
+ QDirIterator it(packsPath, {"Keil", "NordicSemiconductor"}, QDir::Dirs | QDir::NoDotAndDotDot);
while (it.hasNext()) {
const QString path = it.next();
if (path.endsWith("/Keil"))
allPackFiles << findKeilPackFiles(path);
+ else if (path.endsWith("/NordicSemiconductor"))
+ allPackFiles << findNordicSemiconductorPackFiles(path);
}
if (allPackFiles.isEmpty())
@@ -235,7 +259,7 @@ void DeviceSelectionModel::parsePackage(const QString &packageFile)
void DeviceSelectionModel::parsePackage(QXmlStreamReader &in, const QString &packageFile)
{
// Create and fill the 'package' item.
- const auto child = new DeviceSelectionItem;
+ const auto child = new DeviceSelectionItem(DeviceSelectionItem::Package);
rootItem()->appendChild(child);
child->fullPath = packageFile;
child->version = extractPackVersion(packageFile);
@@ -266,7 +290,7 @@ void DeviceSelectionModel::parsePackage(QXmlStreamReader &in, const QString &pac
void DeviceSelectionModel::parseFamily(QXmlStreamReader &in, DeviceSelectionItem *parent)
{
// Create and fill the 'family' item.
- const auto child = new DeviceSelectionItem;
+ const auto child = new DeviceSelectionItem(DeviceSelectionItem::Family);
parent->appendChild(child);
const QXmlStreamAttributes attrs = in.attributes();
child->name = attrs.value("Dfamily").toString();
@@ -275,6 +299,8 @@ void DeviceSelectionModel::parseFamily(QXmlStreamReader &in, DeviceSelectionItem
const QStringRef elementName = in.name();
if (elementName == "processor") {
fillCpu(in, child->cpu);
+ } else if (elementName == "algorithm") {
+ fillAlgorithms(in, child->algorithms);
} else if (elementName == "memory") {
fillMemories(in, child->memories);
} else if (elementName == "description") {
@@ -292,7 +318,7 @@ void DeviceSelectionModel::parseFamily(QXmlStreamReader &in, DeviceSelectionItem
void DeviceSelectionModel::parseSubFamily(QXmlStreamReader &in, DeviceSelectionItem *parent)
{
// Create and fill the 'sub-family' item.
- const auto child = new DeviceSelectionItem;
+ const auto child = new DeviceSelectionItem(DeviceSelectionItem::SubFamily);
parent->appendChild(child);
const QXmlStreamAttributes attrs = in.attributes();
child->name = attrs.value("DsubFamily").toString();
@@ -313,7 +339,7 @@ void DeviceSelectionModel::parseSubFamily(QXmlStreamReader &in, DeviceSelectionI
void DeviceSelectionModel::parseDevice(QXmlStreamReader &in, DeviceSelectionItem *parent)
{
// Create and fill the 'device' item.
- const auto child = new DeviceSelectionItem;
+ const auto child = new DeviceSelectionItem(DeviceSelectionItem::Device);
parent->appendChild(child);
const QXmlStreamAttributes attrs = in.attributes();
child->name = attrs.value("Dname").toString();
@@ -321,6 +347,10 @@ void DeviceSelectionModel::parseDevice(QXmlStreamReader &in, DeviceSelectionItem
const QStringRef elementName = in.name();
if (elementName == "processor") {
fillCpu(in, child->cpu);
+ } else if (elementName == "debug") {
+ fillSvd(in, child->svd);
+ } else if (elementName == "description") {
+ fillElementProperty(in, child->desc);
} else if (elementName == "memory") {
fillMemories(in, child->memories);
} else if (elementName == "algorithm") {
@@ -336,7 +366,7 @@ void DeviceSelectionModel::parseDevice(QXmlStreamReader &in, DeviceSelectionItem
void DeviceSelectionModel::parseDeviceVariant(QXmlStreamReader &in, DeviceSelectionItem *parent)
{
// Create and fill the 'device-variant' item.
- const auto child = new DeviceSelectionItem;
+ const auto child = new DeviceSelectionItem(DeviceSelectionItem::DeviceVariant);
parent->appendChild(child);
const QXmlStreamAttributes attrs = in.attributes();
child->name = attrs.value("Dvariant").toString();
@@ -391,31 +421,15 @@ DeviceSelection DeviceSelectionView::buildSelection(const DeviceSelectionItem *i
DeviceSelection::Memories &mems = selection.memories;
DeviceSelection::Package &pkg = selection.package;
- do {
+ auto extractBaseProps = [&selection, &algs, &cpu, &mems](const DeviceSelectionItem *item) {
if (selection.name.isEmpty())
selection.name = item->name;
- else if (selection.subfamily.isEmpty())
- selection.subfamily = item->name;
- else if (selection.family.isEmpty())
- selection.family = item->name;
- else if (pkg.name.isEmpty())
- pkg.name = item->name;
-
if (selection.desc.isEmpty())
selection.desc = item->desc;
- else if (pkg.desc.isEmpty())
- pkg.desc = item->desc;
-
if (selection.vendorId.isEmpty())
selection.vendorId = item->vendorId;
- else if (pkg.vendorId.isEmpty())
- pkg.vendorId = item->vendorId;
-
if (selection.vendorName.isEmpty())
selection.vendorName = item->vendorName;
- else if (pkg.vendorName.isEmpty())
- pkg.vendorName = item->vendorName;
-
if (selection.svd.isEmpty())
selection.svd = item->svd;
@@ -428,13 +442,6 @@ DeviceSelection DeviceSelectionView::buildSelection(const DeviceSelectionItem *i
if (cpu.mpu.isEmpty())
cpu.mpu = item->cpu.mpu;
- if (pkg.file.isEmpty())
- pkg.file = item->fullPath;
- if (pkg.url.isEmpty())
- pkg.url = item->url;
- if (pkg.version.isEmpty())
- pkg.version = item->version;
-
// Add only new flash algorithms.
for (const DeviceSelection::Algorithm &newAlg : item->algorithms) {
const bool contains = Utils::contains(algs, [&newAlg](const DeviceSelection::Algorithm &existAlg) {
@@ -452,8 +459,44 @@ DeviceSelection DeviceSelectionView::buildSelection(const DeviceSelectionItem *i
if (!contains)
mems.push_back(newMem);
}
+ };
+
+ auto extractPackageProps = [&pkg](const DeviceSelectionItem *item) {
+ pkg.desc = item->desc;
+ pkg.file = item->fullPath;
+ pkg.name = item->name;
+ pkg.url = item->url;
+ pkg.vendorId = item->vendorId;
+ pkg.vendorName = item->vendorName;
+ pkg.version = item->version;
+ };
+ do {
+ if (item->type == DeviceSelectionItem::DeviceVariant
+ || item->type == DeviceSelectionItem::Device) {
+ extractBaseProps(item);
+ } else if (item->type == DeviceSelectionItem::SubFamily) {
+ extractBaseProps(item);
+ if (selection.subfamily.isEmpty())
+ selection.subfamily = item->name;
+ } else if (item->type == DeviceSelectionItem::Family) {
+ extractBaseProps(item);
+ if (selection.family.isEmpty())
+ selection.family = item->name;
+ } else if (item->type == DeviceSelectionItem::Package) {
+ extractPackageProps(item);
+ }
} while ((item->level() > 1) && (item = static_cast<const DeviceSelectionItem *>(item->parent())));
+
+ // Fix relative SVD file sub-path to make it as an absolute file path.
+ if (!selection.svd.isEmpty()) {
+ const QFileInfo fi(selection.svd);
+ if (!fi.isAbsolute()) {
+ const QDir dir(QFileInfo(selection.package.file).path());
+ selection.svd = QFileInfo(dir, fi.filePath()).absoluteFilePath();
+ }
+ }
+
return selection;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 04:27:53 +0000