Commit f9254f7d authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 2bf82a99 6d139acf
......@@ -145,6 +145,15 @@ XIRIEvent ::= CHOICE
sCEFdeviceTriggerReportNotify [89] SCEFDeviceTriggerReportNotify,
sCEFMSISDNLessMOSMS [90] SCEFMSISDNLessMOSMS,
sCEFCommunicationPatternUpdate [91] SCEFCommunicationPatternUpdate
--EPS Events, see clause 6.3
--MME Events, see clause 6.3.2.2
mMEAttach [2531] MMEAttach,
mMEDetach [2532] MMEDetach,
mMELocationUpdate [2533] MMELocationUpdate,
mMEStartOfInterceptionWithEPSAttachedUE [2534] MMEStartOfInterceptionWithEPSAttachedUE,
mMEUnsuccessfulProcedure [2535] MMEUnsuccessfulProcedure
}
-- ==============
......@@ -283,6 +292,15 @@ IRIEvent ::= CHOICE
sCEFdeviceTriggerReportNotify [89] SCEFDeviceTriggerReportNotify,
sCEFMSISDNLessMOSMS [90] SCEFMSISDNLessMOSMS,
sCEFCommunicationPatternUpdate [91] SCEFCommunicationPatternUpdate
--EPS Events, see clause 6.3
--MME Events, see clause 6.3.2.2
mMEAttach [2531] MMEAttach,
mMEDetach [2532] MMEDetach,
mMELocationUpdate [2533] MMELocationUpdate,
mMEStartOfInterceptionWithEPSAttachedUE [2534] MMEStartOfInterceptionWithEPSAttachedUE,
mMEUnsuccessfulProcedure [2535] MMEUnsuccessfulProcedure
}
IRITargetIdentifier ::= SEQUENCE
......@@ -2642,6 +2660,144 @@ MMECode ::= OCTET STRING (SIZE(1))
TMSI ::= OCTET STRING (SIZE(4))
-- ===================
-- EPS MME definitions
-- ===================
MMEAttach ::= SEQUENCE
{
attachType [1] EPSAttachType,
attachResult [2] EPSAttachResult,
iMSI [3] IMSI,
iMEI [4] IMEI OPTIONAL,
mSISDN [5] MSISDN OPTIONAL,
gUTI [6] GUTI OPTIONAL,
location [7] Location OPTIONAL,
ePSTAIList [8] TAIList OPTIONAL,
sMSServiceStatus [9] EPSSMSServiceStatus OPTIONAL,
oldGUTI [10] GUTI OPTIONAL,
eMM5GRegStatus [11] EMM5GMMStatus OPTIONAL
}
MMEDetach ::= SEQUENCE
{
detachDirection [1] MMEDirection,
detachType [2] EPSDetachType,
iMSI [3] IMSI,
iMEI [4] IMEI OPTIONAL,
mSISDN [5] MSISDN OPTIONAL,
gUTI [6] GUTI OPTIONAL,
cause [7] EMMCause OPTIONAL,
location [8] Location OPTIONAL,
switchOffIndicator [9] SwitchOffIndicator OPTIONAL
}
MMELocationUpdate ::= SEQUENCE
{
iMSI [1] IMSI,
iMEI [2] IMEI OPTIONAL,
mSISDN [3] MSISDN OPTIONAL,
gUTI [4] GUTI OPTIONAL,
location [5] Location OPTIONAL,
oldGUTI [6] GUTI OPTIONAL,
sMSServiceStatus [7] EPSSMSServiceStatus OPTIONAL
}
MMEStartOfInterceptionWithEPSAttachedUE ::= SEQUENCE
{
attachType [1] EPSAttachType,
attachResult [2] EPSAttachResult,
iMSI [3] IMSI,
iMEI [4] IMEI OPTIONAL,
mSISDN [5] MSISDN OPTIONAL,
gUTI [6] GUTI OPTIONAL,
location [7] Location OPTIONAL,
ePSTAIList [9] TAIList OPTIONAL,
sMSServiceStatus [10] EPSSMSServiceStatus OPTIONAL,
eMM5GRegStatus [12] EMM5GMMStatus OPTIONAL
}
MMEUnsuccessfulProcedure ::= SEQUENCE
{
failedProcedureType [1] MMEFailedProcedureType,
failureCause [2] MMEFailureCause,
iMSI [3] IMSI OPTIONAL,
iMEI [4] IMEI OPTIONAL,
mSISDN [5] MSISDN OPTIONAL,
gUTI [6] GUTI OPTIONAL,
location [7] Location OPTIONAL
}
-- ==================
-- EPS MME parameters
-- ==================
EMMCause ::= INTEGER (0..255)
ESMCause ::= INTEGER (0..255)
EPSAttachType ::= ENUMERATED
{
ePSAttach(1),
combinedEPSIMSIAttach(2),
ePSRLOSAttach(3),
ePSEmergencyAttach(4),
reserved(5)
}
EPSAttachResult ::= ENUMERATED
{
ePSOnly(1),
combinedEPSIMSI(2)
}
EPSDetachType ::= ENUMERATED
{
ePSDetach(1),
iMSIDetach(2),
combinedEPSIMSIDetach(3),
reAttachRequired(4),
reAttachNotRequired(5),
reserved(6)
}
EPSSMSServiceStatus ::= ENUMERATED
{
sMSServicesNotAvailable(1),
sMSServicesNotAvailableInThisPLMN(2),
networkFailure(3),
congestion(4)
}
MMEDirection ::= ENUMERATED
{
networkInitiated(1),
uEInitiated(2)
}
MMEFailedProcedureType ::= ENUMERATED
{
attachReject(1),
authenticationReject(2),
securityModeReject(3),
serviceReject(4),
trackingAreaUpdateReject(5),
activateDedicatedEPSBearerContextReject(6),
activateDefaultEPSBearerContextReject(7),
bearerResourceAllocationReject(8),
bearerResourceModificationReject(9),
modifyEPSBearerContectReject(10),
pDNConnectivityReject(11),
pDNDisconnectReject(12)
}
MMEFailureCause ::= CHOICE
{
eMMCause [1] EMMCause,
eSMCause [2] ESMCause
}
-- ===========================
-- LI Notification definitions
-- ===========================
......@@ -3016,7 +3172,8 @@ Location ::= SEQUENCE
{
locationInfo [1] LocationInfo OPTIONAL,
positioningInfo [2] PositioningInfo OPTIONAL,
locationPresenceReport [3] LocationPresenceReport OPTIONAL
locationPresenceReport [3] LocationPresenceReport OPTIONAL,
ePSLocationInfo [4] EPSLocationInfo OPTIONAL
}
CellSiteInformation ::= SEQUENCE
......@@ -3123,6 +3280,31 @@ TAI ::= SEQUENCE
nID [3] NID OPTIONAL
}
CGI ::= SEQUENCE
{
lAI [1] LAI,
cellID [2] CellID
}
LAI ::= SEQUENCE
{
pLMNID [1] PLMNID,
lAC [2] LAC
}
LAC ::= OCTET STRING (SIZE(2))
CellID ::= OCTET STRING (SIZE(2))
SAI ::= SEQUENCE
{
pLMNID [1] PLMNID,
lAC [2] LAC,
sAC [3] SAC
}
SAC ::= OCTET STRING (SIZE(2))
-- TS 29.571 [17], clause 5.4.4.5
ECGI ::= SEQUENCE
{
......@@ -3268,6 +3450,25 @@ LocationData ::= SEQUENCE
barometricPressure [11] BarometricPressure OPTIONAL
}
-- TS 29.172 [Re5], table 6.2.2-2
EPSLocationInfo ::= SEQUENCE
{
locationData [1] LocationData,
cGI [2] CGI OPTIONAL,
sAI [3] SAI OPTIONAL,
eSMLCCellInfo [4] ESMLCCellInfo OPTIONAL
}
-- TS 29.172 [Re5], clause 7.4.57
ESMLCCellInfo ::= SEQUENCE
{
eCGI [1] ECGI,
cellPortionID [2] CellPortionID
}
-- TS 29.171 [Re6], clause 7.4.31
CellPortionID ::= INTEGER (0..4095)
-- TS 29.518 [22], clause 6.2.6.2.5
LocationPresenceReport ::= SEQUENCE
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment