From aff0093c92d0a6e9003079776369e145cc0571ef Mon Sep 17 00:00:00 2001 From: dingxiaochen Date: Wed, 7 Sep 2022 17:34:26 +0800 Subject: [PATCH 1/2] add dual card interface. Signed-off-by: dingxiaochen --- ril/v1_0/IRilCallback.idl | 7 +++---- ril/v1_0/IRilInterface.idl | 4 ++-- ril/v1_0/Types.idl | 35 ++++++++++++++++++++--------------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index b6f47fac..279ad8f6 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -94,6 +94,7 @@ import ohos.hdi.ril.v1_0.Types; SimStkEventNotify([in] int slotId, [in] String response); SimStkCallSetupNotify([in] int slotId); SimRefreshNotify([in] int slotId); + SimRadioProtocolUpdated([in] int slotId, [in] struct IRadioProtocol radioProtocol); GetSimIOResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); GetSimStatusResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ICardStatusInfo result); GetImsiResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] String response); @@ -109,8 +110,8 @@ import ohos.hdi.ril.v1_0.Types; SimStkSendEnvelopeResponse([in] struct IHRilRadioResponseInfo responseInfo); SimStkSendCallSetupRequestResultResponse([in] struct IHRilRadioResponseInfo responseInfo); SimStkIsReadyResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetRadioProtocolResponse([in] struct IHRilRadioResponseInfo responseInfo, - [in] struct ISimProtocolResponse pSimProtocol); + GetRadioProtocolResponse([in] struct IHRilRadioResponseInfo responseInfo,[in] struct IRadioProtocol radioProtocol); + SetRadioProtocolResponse([in] struct IHRilRadioResponseInfo responseInfo,[in] struct IRadioProtocol radioProtocol); SimOpenLogicalChannelResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IOpenLogicalChannelResponse pOpenLogicalChannelResponse); SimCloseLogicalChannelResponse([in] struct IHRilRadioResponseInfo responseInfo); @@ -146,8 +147,6 @@ import ohos.hdi.ril.v1_0.Types; SetPreferredNetworkResponse([in] struct IHRilRadioResponseInfo responseInfo); GetPreferredNetworkResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IPreferredNetworkTypeInfo preferredNetworkTypeInfo); - GetRadioCapabilityResponse([in] struct IHRilRadioResponseInfo responseInfo, - [in] struct IRadioCapabilityInfo radioCapabilityInfo); GetPhysicalChannelConfigResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IChannelConfigInfoList channelConfigInfoList); SetLocateUpdatesResponse([in] struct IHRilRadioResponseInfo responseInfo); diff --git a/ril/v1_0/IRilInterface.idl b/ril/v1_0/IRilInterface.idl index e24e2c97..07e76377 100644 --- a/ril/v1_0/IRilInterface.idl +++ b/ril/v1_0/IRilInterface.idl @@ -90,7 +90,8 @@ interface IRilInterface { [oneway] SimStkSendEnvelope([in] int slotId, [in] int serialId, [in] String strCmd); [oneway] SimStkSendCallSetupRequestResult([in] int slotId, [in] int serialId, [in] int accept); [oneway] SimStkIsReady([in] int slotId, [in] int serialId); - [oneway] SetRadioProtocol([in] int slotId, [in] int serialId, [in] struct ISimProtocolRequest protocol); + [oneway] GetRadioProtocol([in] int slotId,[in] int serialId); + [oneway] SetRadioProtocol([in] int slotId,[in] int serialId,[in] struct IRadioProtocol radioProtocol); [oneway] SimOpenLogicalChannel([in] int slotId, [in] int serialId, [in] String appID, [in] int p2); [oneway] SimCloseLogicalChannel([in] int slotId, [in] int serialId, [in] int channelId); [oneway] SimTransmitApduLogicalChannel([in] int slotId, [in] int serialId, @@ -113,7 +114,6 @@ interface IRilInterface { [oneway] GetCurrentCellInfo([in] int slotId, [in] int serialId); [oneway] SetPreferredNetwork([in] int slotId, [in] int serialId, [in] int preferredNetworkType); [oneway] GetPreferredNetwork([in] int slotId, [in] int serialId); - [oneway] GetRadioCapability([in] int slotId, [in] int serialId); [oneway] GetPhysicalChannelConfig([in] int slotId, [in] int serialId); [oneway] SetLocateUpdates([in] int slotId, [in] int serialId, [in] enum IHRilRegNotifyMode mode); [oneway] SetNotificationFilter([in] int slotId, [in] int serialId, [in] int newFilter); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 5f0ca379..e261540b 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -138,6 +138,18 @@ enum IHRilRegNotifyMode { REG_NOTIFY_STAT_ONLY = 1, REG_NOTIFY_STAT_LAC_CELLID = 2, }; +enum IRadioProtocolPhase { + RADIO_PROTOCOL_PHASE_INITIAL, + RADIO_PROTOCOL_PHASE_CHECK, + RADIO_PROTOCOL_PHASE_UPDATE, + RADIO_PROTOCOL_PHASE_NOTIFY, + RADIO_PROTOCOL_PHASE_COMPLETE, +}; +enum IRadioProtocolStatus { + RADIO_PROTOCOL_STATUS_NONE, + RADIO_PROTOCOL_STATUS_SUCCESS, + RADIO_PROTOCOL_STATUS_FAIL, +}; struct IEmergencyCall { int index; int total; @@ -389,17 +401,6 @@ struct ISimPinInputTimes { int puk2Times; int pin2Times; }; -struct ISimProtocolRequest { - int serial; - int phase; - int protocol; - int slotId; -}; -struct ISimProtocolResponse { - int phase; - int result; - int slotId; -}; struct IApduSimIORequestInfo { int serial; int channelId; @@ -425,6 +426,14 @@ struct ILockStatusResp { int result; int remain; }; +struct IRadioProtocol { + int slotId; + int sessionId; + enum IRadioProtocolPhase phase; + int technology; + int modemId; + enum IRadioProtocolStatus status; +}; struct IGsmRssi { int rxlev; int ber; @@ -646,10 +655,6 @@ struct IPreferredNetworkTypeInfo { int preferredNetworkType; int flag; }; -struct IRadioCapabilityInfo { - int ratFamily; - String modemId; -}; struct IPhysicalChannelConfig { enum IHRilCellConnectionStatus cellConnStatus; enum IHRilRadioTech ratType; -- Gitee From 6a62265c9e80e86acca2a5c3c7d5cf35bfdd20b0 Mon Sep 17 00:00:00 2001 From: dingxiaochen Date: Thu, 8 Sep 2022 19:34:19 +0800 Subject: [PATCH 2/2] add dual card interface. Signed-off-by: dingxiaochen --- ril/v1_0/Types.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index e261540b..08660663 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -429,9 +429,9 @@ struct ILockStatusResp { struct IRadioProtocol { int slotId; int sessionId; - enum IRadioProtocolPhase phase; int technology; int modemId; + enum IRadioProtocolPhase phase; enum IRadioProtocolStatus status; }; struct IGsmRssi { -- Gitee