feat: add "iso1" prefix to Document and Fragment structures/defines to avoid collisions if multiple codecs are used in parallel (e.g., din and iso)

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@115 d9f2db14-54d0-4bde-b00c-16405c910529

src/iso1/iso1EXIDatatypes.h

@@ -2055,45 +2055,45 @@ struct iso1AnonType_V2G_Message {
 
 
 
-#define EXIDocument_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIDocument_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIDocument_DigestValue_BYTES_SIZE 350 
-#define EXIFragment_Exponent_BYTES_SIZE 350 
-#define EXIFragment_PgenCounter_BYTES_SIZE 350 
-#define EXIFragment_SessionID_BYTES_SIZE 8 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,sessionIDType is 8 */
-#define EXIFragment_PGPKeyPacket_BYTES_SIZE 350 
-#define EXIFragment_Seed_BYTES_SIZE 350 
-#define EXIFragment_XPath_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIFragment_OEMProvisioningCert_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,certificateType is 800 */
-#define EXIFragment_SalesTariffDescription_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,tariffDescriptionType is 32 */
-#define EXIFragment_EVCCID_BYTES_SIZE 6 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,evccIDType is 6 */
-#define EXIFragment_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIFragment_P_BYTES_SIZE 350 
-#define EXIFragment_Q_BYTES_SIZE 350 
-#define EXIFragment_X509SubjectName_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIFragment_G_BYTES_SIZE 350 
-#define EXIFragment_J_BYTES_SIZE 350 
-#define EXIFragment_ServiceScope_CHARACTERS_SIZE 64 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,serviceScopeType is 64 */
-#define EXIFragment_ServiceName_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,serviceNameType is 32 */
-#define EXIFragment_X509CRL_BYTES_SIZE 350 
-#define EXIFragment_Y_BYTES_SIZE 350 
-#define EXIFragment_DigestValue_BYTES_SIZE 350 
-#define EXIFragment_SPKISexp_BYTES_SIZE 350 
-#define EXIFragment_stringValue_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIFragment_PGPKeyID_BYTES_SIZE 350 
-#define EXIFragment_X509Certificate_BYTES_SIZE 350 
-#define EXIFragment_FaultMsg_CHARACTERS_SIZE 64 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,faultMsgType is 64 */
-#define EXIFragment_EVSEID_CHARACTERS_SIZE 37 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,evseIDType is 37 */
-#define EXIFragment_SigMeterReading_BYTES_SIZE 64 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,sigMeterReadingType is 64 */
-#define EXIFragment_MeterID_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,meterIDType is 32 */
-#define EXIFragment_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIFragment_GenChallenge_BYTES_SIZE 16 /* XML schema facet length for urn:iso:15118:2:2013:MsgDataTypes,genChallengeType is 16 */
-#define EXIFragment_X509SKI_BYTES_SIZE 350 
-#define EXIFragment_Certificate_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,certificateType is 800 */
-#define EXIFragment_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define EXIFragment_Modulus_BYTES_SIZE 350 
-#define exiElementFrag_Id_CHARACTERS_SIZE 50 + EXTRA_CHAR 
-#define exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE 50 + EXTRA_CHAR 
+#define iso1EXIDocument_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIDocument_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIDocument_DigestValue_BYTES_SIZE 350
+#define iso1EXIFragment_Exponent_BYTES_SIZE 350
+#define iso1EXIFragment_PgenCounter_BYTES_SIZE 350
+#define iso1EXIFragment_SessionID_BYTES_SIZE 8 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,sessionIDType is 8 */
+#define iso1EXIFragment_PGPKeyPacket_BYTES_SIZE 350
+#define iso1EXIFragment_Seed_BYTES_SIZE 350
+#define iso1EXIFragment_XPath_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIFragment_OEMProvisioningCert_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,certificateType is 800 */
+#define iso1EXIFragment_SalesTariffDescription_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,tariffDescriptionType is 32 */
+#define iso1EXIFragment_EVCCID_BYTES_SIZE 6 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,evccIDType is 6 */
+#define iso1EXIFragment_MgmtData_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIFragment_P_BYTES_SIZE 350
+#define iso1EXIFragment_Q_BYTES_SIZE 350
+#define iso1EXIFragment_X509SubjectName_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIFragment_G_BYTES_SIZE 350
+#define iso1EXIFragment_J_BYTES_SIZE 350
+#define iso1EXIFragment_ServiceScope_CHARACTERS_SIZE 64 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,serviceScopeType is 64 */
+#define iso1EXIFragment_ServiceName_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,serviceNameType is 32 */
+#define iso1EXIFragment_X509CRL_BYTES_SIZE 350
+#define iso1EXIFragment_Y_BYTES_SIZE 350
+#define iso1EXIFragment_DigestValue_BYTES_SIZE 350
+#define iso1EXIFragment_SPKISexp_BYTES_SIZE 350
+#define iso1EXIFragment_stringValue_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIFragment_PGPKeyID_BYTES_SIZE 350
+#define iso1EXIFragment_X509Certificate_BYTES_SIZE 350
+#define iso1EXIFragment_FaultMsg_CHARACTERS_SIZE 64 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,faultMsgType is 64 */
+#define iso1EXIFragment_EVSEID_CHARACTERS_SIZE 37 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,evseIDType is 37 */
+#define iso1EXIFragment_SigMeterReading_BYTES_SIZE 64 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,sigMeterReadingType is 64 */
+#define iso1EXIFragment_MeterID_CHARACTERS_SIZE 32 + EXTRA_CHAR /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,meterIDType is 32 */
+#define iso1EXIFragment_KeyName_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIFragment_GenChallenge_BYTES_SIZE 16 /* XML schema facet length for urn:iso:15118:2:2013:MsgDataTypes,genChallengeType is 16 */
+#define iso1EXIFragment_X509SKI_BYTES_SIZE 350
+#define iso1EXIFragment_Certificate_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,certificateType is 800 */
+#define iso1EXIFragment_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1EXIFragment_Modulus_BYTES_SIZE 350
+#define iso1exiElementFrag_Id_CHARACTERS_SIZE 50 + EXTRA_CHAR
+#define iso1exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE 50 + EXTRA_CHAR
 
 
 /* Global elements of EXI Document */
@@ -2172,7 +2172,7 @@ struct iso1EXIDocument {
 	struct iso1TransformType Transform ;
 	struct iso1PGPDataType PGPData ;
 	struct {
-		exi_string_character_t characters[EXIDocument_MgmtData_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIDocument_MgmtData_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  MgmtData ;
 	struct iso1SignatureMethodType SignatureMethod ;
@@ -2181,11 +2181,11 @@ struct iso1EXIDocument {
 	struct iso1X509DataType X509Data ;
 	struct iso1SignatureValueType SignatureValue ;
 	struct {
-		exi_string_character_t characters[EXIDocument_KeyName_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIDocument_KeyName_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  KeyName ;
 	struct {
-		uint8_t bytes[EXIDocument_DigestValue_BYTES_SIZE];
+		uint8_t bytes[iso1EXIDocument_DigestValue_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  DigestValue ;
 	struct iso1SignedInfoType SignedInfo ;
@@ -2285,13 +2285,13 @@ struct iso1EXISchemaInformedElementFragmentGrammar {
 	/* 4 ATTRIBUTE[STRING]({urn:iso:15118:2:2013:MsgDataTypes}Id) */
 	unsigned int Id_isUsed:1;
 	struct {
-		exi_string_character_t characters[exiElementFrag_Id_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1exiElementFrag_Id_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	} Id ;
 	/* 247 START_ELEMENT({urn:iso:15118:2:2013:MsgBody}eMAID) */
 	unsigned int CHARACTERS_GENERIC_isUsed:1;
 	struct {
-		exi_string_character_t characters[exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	} CHARACTERS_GENERIC ;
 
@@ -2335,7 +2335,7 @@ struct iso1EXIFragment {
 	struct iso1X509IssuerSerialType RootCertificateID ;
 	int64_t HMACOutputLength ;
 	struct {
-		uint8_t bytes[EXIFragment_Exponent_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_Exponent_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  Exponent ;
 	struct iso1X509IssuerSerialType X509IssuerSerial ;
@@ -2348,7 +2348,7 @@ struct iso1EXIFragment {
 	struct iso1PhysicalValueType EVSEMaximumCurrentLimit ;
 	struct iso1SalesTariffType SalesTariff ;
 	struct {
-		uint8_t bytes[EXIFragment_PgenCounter_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_PgenCounter_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  PgenCounter ;
 	struct iso1X509DataType X509Data ;
@@ -2377,23 +2377,23 @@ struct iso1EXIFragment {
 	struct iso1SessionStopReqType SessionStopReq ;
 	struct iso1SignaturePropertyType SignatureProperty ;
 	struct {
-		uint8_t bytes[EXIFragment_SessionID_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_SessionID_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  SessionID ;
 	struct {
-		uint8_t bytes[EXIFragment_PGPKeyPacket_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_PGPKeyPacket_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  PGPKeyPacket ;
 	struct iso1MessageHeaderType Header ;
 	struct {
-		uint8_t bytes[EXIFragment_Seed_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_Seed_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  Seed ;
 	struct iso1RSAKeyValueType RSAKeyValue ;
 	int FreeService ;
 	struct iso1PhysicalValueType EVSENominalVoltage ;
 	struct {
-		exi_string_character_t characters[EXIFragment_XPath_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_XPath_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  XPath ;
 	struct iso1MeteringReceiptResType MeteringReceiptRes ;
@@ -2401,7 +2401,7 @@ struct iso1EXIFragment {
 	struct iso1MeteringReceiptReqType MeteringReceiptReq ;
 	struct iso1PreChargeResType PreChargeRes ;
 	struct {
-		uint8_t bytes[EXIFragment_OEMProvisioningCert_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_OEMProvisioningCert_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  OEMProvisioningCert ;
 	struct iso1PhysicalValueType EVEnergyCapacity ;
@@ -2412,20 +2412,20 @@ struct iso1EXIFragment {
 	uint16_t NotificationMaxDelay ;
 	struct iso1CableCheckReqType CableCheckReq ;
 	struct {
-		exi_string_character_t characters[EXIFragment_SalesTariffDescription_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_SalesTariffDescription_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  SalesTariffDescription ;
 	int EVSEVoltageLimitAchieved ;
 	int boolValue ;
 	struct {
-		uint8_t bytes[EXIFragment_EVCCID_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_EVCCID_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  EVCCID ;
 	struct iso1DC_EVChargeParameterType DC_EVChargeParameter ;
 	struct iso1ChargingStatusReqType ChargingStatusReq ;
 	struct iso1CableCheckResType CableCheckRes ;
 	struct {
-		exi_string_character_t characters[EXIFragment_MgmtData_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_MgmtData_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  MgmtData ;
 	struct iso1MeterInfoType MeterInfo ;
@@ -2435,34 +2435,34 @@ struct iso1EXIFragment {
 	struct iso1ManifestType Manifest ;
 	struct iso1PhysicalValueType EVMaximumVoltageLimit ;
 	struct {
-		uint8_t bytes[EXIFragment_P_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_P_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  P ;
 	struct {
-		uint8_t bytes[EXIFragment_Q_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_Q_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  Q ;
 	struct {
-		exi_string_character_t characters[EXIFragment_X509SubjectName_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_X509SubjectName_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  X509SubjectName ;
 	int32_t intValue ;
 	struct iso1ChargingProfileType ChargingProfile ;
 	struct {
-		uint8_t bytes[EXIFragment_G_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_G_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  G ;
 	struct {
-		uint8_t bytes[EXIFragment_J_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_J_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  J ;
 	struct {
-		exi_string_character_t characters[EXIFragment_ServiceScope_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_ServiceScope_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  ServiceScope ;
 	int ReceiptRequired ;
 	struct {
-		exi_string_character_t characters[EXIFragment_ServiceName_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_ServiceName_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  ServiceName ;
 	int16_t MeterStatus ;
@@ -2471,16 +2471,16 @@ struct iso1EXIFragment {
 	iso1serviceCategoryType ServiceCategory ;
 	struct iso1NotificationType Notification ;
 	struct {
-		uint8_t bytes[EXIFragment_X509CRL_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_X509CRL_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  X509CRL ;
 	struct {
-		uint8_t bytes[EXIFragment_Y_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_Y_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  Y ;
 	struct iso1PhysicalValueType EVSEPresentVoltage ;
 	struct {
-		uint8_t bytes[EXIFragment_DigestValue_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_DigestValue_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  DigestValue ;
 	struct iso1PhysicalValueType EVSEMaximumPowerLimit ;
@@ -2490,7 +2490,7 @@ struct iso1EXIFragment {
 	struct iso1ConsumptionCostType ConsumptionCost ;
 	struct iso1DigestMethodType DigestMethod ;
 	struct {
-		uint8_t bytes[EXIFragment_SPKISexp_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_SPKISexp_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  SPKISexp ;
 	struct iso1SessionSetupResType SessionSetupRes ;
@@ -2503,14 +2503,14 @@ struct iso1EXIFragment {
 	struct iso1PhysicalValueType EVTargetCurrent ;
 	struct iso1PhysicalValueType RemainingTimeToBulkSoC ;
 	struct {
-		exi_string_character_t characters[EXIFragment_stringValue_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_stringValue_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  stringValue ;
 	struct iso1SessionSetupReqType SessionSetupReq ;
 	int8_t Multiplier ;
 	struct iso1CertificateUpdateResType CertificateUpdateRes ;
 	struct {
-		uint8_t bytes[EXIFragment_PGPKeyID_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_PGPKeyID_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  PGPKeyID ;
 	struct iso1PhysicalValueType EVTargetVoltage ;
@@ -2519,7 +2519,7 @@ struct iso1EXIFragment {
 	struct iso1PhysicalValueType EVMaximumCurrentLimit ;
 	struct iso1CanonicalizationMethodType CanonicalizationMethod ;
 	struct {
-		uint8_t bytes[EXIFragment_X509Certificate_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_X509Certificate_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  X509Certificate ;
 	struct iso1CertificateInstallationReqType CertificateInstallationReq ;
@@ -2542,20 +2542,20 @@ struct iso1EXIFragment {
 	struct iso1ContractSignatureEncryptedPrivateKeyType ContractSignatureEncryptedPrivateKey ;
 	struct iso1WeldingDetectionReqType WeldingDetectionReq ;
 	struct {
-		exi_string_character_t characters[EXIFragment_FaultMsg_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_FaultMsg_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  FaultMsg ;
 	struct iso1WeldingDetectionResType WeldingDetectionRes ;
 	iso1chargeProgressType ChargeProgress ;
 	iso1paymentOptionType SelectedPaymentOption ;
 	struct {
-		exi_string_character_t characters[EXIFragment_EVSEID_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_EVSEID_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  EVSEID ;
 	struct iso1ParameterSetType ParameterSet ;
 	struct iso1EVSEChargeParameterType EVSEChargeParameter ;
 	struct {
-		uint8_t bytes[EXIFragment_SigMeterReading_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_SigMeterReading_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  SigMeterReading ;
 	struct iso1SignatureValueType SignatureValue ;
@@ -2565,7 +2565,7 @@ struct iso1EXIFragment {
 	struct iso1ServiceParameterListType ServiceParameterList ;
 	struct iso1ListOfRootCertificateIDsType ListOfRootCertificateIDs ;
 	struct {
-		exi_string_character_t characters[EXIFragment_MeterID_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_MeterID_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  MeterID ;
 	struct iso1ChargeServiceType ChargeService ;
@@ -2574,7 +2574,7 @@ struct iso1EXIFragment {
 	struct iso1PhysicalValueType startValue ;
 	struct iso1CurrentDemandReqType CurrentDemandReq ;
 	struct {
-		exi_string_character_t characters[EXIFragment_KeyName_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_KeyName_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  KeyName ;
 	struct iso1DC_EVPowerDeliveryParameterType DC_EVPowerDeliveryParameter ;
@@ -2583,21 +2583,21 @@ struct iso1EXIFragment {
 	int16_t Value ;
 	struct iso1KeyInfoType KeyInfo ;
 	struct {
-		uint8_t bytes[EXIFragment_GenChallenge_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_GenChallenge_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  GenChallenge ;
 	struct iso1AC_EVChargeParameterType AC_EVChargeParameter ;
 	struct iso1PMaxScheduleEntryType PMaxScheduleEntry ;
 	struct iso1ParameterType Parameter ;
 	struct {
-		uint8_t bytes[EXIFragment_X509SKI_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_X509SKI_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  X509SKI ;
 	struct iso1SelectedServiceType SelectedService ;
 	struct iso1PaymentServiceSelectionReqType PaymentServiceSelectionReq ;
 	struct iso1PaymentServiceSelectionResType PaymentServiceSelectionRes ;
 	struct {
-		uint8_t bytes[EXIFragment_Certificate_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_Certificate_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  Certificate ;
 	struct iso1CurrentDemandResType CurrentDemandRes ;
@@ -2606,7 +2606,7 @@ struct iso1EXIFragment {
 	struct iso1PMaxScheduleType PMaxSchedule ;
 	iso1unitSymbolType Unit ;
 	struct {
-		exi_string_character_t characters[EXIFragment_X509IssuerName_CHARACTERS_SIZE];
+		exi_string_character_t characters[iso1EXIFragment_X509IssuerName_CHARACTERS_SIZE];
 		uint16_t charactersLen;
 	}  X509IssuerName ;
 	struct iso1ReferenceType Reference ;
@@ -2627,7 +2627,7 @@ struct iso1EXIFragment {
 	struct iso1ObjectType Object ;
 	struct iso1PhysicalValueType EVEnergyRequest ;
 	struct {
-		uint8_t bytes[EXIFragment_Modulus_BYTES_SIZE];
+		uint8_t bytes[iso1EXIFragment_Modulus_BYTES_SIZE];
 		uint16_t bytesLen;
 	}  Modulus ;
 	iso1chargingSessionType ChargingSession ;

src/iso1/iso1EXIDatatypesDecoder.c

@@ -16418,7 +16418,7 @@ int decode_iso1EXISchemaInformedElementFragmentGrammar(bitstream_t* stream, stru
 					if (errn == 0) {
 						if (exiElementFrag->Id.charactersLen >= 2) {
 							exiElementFrag->Id.charactersLen = (uint16_t)(exiElementFrag->Id.charactersLen - 2); /* string table miss */
-							errn = decodeCharacters(stream, exiElementFrag->Id.charactersLen, exiElementFrag->Id.characters, exiElementFrag_Id_CHARACTERS_SIZE);
+							errn = decodeCharacters(stream, exiElementFrag->Id.charactersLen, exiElementFrag->Id.characters, iso1exiElementFrag_Id_CHARACTERS_SIZE);
 						} else {
 							/* string table hit */
 							errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -16436,7 +16436,7 @@ int decode_iso1EXISchemaInformedElementFragmentGrammar(bitstream_t* stream, stru
 					if (errn == 0) {
 						if (exiElementFrag->CHARACTERS_GENERIC.charactersLen >= 2) {
 							exiElementFrag->CHARACTERS_GENERIC.charactersLen = (uint16_t)(exiElementFrag->CHARACTERS_GENERIC.charactersLen - 2); /* string table miss */
-							errn = decodeCharacters(stream, exiElementFrag->CHARACTERS_GENERIC.charactersLen, exiElementFrag->CHARACTERS_GENERIC.characters, exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE);
+							errn = decodeCharacters(stream, exiElementFrag->CHARACTERS_GENERIC.charactersLen, exiElementFrag->CHARACTERS_GENERIC.characters, iso1exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE);
 						} else {
 							/* string table hit */
 							errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -16465,7 +16465,7 @@ int decode_iso1EXISchemaInformedElementFragmentGrammar(bitstream_t* stream, stru
 					if (errn == 0) {
 						if (exiElementFrag->CHARACTERS_GENERIC.charactersLen >= 2) {
 							exiElementFrag->CHARACTERS_GENERIC.charactersLen = (uint16_t)(exiElementFrag->CHARACTERS_GENERIC.charactersLen - 2); /* string table miss */
-							errn = decodeCharacters(stream, exiElementFrag->CHARACTERS_GENERIC.charactersLen, exiElementFrag->CHARACTERS_GENERIC.characters, exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE);
+							errn = decodeCharacters(stream, exiElementFrag->CHARACTERS_GENERIC.charactersLen, exiElementFrag->CHARACTERS_GENERIC.characters, iso1exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE);
 						} else {
 							/* string table hit */
 							errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -16641,7 +16641,7 @@ int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiDoc->DigestValue.bytesLen);
 						if (errn == 0) {
-							errn =  (exiDoc->DigestValue.bytesLen) <= EXIDocument_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiDoc->DigestValue.bytesLen) <= iso1EXIDocument_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiDoc->DigestValue.bytesLen, exiDoc->DigestValue.bytes);
@@ -16698,7 +16698,7 @@ int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
 						if (errn == 0) {
 							if (exiDoc->KeyName.charactersLen >= 2) {
 								exiDoc->KeyName.charactersLen = (uint16_t)(exiDoc->KeyName.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiDoc->KeyName.charactersLen, exiDoc->KeyName.characters, EXIDocument_KeyName_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiDoc->KeyName.charactersLen, exiDoc->KeyName.characters, iso1EXIDocument_KeyName_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -16741,7 +16741,7 @@ int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
 						if (errn == 0) {
 							if (exiDoc->MgmtData.charactersLen >= 2) {
 								exiDoc->MgmtData.charactersLen = (uint16_t)(exiDoc->MgmtData.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiDoc->MgmtData.charactersLen, exiDoc->MgmtData.characters, EXIDocument_MgmtData_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiDoc->MgmtData.charactersLen, exiDoc->MgmtData.characters, iso1EXIDocument_MgmtData_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -17085,7 +17085,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->Certificate.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->Certificate.bytesLen) <= EXIFragment_Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->Certificate.bytesLen) <= iso1EXIFragment_Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->Certificate.bytesLen, exiFrag->Certificate.bytes);
@@ -17341,7 +17341,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->DigestValue.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->DigestValue.bytesLen) <= EXIFragment_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->DigestValue.bytesLen) <= iso1EXIFragment_DigestValue_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->DigestValue.bytesLen, exiFrag->DigestValue.bytes);
@@ -17381,7 +17381,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->EVCCID.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->EVCCID.bytesLen) <= EXIFragment_EVCCID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->EVCCID.bytesLen) <= iso1EXIFragment_EVCCID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->EVCCID.bytesLen, exiFrag->EVCCID.bytes);
@@ -17541,7 +17541,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->EVSEID.charactersLen >= 2) {
 								exiFrag->EVSEID.charactersLen = (uint16_t)(exiFrag->EVSEID.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->EVSEID.charactersLen, exiFrag->EVSEID.characters, EXIFragment_EVSEID_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->EVSEID.charactersLen, exiFrag->EVSEID.characters, iso1EXIFragment_EVSEID_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -17774,7 +17774,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->Exponent.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->Exponent.bytesLen) <= EXIFragment_Exponent_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->Exponent.bytesLen) <= iso1EXIFragment_Exponent_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->Exponent.bytesLen, exiFrag->Exponent.bytes);
@@ -17811,7 +17811,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->FaultMsg.charactersLen >= 2) {
 								exiFrag->FaultMsg.charactersLen = (uint16_t)(exiFrag->FaultMsg.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->FaultMsg.charactersLen, exiFrag->FaultMsg.characters, EXIFragment_FaultMsg_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->FaultMsg.charactersLen, exiFrag->FaultMsg.characters, iso1EXIFragment_FaultMsg_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -17861,7 +17861,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->G.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->G.bytesLen) <= EXIFragment_G_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->G.bytesLen) <= iso1EXIFragment_G_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->G.bytesLen, exiFrag->G.bytes);
@@ -17881,7 +17881,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->GenChallenge.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->GenChallenge.bytesLen) <= EXIFragment_GenChallenge_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->GenChallenge.bytesLen) <= iso1EXIFragment_GenChallenge_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->GenChallenge.bytesLen, exiFrag->GenChallenge.bytes);
@@ -17920,7 +17920,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->J.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->J.bytesLen) <= EXIFragment_J_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->J.bytesLen) <= iso1EXIFragment_J_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->J.bytesLen, exiFrag->J.bytes);
@@ -17947,7 +17947,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->KeyName.charactersLen >= 2) {
 								exiFrag->KeyName.charactersLen = (uint16_t)(exiFrag->KeyName.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->KeyName.charactersLen, exiFrag->KeyName.characters, EXIFragment_KeyName_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->KeyName.charactersLen, exiFrag->KeyName.characters, iso1EXIFragment_KeyName_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -17999,7 +17999,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->MeterID.charactersLen >= 2) {
 								exiFrag->MeterID.charactersLen = (uint16_t)(exiFrag->MeterID.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->MeterID.charactersLen, exiFrag->MeterID.characters, EXIFragment_MeterID_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->MeterID.charactersLen, exiFrag->MeterID.characters, iso1EXIFragment_MeterID_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -18065,7 +18065,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->MgmtData.charactersLen >= 2) {
 								exiFrag->MgmtData.charactersLen = (uint16_t)(exiFrag->MgmtData.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->MgmtData.charactersLen, exiFrag->MgmtData.characters, EXIFragment_MgmtData_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->MgmtData.charactersLen, exiFrag->MgmtData.characters, iso1EXIFragment_MgmtData_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -18086,7 +18086,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->Modulus.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->Modulus.bytesLen) <= EXIFragment_Modulus_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->Modulus.bytesLen) <= iso1EXIFragment_Modulus_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->Modulus.bytesLen, exiFrag->Modulus.bytes);
@@ -18155,7 +18155,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->OEMProvisioningCert.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->OEMProvisioningCert.bytesLen) <= EXIFragment_OEMProvisioningCert_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->OEMProvisioningCert.bytesLen) <= iso1EXIFragment_OEMProvisioningCert_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->OEMProvisioningCert.bytesLen, exiFrag->OEMProvisioningCert.bytes);
@@ -18180,7 +18180,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->P.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->P.bytesLen) <= EXIFragment_P_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->P.bytesLen) <= iso1EXIFragment_P_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->P.bytesLen, exiFrag->P.bytes);
@@ -18205,7 +18205,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->PGPKeyID.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->PGPKeyID.bytesLen) <= EXIFragment_PGPKeyID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->PGPKeyID.bytesLen) <= iso1EXIFragment_PGPKeyID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->PGPKeyID.bytesLen, exiFrag->PGPKeyID.bytes);
@@ -18225,7 +18225,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->PGPKeyPacket.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->PGPKeyPacket.bytesLen) <= EXIFragment_PGPKeyPacket_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->PGPKeyPacket.bytesLen) <= iso1EXIFragment_PGPKeyPacket_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->PGPKeyPacket.bytesLen, exiFrag->PGPKeyPacket.bytes);
@@ -18324,7 +18324,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->PgenCounter.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->PgenCounter.bytesLen) <= EXIFragment_PgenCounter_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->PgenCounter.bytesLen) <= iso1EXIFragment_PgenCounter_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->PgenCounter.bytesLen, exiFrag->PgenCounter.bytes);
@@ -18369,7 +18369,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->Q.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->Q.bytesLen) <= EXIFragment_Q_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->Q.bytesLen) <= iso1EXIFragment_Q_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->Q.bytesLen, exiFrag->Q.bytes);
@@ -18551,7 +18551,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->SPKISexp.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->SPKISexp.bytesLen) <= EXIFragment_SPKISexp_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->SPKISexp.bytesLen) <= iso1EXIFragment_SPKISexp_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->SPKISexp.bytesLen, exiFrag->SPKISexp.bytes);
@@ -18578,7 +18578,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->SalesTariffDescription.charactersLen >= 2) {
 								exiFrag->SalesTariffDescription.charactersLen = (uint16_t)(exiFrag->SalesTariffDescription.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->SalesTariffDescription.charactersLen, exiFrag->SalesTariffDescription.characters, EXIFragment_SalesTariffDescription_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->SalesTariffDescription.charactersLen, exiFrag->SalesTariffDescription.characters, iso1EXIFragment_SalesTariffDescription_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -18619,7 +18619,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->Seed.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->Seed.bytesLen) <= EXIFragment_Seed_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->Seed.bytesLen) <= iso1EXIFragment_Seed_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->Seed.bytesLen, exiFrag->Seed.bytes);
@@ -18754,7 +18754,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->ServiceName.charactersLen >= 2) {
 								exiFrag->ServiceName.charactersLen = (uint16_t)(exiFrag->ServiceName.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->ServiceName.charactersLen, exiFrag->ServiceName.characters, EXIFragment_ServiceName_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->ServiceName.charactersLen, exiFrag->ServiceName.characters, iso1EXIFragment_ServiceName_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -18782,7 +18782,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->ServiceScope.charactersLen >= 2) {
 								exiFrag->ServiceScope.charactersLen = (uint16_t)(exiFrag->ServiceScope.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->ServiceScope.charactersLen, exiFrag->ServiceScope.characters, EXIFragment_ServiceScope_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->ServiceScope.charactersLen, exiFrag->ServiceScope.characters, iso1EXIFragment_ServiceScope_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -18805,7 +18805,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->ServiceScope.charactersLen >= 2) {
 								exiFrag->ServiceScope.charactersLen = (uint16_t)(exiFrag->ServiceScope.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->ServiceScope.charactersLen, exiFrag->ServiceScope.characters, EXIFragment_ServiceScope_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->ServiceScope.charactersLen, exiFrag->ServiceScope.characters, iso1EXIFragment_ServiceScope_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -18826,7 +18826,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->SessionID.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->SessionID.bytesLen) <= EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->SessionID.bytesLen) <= iso1EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->SessionID.bytesLen, exiFrag->SessionID.bytes);
@@ -18846,7 +18846,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->SessionID.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->SessionID.bytesLen) <= EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->SessionID.bytesLen) <= iso1EXIFragment_SessionID_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->SessionID.bytesLen, exiFrag->SessionID.bytes);
@@ -18886,7 +18886,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->SigMeterReading.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->SigMeterReading.bytesLen) <= EXIFragment_SigMeterReading_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->SigMeterReading.bytesLen) <= iso1EXIFragment_SigMeterReading_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->SigMeterReading.bytesLen, exiFrag->SigMeterReading.bytes);
@@ -19019,7 +19019,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->X509CRL.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->X509CRL.bytesLen) <= EXIFragment_X509CRL_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->X509CRL.bytesLen) <= iso1EXIFragment_X509CRL_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->X509CRL.bytesLen, exiFrag->X509CRL.bytes);
@@ -19039,7 +19039,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->X509Certificate.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->X509Certificate.bytesLen) <= EXIFragment_X509Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->X509Certificate.bytesLen) <= iso1EXIFragment_X509Certificate_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->X509Certificate.bytesLen, exiFrag->X509Certificate.bytes);
@@ -19066,7 +19066,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->X509IssuerName.charactersLen >= 2) {
 								exiFrag->X509IssuerName.charactersLen = (uint16_t)(exiFrag->X509IssuerName.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->X509IssuerName.charactersLen, exiFrag->X509IssuerName.characters, EXIFragment_X509IssuerName_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->X509IssuerName.charactersLen, exiFrag->X509IssuerName.characters, iso1EXIFragment_X509IssuerName_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -19092,7 +19092,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->X509SKI.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->X509SKI.bytesLen) <= EXIFragment_X509SKI_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->X509SKI.bytesLen) <= iso1EXIFragment_X509SKI_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->X509SKI.bytesLen, exiFrag->X509SKI.bytes);
@@ -19128,7 +19128,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->X509SubjectName.charactersLen >= 2) {
 								exiFrag->X509SubjectName.charactersLen = (uint16_t)(exiFrag->X509SubjectName.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->X509SubjectName.charactersLen, exiFrag->X509SubjectName.characters, EXIFragment_X509SubjectName_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->X509SubjectName.charactersLen, exiFrag->X509SubjectName.characters, iso1EXIFragment_X509SubjectName_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -19151,7 +19151,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->XPath.charactersLen >= 2) {
 								exiFrag->XPath.charactersLen = (uint16_t)(exiFrag->XPath.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->XPath.charactersLen, exiFrag->XPath.characters, EXIFragment_XPath_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->XPath.charactersLen, exiFrag->XPath.characters, iso1EXIFragment_XPath_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;
@@ -19172,7 +19172,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 					if(eventCode == 0) {
 						errn = decodeUnsignedInteger16(stream, &exiFrag->Y.bytesLen);
 						if (errn == 0) {
-							errn =  (exiFrag->Y.bytesLen) <= EXIFragment_Y_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
+							errn =  (exiFrag->Y.bytesLen) <= iso1EXIFragment_Y_BYTES_SIZE ? 0 : EXI_ERROR_OUT_OF_BYTE_BUFFER;
 						}
 						if (errn == 0) {
 							errn = decodeBytes(stream, exiFrag->Y.bytesLen, exiFrag->Y.bytes);
@@ -19338,7 +19338,7 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 						if (errn == 0) {
 							if (exiFrag->stringValue.charactersLen >= 2) {
 								exiFrag->stringValue.charactersLen = (uint16_t)(exiFrag->stringValue.charactersLen - 2); /* string table miss */
-								errn = decodeCharacters(stream, exiFrag->stringValue.charactersLen, exiFrag->stringValue.characters, EXIFragment_stringValue_CHARACTERS_SIZE);
+								errn = decodeCharacters(stream, exiFrag->stringValue.charactersLen, exiFrag->stringValue.characters, iso1EXIFragment_stringValue_CHARACTERS_SIZE);
 							} else {
 								/* string table hit */
 								errn = EXI_ERROR_STRINGVALUES_NOT_SUPPORTED;