Commit d7f1cff2 authored by garciay's avatar garciay
Browse files

Change param ASN.1 field into parameter because of 'param' is a TTCN-3 keyword

parent fa3390aa

asn1/CALMllsap/CALMllsap.asn

+61 −59
Original line number Diff line number Diff line 
--<OSS.PDU>-- 



CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)} DEFINITIONS AUTOMATIC TAGS::=BEGIN
@@ -54,7 +56,7 @@ CIstatus::=INTEGER{ 
	inactive	(128)

	} (0..255)



CommProfile::=SEQUENCE (SIZE(0..255)) OF I-Param

CommProfile::=SEQUENCE (SIZE(0..255)) OF I-Parameter



Connect::=INTEGER{

	automatic	(0),
@@ -184,72 +186,72 @@ PeerRXpower::=INTEGER(0..255) 


PARAMS ::= CLASS {

      &paramRef INTEGER(0..255),

      &Param

      &Parameter

	}



IPARAM ::= PARAMS



I-Params IPARAM::={errors | commProfile | properties | manuDeviceID | iTS-scuId | medID | localCIID | timeoutReg | macAddress | macAddrTemp | ciClass | ciaClass | ciStatus | notify | medType | regInfo | connect | simPin | providerInfo | minUserPriority | queueLevel | queueLowTh | queueAlarmTh | distancePeer | commRangeRef | timeOfLastRecep | inactTimeLimit | mediumUsage | medUseObsTime | peerMAC | virtualCIs | minPrioCrossCI | rxSens | txPower | txPowMax | peerRXpower | dataRate | dataRateNW | dataRatesNW | dataRateNWreq | directivity | blockLength | freeAirTime | frameLengthMax | kineVectIn | kineVectOut | cost | reliability | logicalChannel, ...}





I-Param::=SEQUENCE{

I-Parameter::=SEQUENCE{

	paramNo	IPARAM.&paramRef({I-Params}),

	param	IPARAM.&Param({I-Params}{@paramNo})

	}



errors	IPARAM::={&paramRef 0, &Param Errors}

commProfile	IPARAM::={&paramRef 2, &Param CommProfile}

properties	IPARAM::={&paramRef 3, &Param Properties}

manuDeviceID	IPARAM::={&paramRef 4, &Param UTF8String}

iTS-scuId	IPARAM::={&paramRef 5, &Param ITS-scuId}

medID	IPARAM::={&paramRef 6, &Param MedID}

localCIID	IPARAM::={&paramRef 7, &Param EUI64}

timeoutReg	IPARAM::={&paramRef 8, &Param INTEGER(0..255)}

macAddress	IPARAM::={&paramRef 9, &Param MACaddress}

macAddrTemp	IPARAM::={&paramRef 10, &Param MACaddress}

ciClass	IPARAM::={&paramRef 11, &Param CIclass}

ciaClass	IPARAM::={&paramRef 12, &Param CIaClass}

ciStatus	IPARAM::={&paramRef 13, &Param CIstatus}

notify	IPARAM::={&paramRef 16, &Param Notify}

medType	IPARAM::={&paramRef 17, &Param MedType}

regInfo	IPARAM::={&paramRef 18, &Param RegInfo}

connect	IPARAM::={&paramRef 19, &Param Connect}

simPin	IPARAM::={&paramRef 20, &Param SimPin}

providerInfo	IPARAM::={&paramRef 21, &Param ProviderInfo}

minUserPriority	IPARAM::={&paramRef 22, &Param UserPriority}	-- DEFAULT 0

queueLevel	IPARAM::={&paramRef 23, &Param QueueLevel}

queueLowTh	IPARAM::={&paramRef 24, &Param QueueValue}

queueAlarmTh	IPARAM::={&paramRef 25, &Param QueueValue}

distancePeer	IPARAM::={&paramRef 26, &Param Distance}

commRangeRef	IPARAM::={&paramRef 27, &Param Distance}

timeOfLastRecep	IPARAM::={&paramRef 28, &Param Time48IAT}

	parameter	IPARAM.&Parameter({I-Params}{@paramNo})

	}





errors	IPARAM::={&paramRef 0, &Parameter Errors}

commProfile	IPARAM::={&paramRef 2, &Parameter CommProfile}

properties	IPARAM::={&paramRef 3, &Parameter Properties}

manuDeviceID	IPARAM::={&paramRef 4, &Parameter UTF8String}

iTS-scuId	IPARAM::={&paramRef 5, &Parameter ITS-scuId}

medID	IPARAM::={&paramRef 6, &Parameter MedID}

localCIID	IPARAM::={&paramRef 7, &Parameter EUI64}

timeoutReg	IPARAM::={&paramRef 8, &Parameter INTEGER(0..255)}

macAddress	IPARAM::={&paramRef 9, &Parameter MACaddress}

macAddrTemp	IPARAM::={&paramRef 10, &Parameter MACaddress}

ciClass	IPARAM::={&paramRef 11, &Parameter CIclass}

ciaClass	IPARAM::={&paramRef 12, &Parameter CIaClass}

ciStatus	IPARAM::={&paramRef 13, &Parameter CIstatus}

notify	IPARAM::={&paramRef 16, &Parameter Notify}

medType	IPARAM::={&paramRef 17, &Parameter MedType}

regInfo	IPARAM::={&paramRef 18, &Parameter RegInfo}

connect	IPARAM::={&paramRef 19, &Parameter Connect}

simPin	IPARAM::={&paramRef 20, &Parameter SimPin}

providerInfo	IPARAM::={&paramRef 21, &Parameter ProviderInfo}

minUserPriority	IPARAM::={&paramRef 22, &Parameter UserPriority}	-- DEFAULT 0

queueLevel	IPARAM::={&paramRef 23, &Parameter QueueLevel}

queueLowTh	IPARAM::={&paramRef 24, &Parameter QueueValue}

queueAlarmTh	IPARAM::={&paramRef 25, &Parameter QueueValue}

distancePeer	IPARAM::={&paramRef 26, &Parameter Distance}

commRangeRef	IPARAM::={&paramRef 27, &Parameter Distance}

timeOfLastRecep	IPARAM::={&paramRef 28, &Parameter Time48IAT}

  -- 1 ms resolution

inactTimeLimit	IPARAM::={&paramRef 29, &Param INTEGER(0..65535)}

inactTimeLimit	IPARAM::={&paramRef 29, &Parameter INTEGER(0..65535)}

  -- milliseconds

mediumUsage	IPARAM::={&paramRef 30, &Param MediumUsage}

medUseObsTime	IPARAM::={&paramRef 31, &Param MedUseObsTime}

peerMAC	IPARAM::={&paramRef 32, &Param MACaddress}

virtualCIs	IPARAM::={&paramRef 33, &Param VirtualCIs}

minPrioCrossCI	IPARAM::={&paramRef 34, &Param UserPriority}

rxSens	IPARAM::={&paramRef 35, &Param INTEGER(0..255)}

txPower	IPARAM::={&paramRef 36, &Param INTEGER(0..255)}

txPowMax	IPARAM::={&paramRef 37, &Param TxPowMax}

peerRXpower	IPARAM::={&paramRef 38, &Param PeerRXpower}

dataRate	IPARAM::={&paramRef 39, &Param DataRate}

dataRateNW	IPARAM::={&paramRef 40, &Param DataRate}

dataRatesNW	IPARAM::={&paramRef 41, &Param DataRatesNW}

dataRateNWreq	IPARAM::={&paramRef 42, &Param DataRate}

directivity	IPARAM::={&paramRef 43, &Param Directivity}

blockLength	IPARAM::={&paramRef 44, &Param INTEGER(0..65535)}

freeAirTime	IPARAM::={&paramRef 45, &Param INTEGER(0..255)}

mediumUsage	IPARAM::={&paramRef 30, &Parameter MediumUsage}

medUseObsTime	IPARAM::={&paramRef 31, &Parameter MedUseObsTime}

peerMAC	IPARAM::={&paramRef 32, &Parameter MACaddress}

virtualCIs	IPARAM::={&paramRef 33, &Parameter VirtualCIs}

minPrioCrossCI	IPARAM::={&paramRef 34, &Parameter UserPriority}

rxSens	IPARAM::={&paramRef 35, &Parameter INTEGER(0..255)}

txPower	IPARAM::={&paramRef 36, &Parameter INTEGER(0..255)}

txPowMax	IPARAM::={&paramRef 37, &Parameter TxPowMax}

peerRXpower	IPARAM::={&paramRef 38, &Parameter PeerRXpower}

dataRate	IPARAM::={&paramRef 39, &Parameter DataRate}

dataRateNW	IPARAM::={&paramRef 40, &Parameter DataRate}

dataRatesNW	IPARAM::={&paramRef 41, &Parameter DataRatesNW}

dataRateNWreq	IPARAM::={&paramRef 42, &Parameter DataRate}

directivity	IPARAM::={&paramRef 43, &Parameter Directivity}

blockLength	IPARAM::={&paramRef 44, &Parameter INTEGER(0..65535)}

freeAirTime	IPARAM::={&paramRef 45, &Parameter INTEGER(0..255)}

  -- measured in milliseconds

frameLengthMax	IPARAM::={&paramRef 46, &Param INTEGER(0..255)}

frameLengthMax	IPARAM::={&paramRef 46, &Parameter INTEGER(0..255)}

  -- measured in milliseconds

kineVectIn	IPARAM::={&paramRef 47, &Param KineVectIn}

kineVectOut	IPARAM::={&paramRef 48, &Param KineVectOut}

cost	IPARAM::={&paramRef 49, &Param MediumCost}

reliability	IPARAM::={&paramRef 50, &Param INTEGER(0..255)}

logicalChannel	IPARAM::={&paramRef 51, &Param LogicalChannels}

kineVectIn	IPARAM::={&paramRef 47, &Parameter KineVectIn}

kineVectOut	IPARAM::={&paramRef 48, &Parameter KineVectOut}

cost	IPARAM::={&paramRef 49, &Parameter MediumCost}

reliability	IPARAM::={&paramRef 50, &Parameter INTEGER(0..255)}

logicalChannel	IPARAM::={&paramRef 51, &Parameter LogicalChannels}



Time48IAT ::= INTEGER { utcStartOf2004(0), oneMillisecAfterUTCStartOf2004(1) } (0..281474976710655) -- International Atomic Time with one millisecond steps
@@ -313,7 +315,7 @@ Distance::=INTEGER(0..65535) -- measured in 1/10 m 


MedID::=INTEGER(0..255)



Properties::=SEQUENCE (SIZE(0..255)) OF I-Param -- only selected parameters

Properties::=SEQUENCE (SIZE(0..255)) OF I-Parameter -- only selected parameters



ProviderInfo::=SEQUENCE{

	provName	OCTET STRING (SIZE(0..255)), -- Name of provider
@@ -486,11 +488,11 @@ INdata::=OCTET STRING (SIZE(0..65535)) 


ACCPARAM ::= PARAMS



nullAP ACCPARAM::={&paramRef 0, &Param NullType}

nullAP ACCPARAM::={&paramRef 0, &Parameter NullType}



AccessParameters::=SEQUENCE{

	apRef	ACCPARAM.&paramRef ({AccParams}),

	aParameter	ACCPARAM.&Param ({AccParams}{@apRef})

	aParameter	ACCPARAM.&Parameter ({AccParams}{@apRef})

	}



AccParams ACCPARAM::={nullAP, ...}

asn1/CALMmanagement/CALMmanagement.asn

+13 −13
Original line number Diff line number Diff line
@@ -76,23 +76,23 @@ MPARAM ::= PARAMS 


Param24102::=SEQUENCE{

	paramNo MPARAM.&paramRef({M-Params}),

	param	MPARAM.&Param({M-Params}{@paramNo})

	param	MPARAM.&Parameter({M-Params}{@paramNo})

	}



M-Params MPARAM::={stationID | minPrioCrossCI | stationPosition | iTS-scuId | vciList | crCiPrioList | timerITS-SSI | its-ssi | applReqList | vCIperformList | talive | iTS-scuList, ...}

	

stationID	MPARAM::={&paramRef 0, &Param StationID}

minPrioCrossCI	MPARAM::={&paramRef 1, &Param UserPriority}

stationPosition	MPARAM::={&paramRef 2, &Param KineVectOut}

iTS-scuId	MPARAM::={&paramRef 3, &Param ITS-scuId}

vciList	MPARAM::={&paramRef 4, &Param VciList}

crCiPrioList	MPARAM::={&paramRef 5, &Param CrCiPrioList}

timerITS-SSI	MPARAM::={&paramRef 6, &Param INTEGER(0..65535)}

its-ssi	MPARAM::={&paramRef 7, &Param ITS-SSI}

applReqList	MPARAM::={&paramRef 8, &Param ApplReqList}

vCIperformList	MPARAM::={&paramRef 9, &Param VCIperformList}

talive	MPARAM::={&paramRef 10, &Param Talive}

iTS-scuList	MPARAM::={&paramRef 11, &Param ITS-scuList}

stationID	MPARAM::={&paramRef 0, &Parameter StationID}

minPrioCrossCI	MPARAM::={&paramRef 1, &Parameter UserPriority}

stationPosition	MPARAM::={&paramRef 2, &Parameter KineVectOut}

iTS-scuId	MPARAM::={&paramRef 3, &Parameter ITS-scuId}

vciList	MPARAM::={&paramRef 4, &Parameter VciList}

crCiPrioList	MPARAM::={&paramRef 5, &Parameter CrCiPrioList}

timerITS-SSI	MPARAM::={&paramRef 6, &Parameter INTEGER(0..65535)}

its-ssi	MPARAM::={&paramRef 7, &Parameter ITS-SSI}

applReqList	MPARAM::={&paramRef 8, &Parameter ApplReqList}

vCIperformList	MPARAM::={&paramRef 9, &Parameter VCIperformList}

talive	MPARAM::={&paramRef 10, &Parameter Talive}

iTS-scuList	MPARAM::={&paramRef 11, &Parameter ITS-scuList}





Param24102No::=INTEGER{

asn1/CALMmsap/CALMmsap.asn

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ DEFINITIONS AUTOMATIC TAGS::=BEGIN 


IMPORTS



CIclass, CIstatus, Errors, INsapPrimitivesDown, INsapPrimitivesUp, I-Param, I-ParamNo, KineVectOut, Link-ID, MACaddress, MedID, MedType, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)} 

CIclass, CIstatus, Errors, INsapPrimitivesDown, INsapPrimitivesUp, I-Parameter, I-ParamNo, KineVectOut, Link-ID, MACaddress, MedID, MedType, UserPriority FROM CALMllsap {iso(1) standard(0) calm-ll-sap(21218) version1(1)} 



ITS-scuId, ITS-SSI FROM CALMmanagement { iso (1) standard (0) calm-management (24102) local(1) version1 (1)}
@@ -633,7 +633,7 @@ E21218-3::=Link-ID 


E21218-4::=Link-ID



E21218-5::=I-Param

E21218-5::=I-Parameter



E21218-6::=UserPriority
@@ -655,7 +655,7 @@ MI-Request-confirm::=SEQUENCE{ 
MI-Set-request::=SEQUENCE{

	linkID	Link-ID,

	commandRef	CommandRef,

	set-param	SEQUENCE OF I-Param

	set-param	SEQUENCE OF I-Parameter

	}



-- MI-SAP Set.confirm --
@@ -679,7 +679,7 @@ MI-Get-request::=SEQUENCE{ 
MI-Get-confirm::=SEQUENCE{

	linkID	Link-ID,

	commandRef	CommandRef,

	set-param	SEQUENCE OF I-Param

	set-param	SEQUENCE OF I-Parameter

	}



-- SF-SAP Service primitives --