[ADDITIVE] Update memory map and address space interface bindings in …

…editors to support new std.

IPXACTmodels/Component/BusInterface.cpp

@@ -723,7 +723,8 @@ QString BusInterface::getMemoryMapRef() const
 //-----------------------------------------------------------------------------
 QString BusInterface::getAddressSpaceRef() const
 {
-	if (interfaceMode_ == General::MASTER || interfaceMode_ == General::MIRRORED_MASTER)
+	if (interfaceMode_ == General::MASTER || interfaceMode_ == General::MIRRORED_MASTER ||
+        interfaceMode_ == General::INITIATOR || interfaceMode_ == General::MIRRORED_INITIATOR)
     {
         if (!initiator_)
         {

IPXACTmodels/Component/Component.cpp

@@ -1214,7 +1214,7 @@ QStringList Component::getTargetInterfaces( const QString& memoryMap ) const
 
     for (const QSharedPointer<BusInterface> busif : *busInterfaces_)
     {
-        if (busif->getInterfaceMode() == General::SLAVE && busif->getMemoryMapRef() == memoryMap)
+        if ((busif->getInterfaceMode() == interfaceModeName) && busif->getMemoryMapRef() == memoryMap)
         {
             names.append(busif->name());
         }
@@ -1226,13 +1226,19 @@ QStringList Component::getTargetInterfaces( const QString& memoryMap ) const
 //-----------------------------------------------------------------------------
 // Function: Component::getMasterInterfaces()
 //-----------------------------------------------------------------------------
-QStringList Component::getMasterInterfaces( const QString& addressSpace ) const
+QStringList Component::getInitiatorInterfaces( const QString& addressSpace ) const
 {
     QStringList names;
 
+    General::InterfaceMode initiatorModeName = getRevision() == Document::Revision::Std22
+        ? General::INITIATOR : General::MASTER;
+
+    General::InterfaceMode mirroredInitiatorModeName = getRevision() == Document::Revision::Std22
+        ? General::MIRRORED_INITIATOR : General::MIRRORED_MASTER;
+
     for (const QSharedPointer<BusInterface> busif : *busInterfaces_)
     {
-        if ((busif->getInterfaceMode() == General::MASTER || busif->getInterfaceMode() == General::MIRRORED_MASTER)
+        if ((busif->getInterfaceMode() == initiatorModeName || busif->getInterfaceMode() == mirroredInitiatorModeName)
             && (busif->getAddressSpaceRef() == addressSpace))
         {
             names.append(busif->name());
@@ -1245,12 +1251,19 @@ QStringList Component::getMasterInterfaces( const QString& addressSpace ) const
 //-----------------------------------------------------------------------------
 // Function: Component::getMasterInterfaces()
 //-----------------------------------------------------------------------------
-QStringList Component::getMasterInterfaces() const
+QStringList Component::getInitiatorInterfaces() const
 {
     QStringList names;
+
+    General::InterfaceMode initiatorModeName = getRevision() == Document::Revision::Std22
+        ? General::INITIATOR : General::MASTER;
+
+    General::InterfaceMode mirroredInitiatorModeName = getRevision() == Document::Revision::Std22
+        ? General::MIRRORED_INITIATOR : General::MIRRORED_MASTER;
+
     for (QSharedPointer<const BusInterface> busif : *busInterfaces_)
     {
-        if (busif->getInterfaceMode() == General::MASTER || busif->getInterfaceMode() == General::MIRRORED_MASTER)
+        if (busif->getInterfaceMode() == initiatorModeName || busif->getInterfaceMode() == mirroredInitiatorModeName)
         {
             names.append(busif->name());
         }

IPXACTmodels/Component/Component.h

@@ -765,14 +765,14 @@ class IPXACTMODELS_EXPORT Component: public Document
 	 *
 	 *      @return QStringList containing names of the master and mirrored master interfaces.
 	 */
-	QStringList getMasterInterfaces(const QString& addressSpace) const;
+	QStringList getInitiatorInterfaces(const QString& addressSpace) const;
 
 	/*!
      *  Get list of the master and mirrored master interface names.
 	 *
 	 *      @return QStringList containing the interface names.
 	 */
-	QStringList getMasterInterfaces() const;
+	QStringList getInitiatorInterfaces() const;
 
 	/*!
      *  Checks if the component contains bus interfaces.

Plugins/MemoryMapHeaderGenerator/globalheadersavemodel.cpp

@@ -281,7 +281,7 @@ void GlobalHeaderSaveModel::setDesign( QSharedPointer<Component> topComp, QShare
 		}
 
 		// create header for each master interface
-		QStringList masterInterfaces = comp->getMasterInterfaces();
+		QStringList masterInterfaces = comp->getInitiatorInterfaces();
 		foreach (QString interfaceName, masterInterfaces)
         {
 			// if the operated interface is not connected to any other instance within the design

editors/ComponentEditor/addressSpaces/addressspaceeditor.cpp

@@ -32,7 +32,7 @@ AddressSpaceEditor::AddressSpaceEditor(QSharedPointer<Component> component, Libr
 ItemEditor(component, handler, parent),
 addrSpace_(addrSpace),
 nameEditor_(addrSpace, component->getRevision(), this),
-generalEditor_(addrSpace, component->getMasterInterfaces(addrSpace_->name()), parameterFinder, expressionParser,
+generalEditor_(addrSpace, component->getInitiatorInterfaces(addrSpace_->name()), parameterFinder, expressionParser,
     component->getRevision(), this),
 segmentsEditor_(addrSpace, component, handler->getDirectoryPath(component->getVlnv()), parameterFinder,
     expressionParser, expressionFormatter, this),
@@ -103,7 +103,7 @@ localMemMapEditor_(addrSpace, component, handler, parameterFinder, blockInterfac
 //-----------------------------------------------------------------------------
 void AddressSpaceEditor::refresh()
 {
-    QStringList masterInterfaceList = component()->getMasterInterfaces(addrSpace_->name());
+    QStringList masterInterfaceList = component()->getInitiatorInterfaces(addrSpace_->name());
 
     // Block signals from here for the duration of refreshing editors.
     blockSignals(true);

editors/ComponentEditor/addressSpaces/addressspacegeneraleditor.cpp

@@ -79,15 +79,16 @@ masterInterfaceBindingLabel_(new QLabel(this))
 	layout->addRow(tr("Range (=size) [AUB], f(x):"), rangeEditor_);
     layout->addRow(tr("Width [bits], f(x):"), widthEditor_);
 
-    if (docRevision != Document::Revision::Std22)
+    if (docRevision == Document::Revision::Std22)
     {
-        layout->addRow(tr("Is present, f(x):"), isPresentEditor_);
+        layout->addRow(tr("Initiator interface binding(s):"), masterInterfaceBindingLabel_);
+        isPresentEditor_->setVisible(false);
     }
     else
     {
-        isPresentEditor_->setVisible(false);
+        layout->addRow(tr("Is present, f(x):"), isPresentEditor_);
+        layout->addRow(tr("Master interface binding(s):"), masterInterfaceBindingLabel_);
     }
-    layout->addRow(tr("Master interface binding(s):"), masterInterfaceBindingLabel_);
 
 	refresh(busInterfaceNames);
 

editors/ComponentEditor/addressSpaces/addressspacesmodel.cpp

@@ -132,6 +132,10 @@ QVariant AddressSpacesModel::headerData( int section, Qt::Orientation orientatio
         }
         else if (section == AddressSpaceColumns::INTERFACE_BINDING)
         {
+            if (component_->getRevision() == Document::Revision::Std22)
+            {
+                return tr("Initiator interface\nbinding(s)");
+            }
             return tr("Master interface\nbinding(s)");
         }
         else if (section == AddressSpaceColumns::DESCRIPTION)
@@ -183,7 +187,7 @@ QVariant AddressSpacesModel::data(QModelIndex const& index, int role) const
     }
 	else if (Qt::UserRole == role)
     {
-		return component_->getMasterInterfaces(addressSpaces_->at(index.row())->name());
+		return component_->getInitiatorInterfaces(addressSpaces_->at(index.row())->name());
 	}
 	else if (Qt::ForegroundRole == role)
     {
@@ -358,9 +362,9 @@ QVariant AddressSpacesModel::expressionOrValueForIndex(QModelIndex const& index)
     }
     else if (index.column() == AddressSpaceColumns::INTERFACE_BINDING)
     {
-        QStringList interfaceNames = component_->getMasterInterfaces(addressSpaces_->at(index.row())->name());
+        QStringList interfaceNames = component_->getInitiatorInterfaces(addressSpaces_->at(index.row())->name());
 
-        // if no interface refers to the memory map
+        // if no interface refers to the address space
         if (interfaceNames.isEmpty())
         {
             return tr("No binding");

editors/ComponentEditor/memoryMaps/memorymapsmodel.cpp

@@ -142,6 +142,10 @@ QVariant MemoryMapsModel::headerData(int section, Qt::Orientation orientation, i
         }
         else if (section == MemoryMapsColumns::INTERFACE_COLUMN)
         {
+            if (docRevision_ == Document::Revision::Std22)
+            {
+                return tr("Target interface\nbinding");
+            }
             return tr("Slave interface\nbinding");
         }
         else if (section == MemoryMapsColumns::IS_PRESENT)

version.h

@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL           3.12.1013.0
+#define VERSION_FULL           3.12.1016.0
 
 #define VERSION_BASEYEAR       0
-#define VERSION_DATE           "2023-11-17"
-#define VERSION_TIME           "15:26:18"
+#define VERSION_DATE           "2023-11-20"
+#define VERSION_TIME           "10:05:57"
 
 #define VERSION_MAJOR          3
 #define VERSION_MINOR          12
-#define VERSION_BUILDNO        1013
+#define VERSION_BUILDNO        1016
 #define VERSION_EXTEND         0
 
-#define VERSION_FILE           3,12,1013,0
-#define VERSION_PRODUCT        3,12,1013,0
-#define VERSION_FILESTR        "3,12,1013,0"
-#define VERSION_PRODUCTSTR     "3,12,1013,0"
+#define VERSION_FILE           3,12,1016,0
+#define VERSION_PRODUCT        3,12,1016,0
+#define VERSION_FILESTR        "3,12,1016,0"
+#define VERSION_PRODUCTSTR     "3,12,1016,0"
 
 #endif