peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-22 01:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/profeth: add submodules for all ports, matching the GSD file

Browse Source 
These changes allow profeth to pass the Automatic RT Tester's first
behavior tests: Scenario 1-9.

 - Explorative changes to the GSD file to appease the conformance tool
 - Fix mismatch in installed submodules vs advertised ports in GSD file

Note: changes in GSD file only match the amd64 virtual build.  Must be
      updated for the final product.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-03-09 05:58:09 +01:00
parent 25db613398
commit 0f38ac54f8
2 changed files with 47 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/profeth/GSDML-V2.43-Kernelkit-Infix-Switch-20230227.xml → src/profeth/GSDML-V2.43-Kernelkit-Infix-Switch-20230308.xml
+36 -38
View File
@@ -23,7 +23,7 @@
</DeviceFunction>
<ApplicationProcess>
<DeviceAccessPointList>
<DeviceAccessPointItem ID="DAP_1" PNIO_Version="V2.43" PhysicalSlots="0" ModuleIdentNumber="0x00000001" MinDeviceInterval="32" DNS_CompatibleName="infix" FixedInSlots="0" ObjectUUID_LocalIndex="1" DeviceAccessSupported="false" MultipleWriteSupported="true" CheckDeviceID_Allowed="true" NameOfStationNotTransferable="false" LLDP_NoD_Supported="true" ResetToFactoryModes="1..2">
<DeviceAccessPointItem ID="DAP_1" PNIO_Version="V2.43" PhysicalSlots="0" ModuleIdentNumber="0x00000001" MinDeviceInterval="4096" DNS_CompatibleName="infix" FixedInSlots="0" ObjectUUID_LocalIndex="1" DeviceAccessSupported="false" MultipleWriteSupported="true" CheckDeviceID_Allowed="true" NameOfStationNotTransferable="false" LLDP_NoD_Supported="true" ResetToFactoryModes="1..2">
<ModuleInfo>
<Name TextId="IDT_DAP_NAME"/>
<InfoText TextId="IDT_DAP_INFO"/>
@@ -58,75 +58,75 @@
</VirtualSubmoduleItem>
</VirtualSubmoduleList>
<SystemDefinedSubmoduleList>
<InterfaceSubmoduleItem ID="IDS_I" SubmoduleIdentNumber="0x00008000" SubslotNumber="32768" TextId="IDT_IFACE" SupportedRT_Classes="RT_CLASS_1" SupportedProtocols="SNMP;LLDP" NetworkComponentDiagnosisSupported="false" PTP_BoundarySupported="true" DCP_BoundarySupported="true">
<InterfaceSubmoduleItem ID="IDS_INT1" SubmoduleIdentNumber="0x00008000" SubslotNumber="32768" TextId="IDT_IFACE" SupportedRT_Classes="RT_CLASS_1" SupportedProtocols="SNMP;LLDP" NetworkComponentDiagnosisSupported="false" PTP_BoundarySupported="true" DCP_BoundarySupported="true">
<ApplicationRelations StartupMode="Advanced">
<TimingProperties SendClock="32" ReductionRatio="1 2 4 8 16 32 64 128 256 512"/>
</ApplicationRelations>
</InterfaceSubmoduleItem>
<PortSubmoduleItem ID="IDS_P1" SubmoduleIdentNumber="0x00008001" SubslotNumber="32769" TextId="IDT_P1" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P1" SubmoduleIdentNumber="0x00008001" SubslotNumber="32769" TextId="IDT_P1" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P2" SubmoduleIdentNumber="0x00008002" SubslotNumber="32770" TextId="IDT_P2" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P2" SubmoduleIdentNumber="0x00008002" SubslotNumber="32770" TextId="IDT_P2" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P3" SubmoduleIdentNumber="0x00008003" SubslotNumber="32771" TextId="IDT_P3" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P3" SubmoduleIdentNumber="0x00008003" SubslotNumber="32771" TextId="IDT_P3" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P4" SubmoduleIdentNumber="0x00008004" SubslotNumber="32772" TextId="IDT_P4" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P4" SubmoduleIdentNumber="0x00008004" SubslotNumber="32772" TextId="IDT_P4" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P5" SubmoduleIdentNumber="0x00008005" SubslotNumber="32773" TextId="IDT_P5" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P5" SubmoduleIdentNumber="0x00008005" SubslotNumber="32773" TextId="IDT_P5" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P6" SubmoduleIdentNumber="0x00008006" SubslotNumber="32774" TextId="IDT_P6" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P6" SubmoduleIdentNumber="0x00008006" SubslotNumber="32774" TextId="IDT_P6" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P7" SubmoduleIdentNumber="0x00008007" SubslotNumber="32775" TextId="IDT_P7" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P7" SubmoduleIdentNumber="0x00008007" SubslotNumber="32775" TextId="IDT_P7" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P8" SubmoduleIdentNumber="0x00008008" SubslotNumber="32776" TextId="IDT_P8" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P8" SubmoduleIdentNumber="0x00008008" SubslotNumber="32776" TextId="IDT_P8" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P9" SubmoduleIdentNumber="0x00008009" SubslotNumber="32777" TextId="IDT_P9" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P9" SubmoduleIdentNumber="0x00008009" SubslotNumber="32777" TextId="IDT_P9" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
<MAUTypeItem Value="5"/>
</MAUTypeList>
</PortSubmoduleItem>
<PortSubmoduleItem ID="IDS_P10" SubmoduleIdentNumber="0x0000800a" SubslotNumber="32778" TextId="IDT_P10" MaxPortRxDelay="350" MaxPortTxDelay="160">
<PortSubmoduleItem ID="IDS_P10" SubmoduleIdentNumber="0x0000800a" SubslotNumber="32778" TextId="IDT_P10" MaxPortRxDelay="350" MaxPortTxDelay="160" PortDeactivationSupported="false" SupportsRingportConfig="false" IsDefaultRingport="false" CheckMAUTypeSupported="false">
<MAUTypeList>
<MAUTypeItem Value="30"/>
<MAUTypeItem Value="16"/>
@@ -135,44 +135,42 @@
</PortSubmoduleItem>
</SystemDefinedSubmoduleList>
<!-- <Graphics> -->
<!-- <GraphicItemRef Type="DeviceSymbol" GraphicItemTarget="Kernelkit-Infix-Switch"/> -->
<!-- <GraphicItemRef Type="DeviceSymbol" GraphicItemTarget="Kernelkit_Infix_Switch1"/> -->
<!-- </Graphics> -->
</DeviceAccessPointItem>
</DeviceAccessPointList>
<!-- <GraphicsList> -->
<!-- <GraphicItem ID="Kernelkit-Infix-Image" GraphicFile="GSDML-Kernelkit-Infix-Switch"/> -->
<!-- <GraphicItem ID="Kernelkit_Infix_Switch1" GraphicFile="GSDML_VendorID_DeviceID-Switch-10-Port"/> -->
<!-- </GraphicsList> -->
<ExternalTextList>
<PrimaryLanguage>
<Text TextId="IDT_DEV_INFO" Value="Infix 10-port Switch"/>
<Text TextId="IDT_DAP_NAME" Value="Infix 10-port Switch"/>
<Text TextId="IDT_DAP_INFO" Value="Infix 10-port Switch"/>
<Text TextId="IDT_SS_IFACE" Value="X1"/>
<Text TextId="IDT_SS_P1" Value="X1 P1"/>
<Text TextId="IDT_SS_P2" Value="X1 P2"/>
<Text TextId="IDT_SS_P3" Value="X1 P3"/>
<Text TextId="IDT_SS_P4" Value="X1 P4"/>
<Text TextId="IDT_SS_P5" Value="X1 P5"/>
<Text TextId="IDT_SS_P6" Value="X1 P6"/>
<Text TextId="IDT_SS_P7" Value="X1 P7"/>
<Text TextId="IDT_SS_P8" Value="X1 P8"/>
<Text TextId="IDT_SS_P9" Value="X1 P9"/>
<Text TextId="IDT_SS_P10" Value="X1 P10"/>
<Text TextId="IDT_DAP_INFO" Value="Infix 10-port PROFINET Switch, managed, supports Conformance Clas A,B"/>
<Text TextId="IDT_IFACE" Value="PN-IO"/>
<Text TextId="IDT_P1" Value="eth1"/>
<Text TextId="IDT_P2" Value="eth2"/>
<Text TextId="IDT_P3" Value="eth3"/>
<Text TextId="IDT_P4" Value="eth4"/>
<Text TextId="IDT_P5" Value="eth5"/>
<Text TextId="IDT_P6" Value="eth6"/>
<Text TextId="IDT_P7" Value="eth7"/>
<Text TextId="IDT_P8" Value="eth8"/>
<Text TextId="IDT_P9" Value="eth9"/>
<Text TextId="IDT_P10" Value="eth10"/>
<Text TextId="IDT_SS_IFACE" Value="X1"/>
<Text TextId="IDT_SS_P1" Value="X1 P0"/>
<Text TextId="IDT_SS_P2" Value="X1 P1"/>
<Text TextId="IDT_SS_P3" Value="X1 P2"/>
<Text TextId="IDT_SS_P4" Value="X1 P3"/>
<Text TextId="IDT_SS_P5" Value="X1 P4"/>
<Text TextId="IDT_SS_P6" Value="X1 P5"/>
<Text TextId="IDT_SS_P7" Value="X1 P6"/>
<Text TextId="IDT_SS_P8" Value="X1 P7"/>
<Text TextId="IDT_SS_P9" Value="X1 P8"/>
<Text TextId="IDT_SS_P10" Value="X1 P9"/>
<Text TextId="IDT_P1" Value="e0"/>
<Text TextId="IDT_P2" Value="e1"/>
<Text TextId="IDT_P3" Value="e2"/>
<Text TextId="IDT_P4" Value="e3"/>
<Text TextId="IDT_P5" Value="e4"/>
<Text TextId="IDT_P6" Value="e5"/>
<Text TextId="IDT_P7" Value="e6"/>
<Text TextId="IDT_P8" Value="e7"/>
<Text TextId="IDT_P9" Value="e8"/>
<Text TextId="IDT_P10" Value="e9"/>
</PrimaryLanguage>
</ExternalTextList>
</ApplicationProcess>
src/profeth/src/sampleapp_common.c
+11 -46
View File
@@ -896,6 +896,7 @@ static void app_plug_dap (app_data_t * app, uint16_t number_of_ports)
.insize = 0,
.outsize = 0,
};
uint16_t i;
APP_LOG_DEBUG ("\nPlug DAP module and its submodules\n");
@@ -926,53 +927,17 @@ static void app_plug_dap (app_data_t * app, uint16_t number_of_ports)
PNET_SUBMOD_DAP_INTERFACE_1_IDENT,
&cfg_dap_data);
app_exp_submodule_ind (
app->net,
app,
APP_GSDML_API,
PNET_SLOT_DAP_IDENT,
PNET_SUBSLOT_DAP_INTERFACE_1_PORT_1_IDENT,
PNET_MOD_DAP_IDENT,
PNET_SUBMOD_DAP_INTERFACE_1_PORT_1_IDENT,
&cfg_dap_data);
if (number_of_ports >= 2)
for (i = 1; i <= number_of_ports; i++)
{
app_exp_submodule_ind (
app->net,
app,
APP_GSDML_API,
PNET_SLOT_DAP_IDENT,
PNET_SUBSLOT_DAP_INTERFACE_1_PORT_2_IDENT,
PNET_MOD_DAP_IDENT,
PNET_SUBMOD_DAP_INTERFACE_1_PORT_2_IDENT,
&cfg_dap_data);
}
if (number_of_ports >= 3)
{
app_exp_submodule_ind (
app->net,
app,
APP_GSDML_API,
PNET_SLOT_DAP_IDENT,
PNET_SUBSLOT_DAP_INTERFACE_1_PORT_3_IDENT,
PNET_MOD_DAP_IDENT,
PNET_SUBMOD_DAP_INTERFACE_1_PORT_3_IDENT,
&cfg_dap_data);
}
if (number_of_ports >= 4)
{
app_exp_submodule_ind (
app->net,
app,
APP_GSDML_API,
PNET_SLOT_DAP_IDENT,
PNET_SUBSLOT_DAP_INTERFACE_1_PORT_4_IDENT,
PNET_MOD_DAP_IDENT,
PNET_SUBMOD_DAP_INTERFACE_1_PORT_4_IDENT,
&cfg_dap_data);
app_exp_submodule_ind (
app->net,
app,
APP_GSDML_API,
PNET_SLOT_DAP_IDENT,
0x8000 + i,
PNET_MOD_DAP_IDENT,
0x8000 + i,
&cfg_dap_data);
}
APP_LOG_DEBUG ("Done plugging DAP\n\n");