Commit afde6a86 authored by tepelmann's avatar tepelmann
Browse files
http://forge.etsi.org/mantis/view.php?id=6927,  http://forge.etsi.org/mantis/view.php?id=6928:  Replaced all constants defined in TTCN-3 with the original ones defined in ASN.1 (named bits/integer)
parent a8e93ce4
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ module LibItsCam_Templates {
     */
    template (present) CAM mw_camMsg_any := {
        header := {
            protocolVersion := 1, 
            messageID := 2, 
            protocolVersion := ItsPduHeader_protocolVersion_currentVersion_, 
            messageID := ItsPduHeader_messageID_cam_, 
            stationID := ?
        },
        cam := {
@@ -526,8 +526,8 @@ module LibItsCam_Templates {
            template (value) ReferencePosition p_referencePosition
        ) := {
            header := {
                protocolVersion := 1,
                messageID := 2,
                protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
                messageID := ItsPduHeader_messageID_cam_,
                stationID := p_stationId
            },
            cam := {
+8 −8
Original line number Diff line number Diff line
@@ -255,8 +255,8 @@ module LibItsDenm_Templates {
        template (present) DENM mw_denmPdu(
            template (present) DecentralizedEnvironmentalNotificationMessage p_denm,
            template (present) StationID p_stationID := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionDenm,
            template (present) ItsPduHeader.messageID p_messageID := c_messageId
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_denm_
        ) := {
            header := mw_itsPduHeader(p_stationID, p_protocolVersion, p_messageID),
            denm := p_denm
@@ -274,8 +274,8 @@ module LibItsDenm_Templates {
         */
        template (value) ItsPduHeader m_itsPduHeader(
            template (value) StationID p_stationID := f_getTsStationId(),
            template (value) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionDenm,
            template (value) ItsPduHeader.messageID p_messageID := c_messageId
            template (value) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (value) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_denm_
        ) := {
            protocolVersion := p_protocolVersion,
            messageID := p_messageID,
@@ -290,8 +290,8 @@ module LibItsDenm_Templates {
         */
        template ItsPduHeader mw_itsPduHeader(
            template (present) StationID p_stationID := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionDenm,
            template (present) ItsPduHeader.messageID p_messageID := c_messageId
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_denm_
        ) := {
            protocolVersion := p_protocolVersion,
            messageID := p_messageID,
@@ -447,7 +447,7 @@ module LibItsDenm_Templates {
        template (value) ManagementContainer m_denmMgmtCon(
            template (value) ActionID p_actionID,
            template (value) StationType p_stationType := f_getTsStationType(),
            template (value) ValidityDuration p_validityDuration := c_defaultValidity,
            template (value) ValidityDuration p_validityDuration := defaultValidity,
            template (omit) TransmissionInterval p_transmissionInterval := omit,
            template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
            template (value) TimestampIts p_referenceTime := f_getCurrentTime()
@@ -477,7 +477,7 @@ module LibItsDenm_Templates {
        template (value) ManagementContainer m_denmMgmtConTermination (
            template (value) ActionID p_actionID,
            template (value) StationType p_stationType := f_getTsStationType(),
            template (value) ValidityDuration p_validityDuration := c_defaultValidity,
            template (value) ValidityDuration p_validityDuration := defaultValidity,
            template (omit) TransmissionInterval p_transmissionInterval := omit,            
            template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
            template (value) TimestampIts p_referenceTime := f_getCurrentTime(),
+0 −6
Original line number Diff line number Diff line
@@ -38,16 +38,10 @@ module LibItsDenm_TypesAndValues {
    
    group denmConstants {
        
        const ItsPduHeader.protocolVersion c_protocolVersionDenm := 1;
        
        const ItsPduHeader.messageID c_messageId := 1;
        
        const ValidityDuration c_duration_2sec := 2;
        const ValidityDuration c_duration_5sec := 5;
        const ValidityDuration c_duration_10sec := 10;
        
        const ValidityDuration c_defaultValidity := 600;
                
        const TransmissionInterval c_interval_1sec := 1000;
        const TransmissionInterval c_interval_2sec := 2000;
        const TransmissionInterval c_interval_4sec := 4000;
+8 −8
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ module LibItsMapSpat_Templates {
        template (value) MAP_PDU m_mapPdu (
            template (value) MapData p_map
        ) := {
            header := m_itsPduHeader ( - , - ,c_mapMessageId ),
            header := m_itsPduHeader ( - , - ,ItsPduHeader_messageID_map_ ),
            mapData := p_map
        }

@@ -166,7 +166,7 @@ module LibItsMapSpat_Templates {
        template (value) SPAT_PDU m_spatPdu (
            template (value) SPAT p_spat
        ) := {
            header := m_itsPduHeader ( - , - , c_spatMessageId ),
            header := m_itsPduHeader ( - , - , ItsPduHeader_messageID_spat_ ),
            spatData := p_spat
        }
        
@@ -212,7 +212,7 @@ module LibItsMapSpat_Templates {
         */
        template (value) ItsPduHeader m_itsPduHeader(
            template (value) StationID p_stationID := f_getTsStationId(),
            template (value) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionMapSpat,
            template (value) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (value) ItsPduHeader.messageID p_messageID
        ) := {
            protocolVersion := p_protocolVersion,
@@ -228,7 +228,7 @@ module LibItsMapSpat_Templates {
         */
        template ItsPduHeader mw_itsPduHeader (
            template (present) StationID p_stationID := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionMapSpat,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := ?
        ) := {
            protocolVersion := p_protocolVersion,
@@ -244,8 +244,8 @@ module LibItsMapSpat_Templates {
         */
        template ItsPduHeader mw_itsPduHeaderMap (
            template (present) StationID p_stationID := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionMapSpat,
            template (present) ItsPduHeader.messageID p_messageID := c_mapMessageId
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_map_
        ) := {
            protocolVersion := p_protocolVersion,
            messageID := p_messageID,
@@ -260,8 +260,8 @@ module LibItsMapSpat_Templates {
         */
        template ItsPduHeader mw_itsPduHeaderSpat (
            template (present) StationID p_stationID := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionMapSpat,
            template (present) ItsPduHeader.messageID p_messageID := c_spatMessageId
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_spat_
        ) := {
            protocolVersion := p_protocolVersion,
            messageID := p_messageID,
+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ module LibItsMapSpat_TypesAndValues {
    
    group mapSpatConstants {
        
        const ItsPduHeader.protocolVersion c_protocolVersionMapSpat := 1;
        const ItsPduHeader.messageID c_spatMessageId    := 4;
        const ItsPduHeader.messageID c_mapMessageId        := 5;
        
    } // end group mapSpatConstants
    
    group utPrimitives {