Commit 779fcb1c authored by filatov's avatar filatov
Browse files

Add AID valued to CAM amd DENM lib (other to be done)

parent c7cfa03a
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ module LibItsCam_Templates {
        template CamInd mw_camIndWithSecurityParameters(
        template CamInd mw_camIndWithSecurityParameters(
                                                          template (present) CAM p_camMsg,
                                                          template (present) CAM p_camMsg,
                                                          template Bit128 p_ssp := *,
                                                          template Bit128 p_ssp := *,
                                                          template UInt32 p_its_aid := *
                                                          template UInt32 p_its_aid := c_camItsAid
        ) modifies mw_camInd := { 
        ) modifies mw_camInd := { 
            ssp             := p_ssp,
            ssp             := p_ssp,
            its_aid         := p_its_aid
            its_aid         := p_its_aid
+3 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,9 @@ module LibItsCam_TypesAndValues {
        const DangerousGoodsBasic c_dangerousGoodsBasic_corrosiveSubstances := corrosiveSubstances;
        const DangerousGoodsBasic c_dangerousGoodsBasic_corrosiveSubstances := corrosiveSubstances;
        const DangerousGoodsBasic c_dangerousGoodsBasic_miscellaneousDangerousSubstances := miscellaneousDangerousSubstances;
        const DangerousGoodsBasic c_dangerousGoodsBasic_miscellaneousDangerousSubstances := miscellaneousDangerousSubstances;
        
        
        const UInt32 c_camItsAid := 36;
        
        
    } // end group camValues
    } // end group camValues


    group utPrimitives {
    group utPrimitives {
+4 −4
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ module LibItsDenm_Templates {
        template DenmInd mw_denmIndWithSecurityParameters(
        template DenmInd mw_denmIndWithSecurityParameters(
                                                          template (present) DENM p_denMsg,
                                                          template (present) DENM p_denMsg,
                                                          template Bit128 p_ssp := *,
                                                          template Bit128 p_ssp := *,
                                                          template UInt32 p_its_aid := *
                                                          template UInt32 p_its_aid := c_denmItsAid
        ) modifies mw_denmInd := { 
        ) modifies mw_denmInd := { 
            ssp             := p_ssp,
            ssp             := p_ssp,
            its_aid         := p_its_aid
            its_aid         := p_its_aid
@@ -810,9 +810,9 @@ module LibItsDenm_Templates {
    
    
    group sspTemplates {
    group sspTemplates {
        
        
        template (present) bitstring mw_sspTrafficCondition        := '*1'B;
        template (present) bitstring mw_sspNoTrafficCondition        := '*0'B;
        template (present) bitstring mw_sspAccident                := '*1?'B;
        template (present) bitstring mw_sspNoAccident                := '*0?'B;
        template (present) bitstring mw_sspRoadworks               := '*1??'B;
        template (present) bitstring mw_sspNoRoadworks               := '*0??'B;
    } // end sspTemplates
    } // end sspTemplates
    
    
} // end LibItsDenmTemplates
} // end LibItsDenmTemplates
 No newline at end of file
+4 −1
Original line number Original line Diff line number Diff line
@@ -7,6 +7,9 @@
 */
 */
module LibItsDenm_TypesAndValues {
module LibItsDenm_TypesAndValues {
    
    
    //LibCommon
    import from LibCommon_BasicTypesAndValues all;
    
    // LibIts
    // LibIts
    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
    import from ITS_Container language "ASN.1:1997" all;
    import from ITS_Container language "ASN.1:1997" all;
@@ -50,7 +53,7 @@ module LibItsDenm_TypesAndValues {
        const TransmissionInterval c_interval_10sec := 10000;
        const TransmissionInterval c_interval_10sec := 10000;
        
        
        const integer c_denmItsAid := 37;
        const integer c_denmItsAid := 37;
        
		const charstring c_certName_FullDENMSSP := "CERT_TS_A_AT";        
    } // end group denmConstants
    } // end group denmConstants
    
    
    group utPrimitives {
    group utPrimitives {