From 521fedc2b2cf6bc37a5e3d7ecde0bce3e81ec708 Mon Sep 17 00:00:00 2001 From: "cheng.wang_c" Date: Tue, 6 Sep 2022 11:09:39 +0800 Subject: [PATCH 01/11] IssueNo: idl Description: fix idl code check Sig:SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: cheng.wang_c Change-Id: Ibc9d243edb3f0c372257e3d6f56f93ed014e8230 --- ril/v1_0/BUILD.gn | 4 +- ril/v1_0/{IRilInterface.idl => IRil.idl} | 6 +- ril/v1_0/IRilCallback.idl | 219 ++++++++++++----------- ril/v1_0/Types.idl | 126 +++++++------ 4 files changed, 187 insertions(+), 168 deletions(-) rename ril/v1_0/{IRilInterface.idl => IRil.idl} (98%) diff --git a/ril/v1_0/BUILD.gn b/ril/v1_0/BUILD.gn index 907d6197..31d5238c 100644 --- a/ril/v1_0/BUILD.gn +++ b/ril/v1_0/BUILD.gn @@ -19,10 +19,10 @@ if (defined(ohos_lite)) { } } else { hdi("ril") { - module_name = "ril_interface_service" + module_name = "ril_service" sources = [ "IRilCallback.idl", - "IRilInterface.idl", + "IRil.idl", "Types.idl", ] language = "cpp" diff --git a/ril/v1_0/IRilInterface.idl b/ril/v1_0/IRil.idl similarity index 98% rename from ril/v1_0/IRilInterface.idl rename to ril/v1_0/IRil.idl index e24e2c97..b3238eca 100644 --- a/ril/v1_0/IRilInterface.idl +++ b/ril/v1_0/IRil.idl @@ -18,9 +18,9 @@ package ohos.hdi.ril.v1_0; import ohos.hdi.ril.v1_0.IRilCallback; import ohos.hdi.ril.v1_0.Types; -interface IRilInterface { +interface IRil { [oneway] SetCallback([in] IRilCallback rilCallback); - [oneway] SetEmergencyCallList([in] int slotId, [in] int serialId, [in] struct IEmergencyInfoList emergencyInfoList); + [oneway] SetEmergencyCallList([in] int slotId, [in] int serialId, [in] struct EmergencyInfoList emergencyInfoList); [oneway] GetEmergencyCallList([in] int slotId, [in] int serialId); [oneway] GetCallList([in] int slotId, [in] int serialId); [oneway] Dial([in] int slotId, [in] int serialId, [in] struct IDialInfo dialInfo); @@ -136,4 +136,6 @@ interface IRilInterface { [oneway] GetCdmaCBConfig([in] int slotId, [in] int serialId); [oneway] SendSmsMoreMode([in] int slotId, [in] int serialId, [in] struct IGsmSmsMessageInfo gsmSmsMessageInfo); [oneway] SendSmsAck([in] int slotId, [in] int serialId, [in] struct IModeData modeData); + + [oneway] SendRadioAck(); } diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index b6f47fac..1c46b66b 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -18,74 +18,76 @@ package ohos.hdi.ril.v1_0; import ohos.hdi.ril.v1_0.Types; [callback] interface IRilCallback { - CallEmergencyNotice([in] int slotId, [in] struct IEmergencyInfoList emergencyInfoList); + CallEmergencyNotice([in] struct HRilRadioResponseInfo responseInfo, + [in] struct EmergencyInfoList emergencyInfoList); CallStateUpdated([in] int slotId, [in] int type); CallRingbackVoiceNotice([in] int slotId, [in] struct IRingbackVoice ringbackVoice); CallSrvccStatusNotice([in] int slotId, [in] struct ISrvccStatus srvccStatus); CallUssdNotice([in] int slotId, [in] struct IUssdNoticeInfo ussdNoticeInfo); CallSsNotice([in] int slotId, [in] struct ISsNoticeInfo ssNoticeInfo); - - SetEmergencyCallListResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetEmergencyCallListResponse([in] struct IHRilRadioResponseInfo responseInfo, - [in] struct IEmergencyInfoList emergencyInfoList); - GetCallListResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ICallInfoList callList); - DialResponse([in] struct IHRilRadioResponseInfo responseInfo); - HangupResponse([in] struct IHRilRadioResponseInfo responseInfo); - RejectResponse([in] struct IHRilRadioResponseInfo responseInfo); - AnswerResponse([in] struct IHRilRadioResponseInfo responseInfo); - HoldCallResponse([in] struct IHRilRadioResponseInfo responseInfo); - UnHoldCallResponse([in] struct IHRilRadioResponseInfo responseInfo); - SwitchCallResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetClipResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IGetClipResult getClipResult); - SetClipResponse([in] struct IHRilRadioResponseInfo responseInfo); - CombineConferenceResponse([in] struct IHRilRadioResponseInfo responseInfo); - SeparateConferenceResponse([in] struct IHRilRadioResponseInfo responseInfo); - CallSupplementResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetCallWaitingResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetEmergencyCallListResponse([in] struct HRilRadioResponseInfo responseInfo); + GetEmergencyCallListResponse([in] struct HRilRadioResponseInfo responseInfo, + [in] struct EmergencyInfoList emergencyInfoList); + GetCallListResponse([in] struct HRilRadioResponseInfo responseInfo, + [in] struct ICallInfoList callList); + DialResponse([in] struct HRilRadioResponseInfo responseInfo); + HangupResponse([in] struct HRilRadioResponseInfo responseInfo); + RejectResponse([in] struct HRilRadioResponseInfo responseInfo); + AnswerResponse([in] struct HRilRadioResponseInfo responseInfo); + HoldCallResponse([in] struct HRilRadioResponseInfo responseInfo); + UnHoldCallResponse([in] struct HRilRadioResponseInfo responseInfo); + SwitchCallResponse([in] struct HRilRadioResponseInfo responseInfo); + GetClipResponse([in] struct HRilRadioResponseInfo responseInfo, + [in] struct IGetClipResult getClipResult); + SetClipResponse([in] struct HRilRadioResponseInfo responseInfo); + CombineConferenceResponse([in] struct HRilRadioResponseInfo responseInfo); + SeparateConferenceResponse([in] struct HRilRadioResponseInfo responseInfo); + CallSupplementResponse([in] struct HRilRadioResponseInfo responseInfo); + GetCallWaitingResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICallWaitResult callWaitResult); - SetCallWaitingResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetCallTransferInfoResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetCallWaitingResponse([in] struct HRilRadioResponseInfo responseInfo); + GetCallTransferInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICallForwardQueryInfoList cFQueryList); - SetCallTransferInfoResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetCallRestrictionResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetCallTransferInfoResponse([in] struct HRilRadioResponseInfo responseInfo); + GetCallRestrictionResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICallRestrictionResult result); - SetCallRestrictionResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetClirResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IGetClirResult getClirResult); - SetClirResponse([in] struct IHRilRadioResponseInfo responseInfo); - StartDtmfResponse([in] struct IHRilRadioResponseInfo responseInfo); - SendDtmfResponse([in] struct IHRilRadioResponseInfo responseInfo); - StopDtmfResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetCallPreferenceModeResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] int mode); - SetCallPreferenceModeResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetUssdResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetUssdResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] int cusd); - SetMuteResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetMuteResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] int mute); - GetCallFailReasonResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] int callFail); - SetBarringPasswordResponse([in] struct IHRilRadioResponseInfo responseInfo); + SetCallRestrictionResponse([in] struct HRilRadioResponseInfo responseInfo); + GetClirResponse([in] struct HRilRadioResponseInfo responseInfo, + [in] struct IGetClirResult getClirResult); + SetClirResponse([in] struct HRilRadioResponseInfo responseInfo); + StartDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); + SendDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); + StopDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); + GetCallPreferenceModeResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int mode); + SetCallPreferenceModeResponse([in] struct HRilRadioResponseInfo responseInfo); + SetUssdResponse([in] struct HRilRadioResponseInfo responseInfo); + GetUssdResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int cusd); + SetMuteResponse([in] struct HRilRadioResponseInfo responseInfo); + GetMuteResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int mute); + GetCallFailReasonResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int callFail); + SetBarringPasswordResponse([in] struct HRilRadioResponseInfo responseInfo); PdpContextListUpdated([in] int slotId, [in] struct IDataCallResultList dataCallResultList); - ActivatePdpContextResponse([in] struct IHRilRadioResponseInfo responseInfo, + ActivatePdpContextResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ISetupDataCallResultInfo setupDataCallResultInfo); - DeactivatePdpContextResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetPdpContextListResponse([in] struct IHRilRadioResponseInfo responseInfo, + DeactivatePdpContextResponse([in] struct HRilRadioResponseInfo responseInfo); + GetPdpContextListResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IDataCallResultList dataCallResultList); - SetInitApnInfoResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetLinkBandwidthInfoResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetInitApnInfoResponse([in] struct HRilRadioResponseInfo responseInfo); + GetLinkBandwidthInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IDataLinkBandwidthInfo dataLinkBandwidthInfo); - SetLinkBandwidthReportingRuleResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetDataPermittedResponse([in] struct IHRilRadioResponseInfo responseInfo); + SetLinkBandwidthReportingRuleResponse([in] struct HRilRadioResponseInfo responseInfo); + SetDataPermittedResponse([in] struct HRilRadioResponseInfo responseInfo); RadioStateUpdated([in] int slotId, [in] int state); VoiceRadioTechUpdated([in] int slotId, [in] struct IVoiceRadioTechnology voiceRadioTechnology); - ShutDownResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetRadioStateResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetRadioStateResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] int state); - GetImeiResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] String imei); - GetMeidResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] String meid); - GetVoiceRadioTechnologyResponse([in] struct IHRilRadioResponseInfo responseInfo, - [in] struct IVoiceRadioTechnology voiceRadioTechnology); - GetBasebandVersionResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] String basebandVersion); + ShutDownResponse([in] struct HRilRadioResponseInfo responseInfo); + SetRadioStateResponse([in] struct HRilRadioResponseInfo responseInfo); + GetRadioStateResponse([in] struct HRilRadioResponseInfo responseInfo,[in] int state); + GetImeiResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String imei); + GetMeidResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String meid); + GetVoiceRadioTechnologyResponse([in] struct HRilRadioResponseInfo responseInfo, + GetBasebandVersionResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String basebandVersion); SimStateUpdated([in] int slotId); SimStkSessionEndNotify([in] int slotId); @@ -94,32 +96,33 @@ import ohos.hdi.ril.v1_0.Types; SimStkEventNotify([in] int slotId, [in] String response); SimStkCallSetupNotify([in] int slotId); SimRefreshNotify([in] int slotId); - 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); - GetSimLockStatusResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] int simLockStatus); - SetSimLockResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - ChangeSimPasswordResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPinResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPukResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPin2Response([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPuk2Response([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - SetActiveSimResponse([in] struct IHRilRadioResponseInfo responseInfo); - SimStkSendTerminalResponseResponse([in] struct IHRilRadioResponseInfo responseInfo); - SimStkSendEnvelopeResponse([in] struct IHRilRadioResponseInfo responseInfo); - SimStkSendCallSetupRequestResultResponse([in] struct IHRilRadioResponseInfo responseInfo); - SimStkIsReadyResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetRadioProtocolResponse([in] struct IHRilRadioResponseInfo responseInfo, - [in] struct ISimProtocolResponse pSimProtocol); - SimOpenLogicalChannelResponse([in] struct IHRilRadioResponseInfo responseInfo, + SimRadioProtocolUpdated([in] int slotId, [in] struct IRadioProtocol radioProtocol); + GetSimIOResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); + GetSimStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICardStatusInfo result); + GetImsiResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String response); + GetSimLockStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int simLockStatus); + SetSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + ChangeSimPasswordResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + UnlockPinResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + UnlockPukResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + UnlockPin2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + UnlockPuk2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + SetActiveSimResponse([in] struct HRilRadioResponseInfo responseInfo); + SimStkSendTerminalResponseResponse([in] struct HRilRadioResponseInfo responseInfo); + SimStkSendEnvelopeResponse([in] struct HRilRadioResponseInfo responseInfo); + SimStkSendCallSetupRequestResultResponse([in] struct HRilRadioResponseInfo responseInfo); + SimStkIsReadyResponse([in] struct HRilRadioResponseInfo responseInfo); + GetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct IRadioProtocol radioProtocol); + SetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct IRadioProtocol radioProtocol); + SimOpenLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IOpenLogicalChannelResponse pOpenLogicalChannelResponse); - SimCloseLogicalChannelResponse([in] struct IHRilRadioResponseInfo responseInfo); - SimTransmitApduLogicalChannelResponse([in] struct IHRilRadioResponseInfo responseInfo, + SimCloseLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo); + SimTransmitApduLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); - SimTransmitApduBasicChannelResponse([in] struct IHRilRadioResponseInfo responseInfo, + SimTransmitApduBasicChannelResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); - SimAuthenticationResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); - UnlockSimLockResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + SimAuthenticationResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); + UnlockSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); NetworkCsRegStatusUpdated([in] int slotId, [in] struct ICsRegStatusInfo csRegStatusInfo); NetworkPsRegStatusUpdated([in] int slotId, [in] struct IPsRegStatusInfo psRegStatusInfo); @@ -128,56 +131,56 @@ import ohos.hdi.ril.v1_0.Types; NetworkTimeUpdated([in] int slotId, [in] String timeStr); NetworkPhyChnlCfgUpdated([in] int slotId, [in] struct IChannelConfigInfoList channelConfigInfoList); NetworkCurrentCellUpdated([in] int slotId, [in] struct ICellListCurrentInfo cellListCurrentInfo); - GetSignalStrengthResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IRssi rssi); - GetCsRegStatusResponse([in] struct IHRilRadioResponseInfo responseInfo, + GetSignalStrengthResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IRssi rssi); + GetCsRegStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICsRegStatusInfo csRegStatusInfo); - GetPsRegStatusResponse([in] struct IHRilRadioResponseInfo responseInfo, + GetPsRegStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IPsRegStatusInfo psRegStatusInfo); - GetOperatorInfoResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct IOperatorInfo psRegStatusInfo); - GetNetworkSearchInformationResponse([in] struct IHRilRadioResponseInfo responseInfo, + GetOperatorInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IOperatorInfo psRegStatusInfo); + GetNetworkSearchInformationResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IAvailableNetworkList availableNetworkList); - GetNetworkSelectionModeResponse([in] struct IHRilRadioResponseInfo responseInfo, + GetNetworkSelectionModeResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ISetNetworkModeInfo setNetworkModeInfo); - SetNetworkSelectionModeResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetNeighboringCellInfoListResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetNetworkSelectionModeResponse([in] struct HRilRadioResponseInfo responseInfo); + GetNeighboringCellInfoListResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICellListNearbyInfo cellListNearbyInfo); - GetCurrentCellInfoResponse([in] struct IHRilRadioResponseInfo responseInfo, + GetCurrentCellInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICellListCurrentInfo cellListCurrentInfo); - SetPreferredNetworkResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetPreferredNetworkResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetPreferredNetworkResponse([in] struct HRilRadioResponseInfo responseInfo); + GetPreferredNetworkResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IPreferredNetworkTypeInfo preferredNetworkTypeInfo); - GetRadioCapabilityResponse([in] struct IHRilRadioResponseInfo responseInfo, - [in] struct IRadioCapabilityInfo radioCapabilityInfo); - GetPhysicalChannelConfigResponse([in] struct IHRilRadioResponseInfo responseInfo, + GetPhysicalChannelConfigResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IChannelConfigInfoList channelConfigInfoList); - SetLocateUpdatesResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetNotificationFilterResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetDeviceStateResponse([in] struct IHRilRadioResponseInfo responseInfo); + SetLocateUpdatesResponse([in] struct HRilRadioResponseInfo responseInfo); + SetNotificationFilterResponse([in] struct HRilRadioResponseInfo responseInfo); + SetDeviceStateResponse([in] struct HRilRadioResponseInfo responseInfo); NewSmsNotify([in] int slotId, [in] struct ISmsMessageInfo smsMessageInfo); NewCdmaSmsNotify([in] int slotId, [in] struct ISmsMessageInfo smsMessageInfo); SmsStatusReportNotify([in] int slotId, [in] struct ISmsMessageInfo smsMessageInfo); NewSmsStoredOnSimNotify([in] int slotId, [in] int recordNumber, [in] int indicationType); CBConfigNotify([in] int slotId, [in] struct ICBConfigReportInfo cellBroadConfigReportInfo); - SendGsmSmsResponse([in] struct IHRilRadioResponseInfo responseInfo, + SendGsmSmsResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ISendSmsResultInfo sendSmsResultInfo); - SendCdmaSmsResponse([in] struct IHRilRadioResponseInfo responseInfo, + SendCdmaSmsResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ISendSmsResultInfo sendSmsResultInfo); - AddSimMessageResponse([in] struct IHRilRadioResponseInfo responseInfo); - DelSimMessageResponse([in] struct IHRilRadioResponseInfo responseInfo); - UpdateSimMessageResponse([in] struct IHRilRadioResponseInfo responseInfo); - AddCdmaSimMessageResponse([in] struct IHRilRadioResponseInfo responseInfo); - DelCdmaSimMessageResponse([in] struct IHRilRadioResponseInfo responseInfo); - UpdateCdmaSimMessageResponse([in] struct IHRilRadioResponseInfo responseInfo); - SetSmscAddrResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetSmscAddrResponse([in] struct IHRilRadioResponseInfo responseInfo, + AddSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); + DelSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); + UpdateSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); + AddCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); + DelCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); + UpdateCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); + SetSmscAddrResponse([in] struct HRilRadioResponseInfo responseInfo); + GetSmscAddrResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IServiceCenterAddress serviceCenterAddress); - SetCBConfigResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetCBConfigResponse([in] struct IHRilRadioResponseInfo responseInfo, [in] struct ICBConfigInfo cellBroadcastInfo); - SetCdmaCBConfigResponse([in] struct IHRilRadioResponseInfo responseInfo); - GetCdmaCBConfigResponse([in] struct IHRilRadioResponseInfo responseInfo, + SetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo); + GetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICBConfigInfo cellBroadcastInfo); + SetCdmaCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo); + GetCdmaCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICdmaCBConfigInfo cdmaCBConfigInfo); - SendSmsMoreModeResponse([in] struct IHRilRadioResponseInfo responseInfo, + SendSmsMoreModeResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ISendSmsResultInfo sendSmsResultInfo); - SendSmsAckResponse([in] struct IHRilRadioResponseInfo responseInfo); + SendSmsAckResponse([in] struct HRilRadioResponseInfo responseInfo); + + ErrorResponse([in] struct HRilRadioResponseInfo responseInfo); } diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 5f0ca379..5105831f 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -15,49 +15,51 @@ package ohos.hdi.ril.v1_0; -enum IEccType { - TYPE_CATEGORY = 0, - TYPE_POLICE = 1, - TYPE_AMBULANCE = 2, - TYPE_FIRE = 4, - TYPE_SEA = 8, - TYPE_MOUNTAIN = 16, -}; -enum ISimpresentType { - TYPE_NO_CARD = 0, - TYPE_HAS_CARD = 1, -}; -enum IAbnormalServiceType { - TYPE_ALL = 0, - TYPE_ONLY_CS = 1, -}; -enum IHRilErrType { - NONE = 0, - HRIL_ERR_GENERIC_FAILURE = 1, - HRIL_ERR_INVALID_PARAMETER = 2, - HRIL_ERR_MEMORY_FULL = 3, - HRIL_ERR_CMD_SEND_FAILURE = 4, - HRIL_ERR_CMD_NO_CARRIER = 5, - HRIL_ERR_INVALID_RESPONSE = 6, - HRIL_ERR_REPEAT_STATUS = 7, - HRIL_ERR_NETWORK_SEARCHING = 8, - HRIL_ERR_NETWORK_SEARCHING_INTERRUPTED = 9, - HRIL_ERR_MODEM_DEVICE_CLOSE = 10, - HRIL_ERR_NO_SIMCARD_INSERTED = 11, - HRIL_ERR_NEED_PIN_CODE = 12, - HRIL_ERR_NEED_PUK_CODE = 13, - HRIL_ERR_NETWORK_SEARCH_TIMEOUT = 14, - HRIL_ERR_PINPUK_PASSWORD_NOCORRECT = 15, - HRIL_ERR_INVALID_MODEM_PARAMETER = 50, - HRIL_ERR_HDF_IPC_FAILURE = 65535, - HRIL_ERR_NULL_POINT = 65536, -}; -enum IHRilResponseTypes { - HRIL_RESPONSE_REQUEST = 0, - HRIL_RESPONSE_NOTICE = 1, - HRIL_RESPONSE_REQUEST_ACK = 2, - HRIL_RESPONSE_REQUEST_MUST_ACK = 3, - HRIL_RESPONSE_NOTICE_MUST_ACK = 4, +enum EccType { + TYPE_CATEGORY = 0, + TYPE_POLICE = 1, + TYPE_AMBULANCE = 2, + TYPE_FIRE = 4, + TYPE_SEA = 8, + TYPE_MOUNTAIN = 16, +}; +enum SimpresentType { + TYPE_NO_CARD = 0, + TYPE_HAS_CARD = 1, +}; +enum AbnormalServiceType { + TYPE_ALL = 0, + TYPE_ONLY_CS = 1, +}; +enum HRilErrType { + NONE = 0, + HRIL_ERR_GENERIC_FAILURE = 1, + HRIL_ERR_INVALID_PARAMETER = 2, + HRIL_ERR_MEMORY_FULL = 3, + HRIL_ERR_CMD_SEND_FAILURE = 4, + HRIL_ERR_CMD_NO_CARRIER = 5, + HRIL_ERR_INVALID_RESPONSE = 6, + HRIL_ERR_REPEAT_STATUS = 7, + HRIL_ERR_NETWORK_SEARCHING = 8, + HRIL_ERR_NETWORK_SEARCHING_INTERRUPTED = 9, + HRIL_ERR_MODEM_DEVICE_CLOSE = 10, + HRIL_ERR_NO_SIMCARD_INSERTED = 11, + HRIL_ERR_NEED_PIN_CODE = 12, + HRIL_ERR_NEED_PUK_CODE = 13, + HRIL_ERR_NETWORK_SEARCH_TIMEOUT = 14, + HRIL_ERR_PINPUK_PASSWORD_NOCORRECT = 15, + HRIL_ERR_INVALID_MODEM_PARAMETER = 50, + + HRIL_ERR_HDF_IPC_FAILURE = 300, + HRIL_ERR_NULL_POINT = 301, + HRIL_ERR_VENTOR_NOT_IMPLEMENT = 302 +}; +enum HRilResponseTypes { + HRIL_RESPONSE_REQUEST = 0, + HRIL_RESPONSE_NOTICE = 1, + HRIL_RESPONSE_REQUEST_ACK = 2, + HRIL_RESPONSE_REQUEST_MUST_ACK = 3, + HRIL_RESPONSE_NOTICE_MUST_ACK = 4, }; enum IHRilSrvStatus { HRIL_NO_SRV_SERVICE = 0, @@ -138,26 +140,38 @@ enum IHRilRegNotifyMode { REG_NOTIFY_STAT_ONLY = 1, REG_NOTIFY_STAT_LAC_CELLID = 2, }; -struct IEmergencyCall { +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 EmergencyCall { int index; int total; String eccNum; String mcc; - enum IEccType eccType; - enum ISimpresentType simpresent; - enum IAbnormalServiceType abnormalService; + enum EccType eccType; + enum SimpresentType simpresent; + enum AbnormalServiceType abnormalService; }; -struct IEmergencyInfoList { +struct EmergencyInfoList { int callSize; int flag; - List calls; + List calls; }; -struct IHRilRadioResponseInfo { - int slotId; - int flag; - int serial; - enum IHRilErrType error; - enum IHRilResponseTypes type; +struct HRilRadioResponseInfo { + int slotId; + int flag; + int serial; + enum HRilErrType error; + enum HRilResponseTypes type; }; struct ISetupDataCallResultInfo { int flag; @@ -734,4 +748,4 @@ struct ISendSmsResultInfo { String pdu; int errCode; int flag; -}; \ No newline at end of file +}; -- Gitee From eb8477119a800d8c261b33bd4726a286617e4524 Mon Sep 17 00:00:00 2001 From: "cheng.wang_c" Date: Wed, 7 Sep 2022 16:02:02 +0800 Subject: [PATCH 02/11] IssueNo: idl mderm code check Description: fix mderm idl code check Sig:SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: cheng.wang_c Change-Id: Icdbf66db0dff6a6d0c1df7bb090252a8a466c511 --- ril/v1_0/IRilCallback.idl | 6 +- ril/v1_0/Types.idl | 116 +++++++++++++++++++------------------- 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index 1c46b66b..9252dbfa 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -79,14 +79,16 @@ import ohos.hdi.ril.v1_0.Types; SetLinkBandwidthReportingRuleResponse([in] struct HRilRadioResponseInfo responseInfo); SetDataPermittedResponse([in] struct HRilRadioResponseInfo responseInfo); - RadioStateUpdated([in] int slotId, [in] int state); - VoiceRadioTechUpdated([in] int slotId, [in] struct IVoiceRadioTechnology voiceRadioTechnology); + RadioStateUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] int state); + VoiceRadioTechUpdated([in] struct HRilRadioResponseInfo responseInfo, + [in] struct VoiceRadioTechnology voiceRadioTechnology); ShutDownResponse([in] struct HRilRadioResponseInfo responseInfo); SetRadioStateResponse([in] struct HRilRadioResponseInfo responseInfo); GetRadioStateResponse([in] struct HRilRadioResponseInfo responseInfo,[in] int state); GetImeiResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String imei); GetMeidResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String meid); GetVoiceRadioTechnologyResponse([in] struct HRilRadioResponseInfo responseInfo, + [in] struct VoiceRadioTechnology voiceRadioTechnology); GetBasebandVersionResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String basebandVersion); SimStateUpdated([in] int slotId); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 5105831f..7eb58d58 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -16,59 +16,59 @@ package ohos.hdi.ril.v1_0; enum EccType { - TYPE_CATEGORY = 0, - TYPE_POLICE = 1, - TYPE_AMBULANCE = 2, - TYPE_FIRE = 4, - TYPE_SEA = 8, - TYPE_MOUNTAIN = 16, + TYPE_CATEGORY = 0, + TYPE_POLICE = 1, + TYPE_AMBULANCE = 2, + TYPE_FIRE = 4, + TYPE_SEA = 8, + TYPE_MOUNTAIN = 16, }; enum SimpresentType { - TYPE_NO_CARD = 0, - TYPE_HAS_CARD = 1, + TYPE_NO_CARD = 0, + TYPE_HAS_CARD = 1, }; enum AbnormalServiceType { - TYPE_ALL = 0, - TYPE_ONLY_CS = 1, + TYPE_ALL = 0, + TYPE_ONLY_CS = 1, }; enum HRilErrType { - NONE = 0, - HRIL_ERR_GENERIC_FAILURE = 1, - HRIL_ERR_INVALID_PARAMETER = 2, - HRIL_ERR_MEMORY_FULL = 3, - HRIL_ERR_CMD_SEND_FAILURE = 4, - HRIL_ERR_CMD_NO_CARRIER = 5, - HRIL_ERR_INVALID_RESPONSE = 6, - HRIL_ERR_REPEAT_STATUS = 7, - HRIL_ERR_NETWORK_SEARCHING = 8, - HRIL_ERR_NETWORK_SEARCHING_INTERRUPTED = 9, - HRIL_ERR_MODEM_DEVICE_CLOSE = 10, - HRIL_ERR_NO_SIMCARD_INSERTED = 11, - HRIL_ERR_NEED_PIN_CODE = 12, - HRIL_ERR_NEED_PUK_CODE = 13, - HRIL_ERR_NETWORK_SEARCH_TIMEOUT = 14, - HRIL_ERR_PINPUK_PASSWORD_NOCORRECT = 15, - HRIL_ERR_INVALID_MODEM_PARAMETER = 50, + NONE = 0, + HRIL_ERR_GENERIC_FAILURE = 1, + HRIL_ERR_INVALID_PARAMETER = 2, + HRIL_ERR_MEMORY_FULL = 3, + HRIL_ERR_CMD_SEND_FAILURE = 4, + HRIL_ERR_CMD_NO_CARRIER = 5, + HRIL_ERR_INVALID_RESPONSE = 6, + HRIL_ERR_REPEAT_STATUS = 7, + HRIL_ERR_NETWORK_SEARCHING = 8, + HRIL_ERR_NETWORK_SEARCHING_INTERRUPTED = 9, + HRIL_ERR_MODEM_DEVICE_CLOSE = 10, + HRIL_ERR_NO_SIMCARD_INSERTED = 11, + HRIL_ERR_NEED_PIN_CODE = 12, + HRIL_ERR_NEED_PUK_CODE = 13, + HRIL_ERR_NETWORK_SEARCH_TIMEOUT = 14, + HRIL_ERR_PINPUK_PASSWORD_NOCORRECT = 15, + HRIL_ERR_INVALID_MODEM_PARAMETER = 50, - HRIL_ERR_HDF_IPC_FAILURE = 300, - HRIL_ERR_NULL_POINT = 301, - HRIL_ERR_VENTOR_NOT_IMPLEMENT = 302 + HRIL_ERR_HDF_IPC_FAILURE = 300, + HRIL_ERR_NULL_POINT = 301, + HRIL_ERR_VENTOR_NOT_IMPLEMENT = 302 }; enum HRilResponseTypes { - HRIL_RESPONSE_REQUEST = 0, - HRIL_RESPONSE_NOTICE = 1, - HRIL_RESPONSE_REQUEST_ACK = 2, - HRIL_RESPONSE_REQUEST_MUST_ACK = 3, - HRIL_RESPONSE_NOTICE_MUST_ACK = 4, + HRIL_RESPONSE_REQUEST = 0, + HRIL_RESPONSE_NOTICE = 1, + HRIL_RESPONSE_REQUEST_ACK = 2, + HRIL_RESPONSE_REQUEST_MUST_ACK = 3, + HRIL_RESPONSE_NOTICE_MUST_ACK = 4, }; -enum IHRilSrvStatus { +enum HRilSrvStatus { HRIL_NO_SRV_SERVICE = 0, HRIL_RESTRICTED_SERVICE = 1, HRIL_SERVICE_VALID = 2, HRIL_REGIONAL_SERVICE = 3, HRIL_ENERGY_SAVING_SERVICE = 4, }; -enum IHRilSrvDomain { +enum HRilSrvDomain { HRIL_NO_DOMAIN_SERVICE = 0, HRIL_CS_SERVICE = 1, HRIL_PS_SERVICE = 2, @@ -76,16 +76,16 @@ enum IHRilSrvDomain { HRIL_CS_PS_SEARCHING = 4, HRIL_CDMA_NOT_SUPPORT = 255, }; -enum IHRilRoamStatus { +enum HRilRoamStatus { HRIL_NO_ROAM = 0, HRIL_ROAMING = 1, HRIL_ROAM_UNKNOWN = 2, }; -enum IHRilSimLockStatus { +enum HRilSimLockStatus { HRIL_SIM_CARD_UNLOCK = 0, HRIL_SIM_CARD_LOCK = 1, }; -enum IHRilSysMode { +enum HRilSysMode { HRIL_NO_SYSMODE_SERVICE = 0, HRIL_GSM_MODE = 1, HRIL_CDMA_MODE = 2, @@ -96,7 +96,7 @@ enum IHRilSysMode { HRIL_LTE_CA_MODE = 7, HRIL_NR_MODE = 8, }; -enum IHRilRadioTech { +enum HRilRadioTech { RADIO_TECHNOLOGY_INVALID = 65535, RADIO_TECHNOLOGY_UNKNOWN = 0, RADIO_TECHNOLOGY_GSM = 1, @@ -112,7 +112,7 @@ enum IHRilRadioTech { RADIO_TECHNOLOGY_IWLAN = 11, RADIO_TECHNOLOGY_NR = 12, }; -enum IHRilSimStatus { +enum HRilSimStatus { HRIL_USIM_INVALID = 0, HRIL_USIM_VALID = 1, HRIL_USIM_CS_INVALID = 2, @@ -167,11 +167,11 @@ struct EmergencyInfoList { List calls; }; struct HRilRadioResponseInfo { - int slotId; - int flag; - int serial; - enum HRilErrType error; - enum HRilResponseTypes type; + int slotId; + int flag; + int serial; + enum HRilErrType error; + enum HRilResponseTypes type; }; struct ISetupDataCallResultInfo { int flag; @@ -249,15 +249,15 @@ struct IUniInfo { int arg2; String strTmp; }; -struct IVoiceRadioTechnology { - enum IHRilSrvStatus srvStatus; - enum IHRilSrvDomain srvDomain; - enum IHRilRoamStatus roamStatus; - enum IHRilSimStatus simStatus; - enum IHRilSimLockStatus lockStatus; - enum IHRilSysMode sysMode; +struct VoiceRadioTechnology { + enum HRilSrvStatus srvStatus; + enum HRilSrvDomain srvDomain; + enum HRilRoamStatus roamStatus; + enum HRilSimStatus simStatus; + enum HRilSimLockStatus lockStatus; + enum HRilSysMode sysMode; String sysModeName; - enum IHRilRadioTech actType; + enum HRilRadioTech actType; String actName; int flag; }; @@ -480,7 +480,7 @@ struct ICsRegStatusInfo { enum IHRilRegStatus regStatus; int lacCode; int cellId; - enum IHRilRadioTech radioTechnology; + enum HRilRadioTech radioTechnology; int flag; }; struct IPsRegStatusInfo { @@ -488,7 +488,7 @@ struct IPsRegStatusInfo { enum IHRilRegStatus regStatus; int lacCode; int cellId; - enum IHRilRadioTech radioTechnology; + enum HRilRadioTech radioTechnology; boolean isNrAvailable; boolean isEnDcAvailable; boolean isDcNrRestricted; @@ -666,7 +666,7 @@ struct IRadioCapabilityInfo { }; struct IPhysicalChannelConfig { enum IHRilCellConnectionStatus cellConnStatus; - enum IHRilRadioTech ratType; + enum HRilRadioTech ratType; int cellBandwidthDownlinkKhz; int cellBandwidthUplinkKhz; int freqRange; -- Gitee From ddd74ca9f930a8d95cc5894a60aad81eb2f3ed61 Mon Sep 17 00:00:00 2001 From: huangyufei Date: Wed, 7 Sep 2022 17:53:10 +0800 Subject: [PATCH 03/11] =?UTF-8?q?IssueNo:idl=20sms=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20--=20interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description:idl sms模块优化 -- interface Sig:SIG_Telephony Feature or Bugfix: Bugfix Binary Source: No Signed-off-by: huangyf0104 Change-Id: I27781b9c95907fc820844a34a0cd2605a77667b3 --- ril/v1_0/IRil.idl | 23 +++++++++++------------ ril/v1_0/IRilCallback.idl | 25 +++++++++++++------------ ril/v1_0/Types.idl | 32 ++++++++++++++++---------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index b3238eca..ebff16cd 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -119,23 +119,22 @@ interface IRil { [oneway] SetNotificationFilter([in] int slotId, [in] int serialId, [in] int newFilter); [oneway] SetDeviceState([in] int slotId, [in] int serialId, [in] int deviceStateType, [in] int deviceStateOn); - [oneway] SendGsmSms([in] int slotId, [in] int serialId, [in] struct IGsmSmsMessageInfo gsmSmsMessageInfo); - [oneway] SendCdmaSms([in] int slotId, [in] int serialId, [in] struct ISendCdmaSmsMessageInfo cdmaSmsMessageInfo); - [oneway] AddSimMessage([in] int slotId, [in] int serialId, [in] struct ISmsMessageIOInfo gsmSmsMessageInfo); + [oneway] SendGsmSms([in] int slotId, [in] int serialId, [in] struct GsmSmsMessageInfo gsmSmsMessageInfo); + [oneway] SendCdmaSms([in] int slotId, [in] int serialId, [in] struct SendCdmaSmsMessageInfo cdmaSmsMessageInfo); + [oneway] AddSimMessage([in] int slotId, [in] int serialId, [in] struct SmsMessageIOInfo gsmSmsMessageInfo); [oneway] DelSimMessage([in] int slotId, [in] int serialId, [in] int index); - [oneway] UpdateSimMessage([in] int slotId, [in] int serialId, [in] struct ISmsMessageIOInfo gsmSmsMessageInfo); - [oneway] AddCdmaSimMessage([in] int slotId, [in] int serialId, [in] struct ISmsMessageIOInfo gsmSmsMessageInfo); + [oneway] UpdateSimMessage([in] int slotId, [in] int serialId, [in] struct SmsMessageIOInfo gsmSmsMessageInfo); + [oneway] AddCdmaSimMessage([in] int slotId, [in] int serialId, [in] struct SmsMessageIOInfo gsmSmsMessageInfo); [oneway] DelCdmaSimMessage([in] int slotId, [in] int serialId, [in] int index); - [oneway] UpdateCdmaSimMessage([in] int slotId, [in] int serialId, [in] struct ISmsMessageIOInfo gsmSmsMessageInfo); - [oneway] SetSmscAddr([in] int slotId, [in] int serialId, [in] struct IServiceCenterAddress serviceCenterAddress); + [oneway] UpdateCdmaSimMessage([in] int slotId, [in] int serialId, [in] struct SmsMessageIOInfo gsmSmsMessageInfo); + [oneway] SetSmscAddr([in] int slotId, [in] int serialId, [in] struct ServiceCenterAddress serviceCenterAddress); [oneway] GetSmscAddr([in] int slotId, [in] int serialId); - [oneway] SetCBConfig([in] int slotId, [in] int serialId, [in] struct ICBConfigInfo cellBroadcastInfo); + [oneway] SetCBConfig([in] int slotId, [in] int serialId, [in] struct CBConfigInfo cellBroadcastInfo); [oneway] GetCBConfig([in] int slotId, [in] int serialId); - [oneway] SetCdmaCBConfig([in] int slotId, [in] int serialId, - [in] struct ICdmaCBConfigInfoList cdmaCBConfigInfoList); + [oneway] SetCdmaCBConfig([in] int slotId, [in] int serialId, [in] struct CdmaCBConfigInfoList cdmaCBConfigInfoList); [oneway] GetCdmaCBConfig([in] int slotId, [in] int serialId); - [oneway] SendSmsMoreMode([in] int slotId, [in] int serialId, [in] struct IGsmSmsMessageInfo gsmSmsMessageInfo); - [oneway] SendSmsAck([in] int slotId, [in] int serialId, [in] struct IModeData modeData); + [oneway] SendSmsMoreMode([in] int slotId, [in] int serialId, [in] struct GsmSmsMessageInfo gsmSmsMessageInfo); + [oneway] SendSmsAck([in] int slotId, [in] int serialId, [in] struct ModeData modeData); [oneway] SendRadioAck(); } diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index 9252dbfa..fd3925eb 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -157,15 +157,16 @@ import ohos.hdi.ril.v1_0.Types; SetNotificationFilterResponse([in] struct HRilRadioResponseInfo responseInfo); SetDeviceStateResponse([in] struct HRilRadioResponseInfo responseInfo); - NewSmsNotify([in] int slotId, [in] struct ISmsMessageInfo smsMessageInfo); - NewCdmaSmsNotify([in] int slotId, [in] struct ISmsMessageInfo smsMessageInfo); - SmsStatusReportNotify([in] int slotId, [in] struct ISmsMessageInfo smsMessageInfo); - NewSmsStoredOnSimNotify([in] int slotId, [in] int recordNumber, [in] int indicationType); - CBConfigNotify([in] int slotId, [in] struct ICBConfigReportInfo cellBroadConfigReportInfo); - SendGsmSmsResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ISendSmsResultInfo sendSmsResultInfo); + NewSmsNotify([in] struct HRilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); + NewCdmaSmsNotify([in] struct HRilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); + SmsStatusReportNotify([in] struct HRilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); + NewSmsStoredOnSimNotify([in] struct HRilRadioResponseInfo responseInfo, [in] int recordNumber, + [in] int indicationType); + CBConfigNotify([in] struct HRilRadioResponseInfo responseInfo, + [in] struct CBConfigReportInfo cellBroadConfigReportInfo); + SendGsmSmsResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct SendSmsResultInfo sendSmsResultInfo); SendCdmaSmsResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ISendSmsResultInfo sendSmsResultInfo); + [in] struct SendSmsResultInfo sendSmsResultInfo); AddSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); DelSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); UpdateSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); @@ -174,14 +175,14 @@ import ohos.hdi.ril.v1_0.Types; UpdateCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); SetSmscAddrResponse([in] struct HRilRadioResponseInfo responseInfo); GetSmscAddrResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IServiceCenterAddress serviceCenterAddress); + [in] struct ServiceCenterAddress serviceCenterAddress); SetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICBConfigInfo cellBroadcastInfo); + GetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct CBConfigInfo cellBroadcastInfo); SetCdmaCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo); GetCdmaCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICdmaCBConfigInfo cdmaCBConfigInfo); + [in] struct CdmaCBConfigInfo cdmaCBConfigInfo); SendSmsMoreModeResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ISendSmsResultInfo sendSmsResultInfo); + [in] struct SendSmsResultInfo sendSmsResultInfo); SendSmsAckResponse([in] struct HRilRadioResponseInfo responseInfo); ErrorResponse([in] struct HRilRadioResponseInfo responseInfo); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 7eb58d58..b7286c8e 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -681,69 +681,69 @@ struct IChannelConfigInfoList { List channelConfigInfos; int flag; }; -struct IGsmSmsMessageInfo { +struct GsmSmsMessageInfo { int serial; + int state; String smscPdu; String pdu; - int state; }; -struct ISendCdmaSmsMessageInfo { +struct SendCdmaSmsMessageInfo { int serial; - String smscPdu; int state; + String smscPdu; }; -struct ISmsMessageIOInfo { +struct SmsMessageIOInfo { int serial; String smscPdu; String pdu; int state; int index; }; -struct IServiceCenterAddress { +struct ServiceCenterAddress { int serial; int tosca; String address; }; -struct ICBConfigInfo { +struct CBConfigInfo { int serial; int mode; int indicationType; String mids; String dcss; }; -struct ICdmaCBConfigInfo { +struct CdmaCBConfigInfo { int service; int language; int checked; }; -struct ICdmaCBConfigInfoList { +struct CdmaCBConfigInfoList { int serial; int size; - List list; + List list; }; -struct ICBConfigReportInfo { +struct CBConfigReportInfo { int indicationType; int sn; int mid; int page; int pages; - String dcs; - String data; int length; + String data; + String dcs; String pdu; }; -struct ISmsMessageInfo { +struct SmsMessageInfo { int indicationType; int size; List pdu; }; -struct IModeData { +struct ModeData { int serial; boolean result; int mode; String pdu; }; -struct ISendSmsResultInfo { +struct SendSmsResultInfo { int msgRef; String pdu; int errCode; -- Gitee From bb4226e85d69fe14294706ef75d1f5af4b57b7ee Mon Sep 17 00:00:00 2001 From: ligx0104 Date: Wed, 7 Sep 2022 18:02:57 +0800 Subject: [PATCH 04/11] =?UTF-8?q?IssueNo:idl=E6=94=B9=E9=80=A0=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description:idl改造优化 Sig:SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: ligx0104 Change-Id: Ie20cf4641f2c9237cc2fa77ef0a2735ef137ffcd --- ril/v1_0/IRil.idl | 14 ++++++++------ ril/v1_0/IRilCallback.idl | 8 ++++---- ril/v1_0/Types.idl | 35 +++++++++++++++++++++-------------- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index ebff16cd..f713c5c7 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -57,15 +57,17 @@ interface IRil { [oneway] StopDtmf([in] int slotId, [in] int serialId, [in] struct IDtmfInfo dtmfInfo); [oneway] SetBarringPassword([in] int slotId, [in] int serialId, [in] struct ISetBarringInfo setBarringInfo); - [oneway] ActivatePdpContext([in] int slotId, [in] int serialId, [in] struct IDataCallInfo dataCallInfo); - [oneway] DeactivatePdpContext([in] int slotId, [in] int serialId, [in] struct IUniInfo uniInfo); - [oneway] GetPdpContextList([in] int slotId, [in] int serialId, [in] struct IUniInfo uniInfo); - [oneway] SetInitApnInfo([in] int slotId, [in] int serialId, [in] struct IDataProfileDataInfo dataProfileDataInfo); + [oneway] ActivatePdpContext([in] int slotId, [in] int serialId, [in] struct DataCallInfo dataCallInfo); + [oneway] DeactivatePdpContext([in] int slotId, [in] int serialId, [in] struct UniInfo uniInfo); + [oneway] GetPdpContextList([in] int slotId, [in] int serialId, [in] struct UniInfo uniInfo); + [oneway] SetInitApnInfo([in] int slotId, [in] int serialId, [in] struct DataProfileDataInfo dataProfileDataInfo); [oneway] GetLinkBandwidthInfo([in] int slotId, [in] int serialId, [in] int cid); [oneway] SetLinkBandwidthReportingRule([in] int slotId, [in] int serialId, - [in] struct IDataLinkBandwidthReportingRule dataLinkBandwidthReportingRule); + [in] struct DataLinkBandwidthReportingRule dataLinkBandwidthReportingRule); [oneway] SetDataPermitted([in] int slotId, [in] int serialId, [in] int dataPermitted); - [oneway] SetDataProfileInfo([in] int slotId, [in] int serialId, [in] struct IDataProfilesInfo dataProfilesInfo); + [oneway] SetDataProfileInfo([in] int slotId, [in] int serialId, [in] struct DataProfilesInfo dataProfilesInfo); + [oneway] SendDataPerformanceMode([in] int slotId, [in] int serialId, [in] struct DataPerformanceInfo dataPerformanceInfo); + [oneway] SendDataSleepMode([in] int slotId, [in] int serialId, [in] struct DataSleepInfo dataSleepInfo); [oneway] SetRadioState([in] int slotId, [in] int serialId, [in] int fun, [in] int rst); [oneway] GetRadioState([in] int slotId, [in] int serialId); diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index fd3925eb..b4fb44a5 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -67,15 +67,15 @@ import ohos.hdi.ril.v1_0.Types; GetCallFailReasonResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int callFail); SetBarringPasswordResponse([in] struct HRilRadioResponseInfo responseInfo); - PdpContextListUpdated([in] int slotId, [in] struct IDataCallResultList dataCallResultList); + PdpContextListUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct DataCallResultList dataCallResultList); ActivatePdpContextResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ISetupDataCallResultInfo setupDataCallResultInfo); + [in] struct SetupDataCallResultInfo setupDataCallResultInfo); DeactivatePdpContextResponse([in] struct HRilRadioResponseInfo responseInfo); GetPdpContextListResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IDataCallResultList dataCallResultList); + [in] struct DataCallResultList dataCallResultList); SetInitApnInfoResponse([in] struct HRilRadioResponseInfo responseInfo); GetLinkBandwidthInfoResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IDataLinkBandwidthInfo dataLinkBandwidthInfo); + [in] struct DataLinkBandwidthInfo dataLinkBandwidthInfo); SetLinkBandwidthReportingRuleResponse([in] struct HRilRadioResponseInfo responseInfo); SetDataPermittedResponse([in] struct HRilRadioResponseInfo responseInfo); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index b7286c8e..d00a6954 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -173,52 +173,52 @@ struct HRilRadioResponseInfo { enum HRilErrType error; enum HRilResponseTypes type; }; -struct ISetupDataCallResultInfo { +struct SetupDataCallResultInfo { int flag; int reason; int retryTime; int cid; int active; + int maxTransferUnit; + int pduSessionId; String type; String netPortName; String address; String dns; String dnsSec; String gateway; - int maxTransferUnit; String pCscfPrimAddr; String pCscfSecAddr; - int pduSessionId; }; -struct IDataCallResultList { +struct DataCallResultList { int size; - List dcList; + List dcList; }; -struct IDataProfileDataInfo { +struct DataProfileDataInfo { int serial; int profileId; + int authenticationType; String apn; String protocol; String roamingProtocol; - int verType; String userName; String password; }; -struct IDataProfilesInfo { +struct DataProfilesInfo { int serial; int profilesSize; - List profiles; boolean isRoaming; + List profiles; }; -struct IDataCallInfo { +struct DataCallInfo { int serial; int radioTechnology; - struct IDataProfileDataInfo dataProfileInfo; boolean modemCognitive; boolean roamingAllowed; boolean isRoaming; + struct DataProfileDataInfo dataProfileInfo; }; -struct IDataLinkBandwidthInfo { +struct DataLinkBandwidthInfo { int serial; int cid; int qi; @@ -230,7 +230,7 @@ struct IDataLinkBandwidthInfo { int dlSambr; int averagingWindow; }; -struct IDataLinkBandwidthReportingRule { +struct DataLinkBandwidthReportingRule { int serial; int rat; int delayMs; @@ -241,7 +241,14 @@ struct IDataLinkBandwidthReportingRule { List maximumUplinkKbps; List maximumDownlinkKbps; }; -struct IUniInfo { +struct DataPerformanceInfo { + int performanceEnable; + int enforce; +}; +struct DataSleepInfo { + int sleepEnable; +}; +struct UniInfo { int serial; int gsmIndex; boolean flag; -- Gitee From bb50f779a35b5fd7e6f20308463e82c4e39ebcda Mon Sep 17 00:00:00 2001 From: wangyb0408 Date: Wed, 7 Sep 2022 19:44:12 +0800 Subject: [PATCH 05/11] =?UTF-8?q?IssueNo:=20IDL=E6=90=9C=E7=BD=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: IDL搜网优化 Sig:SIG_Telephony Feature or Bugfix: Feature Binary Source: No Change-Id: I21626e37f76388e0700021676a277cfda35a87a8 --- ril/v1_0/IRil.idl | 4 +- ril/v1_0/IRilCallback.idl | 38 ++++++----- ril/v1_0/Types.idl | 140 ++++++++++++++++++++------------------ 3 files changed, 95 insertions(+), 87 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index f713c5c7..71b4c1b2 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -110,14 +110,14 @@ interface IRil { [oneway] GetNetworkSearchInformation([in] int slotId, [in] int serialId); [oneway] GetNetworkSelectionMode([in] int slotId, [in] int serialId); [oneway] SetNetworkSelectionMode([in] int slotId, [in] int serialId, - [in] struct ISetNetworkModeInfo networkModeInfo); + [in] struct SetNetworkModeInfo networkModeInfo); [oneway] GetNeighboringCellInfoList([in] int slotId, [in] int serialId); [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] SetLocateUpdates([in] int slotId, [in] int serialId, [in] enum HRilRegNotifyMode mode); [oneway] SetNotificationFilter([in] int slotId, [in] int serialId, [in] int newFilter); [oneway] SetDeviceState([in] int slotId, [in] int serialId, [in] int deviceStateType, [in] int deviceStateOn); diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index b4fb44a5..4679f42e 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -126,33 +126,37 @@ import ohos.hdi.ril.v1_0.Types; SimAuthenticationResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); UnlockSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - NetworkCsRegStatusUpdated([in] int slotId, [in] struct ICsRegStatusInfo csRegStatusInfo); - NetworkPsRegStatusUpdated([in] int slotId, [in] struct IPsRegStatusInfo psRegStatusInfo); - SignalStrengthUpdated([in] int slotId, [in] struct IRssi rssi); - NetworkTimeZoneUpdated([in] int slotId, [in] String timeZoneStr); - NetworkTimeUpdated([in] int slotId, [in] String timeStr); - NetworkPhyChnlCfgUpdated([in] int slotId, [in] struct IChannelConfigInfoList channelConfigInfoList); - NetworkCurrentCellUpdated([in] int slotId, [in] struct ICellListCurrentInfo cellListCurrentInfo); - GetSignalStrengthResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IRssi rssi); + NetworkCsRegStatusUpdated([in] struct HRilRadioResponseInfo responseInfo, + [in] struct CsRegStatusInfo csRegStatusInfo); + NetworkPsRegStatusUpdated([in] struct HRilRadioResponseInfo responseInfo, + [in] struct PsRegStatusInfo psRegStatusInfo); + SignalStrengthUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct Rssi rssi); + NetworkTimeZoneUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] String timeZoneStr); + NetworkTimeUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] String timeStr); + NetworkPhyChnlCfgUpdated([in] struct HRilRadioResponseInfo responseInfo, + [in] struct ChannelConfigInfoList channelConfigInfoList); + NetworkCurrentCellUpdated([in] struct HRilRadioResponseInfo responseInfo, + [in] struct CellListCurrentInfo cellListCurrentInfo); + GetSignalStrengthResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct Rssi rssi); GetCsRegStatusResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICsRegStatusInfo csRegStatusInfo); + [in] struct CsRegStatusInfo csRegStatusInfo); GetPsRegStatusResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IPsRegStatusInfo psRegStatusInfo); - GetOperatorInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IOperatorInfo psRegStatusInfo); + [in] struct PsRegStatusInfo psRegStatusInfo); + GetOperatorInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct OperatorInfo psRegStatusInfo); GetNetworkSearchInformationResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IAvailableNetworkList availableNetworkList); + [in] struct AvailableNetworkList availableNetworkList); GetNetworkSelectionModeResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ISetNetworkModeInfo setNetworkModeInfo); + [in] struct SetNetworkModeInfo setNetworkModeInfo); SetNetworkSelectionModeResponse([in] struct HRilRadioResponseInfo responseInfo); GetNeighboringCellInfoListResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICellListNearbyInfo cellListNearbyInfo); + [in] struct CellListNearbyInfo cellListNearbyInfo); GetCurrentCellInfoResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICellListCurrentInfo cellListCurrentInfo); + [in] struct CellListCurrentInfo cellListCurrentInfo); SetPreferredNetworkResponse([in] struct HRilRadioResponseInfo responseInfo); GetPreferredNetworkResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IPreferredNetworkTypeInfo preferredNetworkTypeInfo); + [in] struct PreferredNetworkTypeInfo preferredNetworkTypeInfo); GetPhysicalChannelConfigResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IChannelConfigInfoList channelConfigInfoList); + [in] struct ChannelConfigInfoList channelConfigInfoList); SetLocateUpdatesResponse([in] struct HRilRadioResponseInfo responseInfo); SetNotificationFilterResponse([in] struct HRilRadioResponseInfo responseInfo); SetDeviceStateResponse([in] struct HRilRadioResponseInfo responseInfo); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index d00a6954..2386194f 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -121,7 +121,7 @@ enum HRilSimStatus { HRIL_ROM_SIM = 240, HRIL_NO_USIM = 255, }; -enum IHRilRegStatus { +enum HRilRegStatus { NO_REG_MT_NO_SEARCH = 0, REG_MT_HOME = 1, NO_REG_MT_SEARCHING = 2, @@ -130,12 +130,12 @@ enum IHRilRegStatus { REG_MT_ROAMING = 5, REG_MT_EMERGENCY = 6, }; -enum IHRilCellConnectionStatus { +enum HRilCellConnectionStatus { HRIL_SERVING_CELL_UNKNOWN = 0, HRIL_SERVING_CELL_PRIMARY = 1, HRIL_SERVING_CELL_SECONDARY = 2, }; -enum IHRilRegNotifyMode { +enum HRilRegNotifyMode { REG_NOT_NOTIFY = 0, REG_NOTIFY_STAT_ONLY = 1, REG_NOTIFY_STAT_LAC_CELLID = 2, @@ -446,53 +446,61 @@ struct ILockStatusResp { int result; int remain; }; -struct IGsmRssi { +struct IRadioProtocol { + int slotId; + int sessionId; + enum IRadioProtocolPhase phase; + int technology; + int modemId; + enum IRadioProtocolStatus status; +}; +struct GsmRssi { int rxlev; int ber; }; -struct ICdmaRssi { +struct CdmaRssi { int absoluteRssi; int ecno; }; -struct IWcdmaRssi { +struct WcdmaRssi { int rxlev; int ecio; int rscp; int ber; }; -struct ILteRssi { +struct LteRssi { int rxlev; int rsrq; int rsrp; int snr; }; -struct ITdScdmaRssi { +struct TdScdmaRssi { int rscp; }; -struct INrRssi { +struct NrRssi { int rsrp; int rsrq; int sinr; }; -struct IRssi { - struct IGsmRssi gw; - struct ICdmaRssi cdma; - struct IWcdmaRssi wcdma; - struct ILteRssi lte; - struct ITdScdmaRssi tdScdma; - struct INrRssi nr; +struct Rssi { + struct GsmRssi gw; + struct CdmaRssi cdma; + struct WcdmaRssi wcdma; + struct LteRssi lte; + struct TdScdmaRssi tdScdma; + struct NrRssi nr; }; -struct ICsRegStatusInfo { +struct CsRegStatusInfo { int notifyType; - enum IHRilRegStatus regStatus; + enum HRilRegStatus regStatus; int lacCode; int cellId; enum HRilRadioTech radioTechnology; int flag; }; -struct IPsRegStatusInfo { +struct PsRegStatusInfo { int notifyType; - enum IHRilRegStatus regStatus; + enum HRilRegStatus regStatus; int lacCode; int cellId; enum HRilRadioTech radioTechnology; @@ -500,29 +508,29 @@ struct IPsRegStatusInfo { boolean isEnDcAvailable; boolean isDcNrRestricted; }; -struct IOperatorInfo { +struct OperatorInfo { String longName; String shortName; String numeric; }; -struct IAvailableNetworkInfo { +struct AvailableNetworkInfo { String longName; String shortName; String numeric; int status; int rat; }; -struct IAvailableNetworkList { +struct AvailableNetworkList { int itemNum; - List availableNetworkInfo; + List availableNetworkInfo; int flag; }; -struct ISetNetworkModeInfo { +struct SetNetworkModeInfo { int selectMode; String oper; int flag; }; -struct ICellListRatGsm { +struct CellListRatGsm { int band; int arfcn; int bsic; @@ -530,20 +538,20 @@ struct ICellListRatGsm { int lac; int rxlev; }; -struct ICellListRatLte { +struct CellListRatLte { int arfcn; int pci; int rsrp; int rsrq; int rxlev; }; -struct ICellListRatWcdma { +struct CellListRatWcdma { int arfcn; int psc; int rscp; int ecno; }; -struct ICellListRatCdma { +struct CellListRatCdma { int systemId; int networkId; int baseId; @@ -554,7 +562,7 @@ struct ICellListRatCdma { int longitude; int latitude; }; -struct ICellListRatTdscdma { +struct CellListRatTdscdma { int arfcn; int syncId; int sc; @@ -565,29 +573,29 @@ struct ICellListRatTdscdma { int rac; int cpid; }; -struct ICellListRatNr { +struct CellListRatNr { int nrArfcn; int pci; int tac; int nci; }; -union IServiceCellParas { - struct ICellListRatGsm gsm; - struct ICellListRatLte lte; - struct ICellListRatWcdma wcdma; - struct ICellListRatCdma cdma; - struct ICellListRatTdscdma tdscdma; - struct ICellListRatNr nr; +union ServiceCellParas { + struct CellListRatGsm gsm; + struct CellListRatLte lte; + struct CellListRatWcdma wcdma; + struct CellListRatCdma cdma; + struct CellListRatTdscdma tdscdma; + struct CellListRatNr nr; }; -struct ICellNearbyInfo { +struct CellNearbyInfo { int ratType; - union IServiceCellParas serviceCells; + union ServiceCellParas serviceCells; }; -struct ICellListNearbyInfo { +struct CellListNearbyInfo { int itemNum; - List cellNearbyInfo; + List cellNearbyInfo; }; -struct ICellRatGsm { +struct CellRatGsm { int band; int arfcn; int bsic; @@ -597,7 +605,7 @@ struct ICellRatGsm { int rxQuality; int ta; }; -struct ICellRatLte { +struct CellRatLte { int arfcn; int cellId; int pci; @@ -606,7 +614,7 @@ struct ICellRatLte { int rsrq; int rssi; }; -struct ICellRatWcdma { +struct CellRatWcdma { int arfcn; int psc; int cellId; @@ -617,7 +625,7 @@ struct ICellRatWcdma { int drx; int ura; }; -struct ICellRatCdma { +struct CellRatCdma { int systemId; int networkId; int baseId; @@ -628,7 +636,7 @@ struct ICellRatCdma { int longitude; int latitude; }; -struct ICellRatTdscdma { +struct CellRatTdscdma { int arfcn; int syncId; int sc; @@ -639,40 +647,36 @@ struct ICellRatTdscdma { int rac; int cpid; }; -struct ICellRatNr { +struct CellRatNr { int nrArfcn; int pci; int tac; int nci; }; -union ICurrentServiceCellParas { - struct ICellRatGsm gsm; - struct ICellRatLte lte; - struct ICellRatWcdma wcdma; - struct ICellRatCdma cdma; - struct ICellRatTdscdma tdscdma; - struct ICellRatNr nr; +union CurrentServiceCellParas { + struct CellRatGsm gsm; + struct CellRatLte lte; + struct CellRatWcdma wcdma; + struct CellRatCdma cdma; + struct CellRatTdscdma tdscdma; + struct CellRatNr nr; }; -struct ICurrentCellInfo { +struct CurrentCellInfo { int ratType; int mcc; int mnc; - union ICurrentServiceCellParas serviceCells; + union CurrentServiceCellParas serviceCells; }; -struct ICellListCurrentInfo { +struct CellListCurrentInfo { int itemNum; - List cellCurrentInfo; + List cellCurrentInfo; }; -struct IPreferredNetworkTypeInfo { +struct PreferredNetworkTypeInfo { int preferredNetworkType; int flag; }; -struct IRadioCapabilityInfo { - int ratFamily; - String modemId; -}; -struct IPhysicalChannelConfig { - enum IHRilCellConnectionStatus cellConnStatus; +struct PhysicalChannelConfig { + enum HRilCellConnectionStatus cellConnStatus; enum HRilRadioTech ratType; int cellBandwidthDownlinkKhz; int cellBandwidthUplinkKhz; @@ -683,9 +687,9 @@ struct IPhysicalChannelConfig { int contextIdNum; List contextIds; }; -struct IChannelConfigInfoList { +struct ChannelConfigInfoList { int itemNum; - List channelConfigInfos; + List channelConfigInfos; int flag; }; struct GsmSmsMessageInfo { -- Gitee From 85badc36998cbce52dd7cda5faf38c94f55634df Mon Sep 17 00:00:00 2001 From: zhengliu1201 Date: Wed, 7 Sep 2022 20:55:06 +0800 Subject: [PATCH 06/11] =?UTF-8?q?IssueNo:SIM=E5=8D=A1IDL=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description:SIM卡IDL改造 Sig:SIG_Telephony Feature or Bugfix: Binary Source: No Signed-off-by: zhengliu1201 Change-Id: I3d3602bedbb8ebec88a6576993eb273044232afc --- ril/v1_0/IRil.idl | 17 +++++++------- ril/v1_0/IRilCallback.idl | 46 ++++++++++++++++++------------------ ril/v1_0/Types.idl | 49 +++++++++++++++------------------------ 3 files changed, 51 insertions(+), 61 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index 71b4c1b2..9b97e798 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -77,12 +77,12 @@ interface IRil { [oneway] GetBasebandVersion([in] int slotId, [in] int serialId); [oneway] ShutDown([in] int slotId, [in] int serialId); - [oneway] GetSimIO([in] int slotId, [in] int serialId, [in] struct ISimIoRequestInfo simIO); + [oneway] GetSimIO([in] int slotId, [in] int serialId, [in] struct SimIoRequestInfo simIO); [oneway] GetSimStatus([in] int slotId, [in] int serialId); [oneway] GetImsi([in] int slotId, [in] int serialId); - [oneway] GetSimLockStatus([in] int slotId, [in] int serialId, [in] struct ISimLockInfo simLockInfo); - [oneway] SetSimLock([in] int slotId, [in] int serialId, [in] struct ISimLockInfo simLockInfo); - [oneway] ChangeSimPassword([in] int slotId, [in] int serialId, [in] struct ISimPasswordInfo simPassword); + [oneway] GetSimLockStatus([in] int slotId, [in] int serialId, [in] struct SimLockInfo simLockInfo); + [oneway] SetSimLock([in] int slotId, [in] int serialId, [in] struct SimLockInfo simLockInfo); + [oneway] ChangeSimPassword([in] int slotId, [in] int serialId, [in] struct SimPasswordInfo simPassword); [oneway] UnlockPin([in] int slotId, [in] int serialId, [in] String pin); [oneway] UnlockPuk([in] int slotId, [in] int serialId, [in] String puk, [in] String pin); [oneway] UnlockPin2([in] int slotId, [in] int serialId, [in] String pin2); @@ -92,15 +92,16 @@ interface IRil { [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 RadioProtocol 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, - [in] struct IApduSimIORequestInfo apduSimIO); + [in] struct ApduSimIORequestInfo apduSimIO); [oneway] SimTransmitApduBasicChannel([in] int slotId, [in] int serialId, - [in] struct IApduSimIORequestInfo apduSimIO); + [in] struct ApduSimIORequestInfo apduSimIO); [oneway] SimAuthentication([in] int slotId, [in] int serialId, - [in] struct ISimAuthenticationRequestInfo simAuthInfo); + [in] struct SimAuthenticationRequestInfo simAuthInfo); [oneway] UnlockSimLock([in] int slotId, [in] int serialId, [in] int lockType, [in] String key); [oneway] GetSignalStrength([in] int slotId, [in] int serialId); diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index 4679f42e..c5893e04 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -91,40 +91,40 @@ import ohos.hdi.ril.v1_0.Types; [in] struct VoiceRadioTechnology voiceRadioTechnology); GetBasebandVersionResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String basebandVersion); - SimStateUpdated([in] int slotId); - SimStkSessionEndNotify([in] int slotId); - SimStkProactiveNotify([in] int slotId, [in] String response); - SimStkAlphaNotify([in] int slotId, [in] String response); - 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 HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); - GetSimStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ICardStatusInfo result); + SimStateUpdated([in] struct HRilRadioResponseInfo responseInfo); + SimStkSessionEndNotify([in] struct HRilRadioResponseInfo responseInfo); + SimStkProactiveNotify([in] struct HRilRadioResponseInfo responseInfo, [in] String response); + SimStkAlphaNotify([in] struct HRilRadioResponseInfo responseInfo, [in] String response); + SimStkEventNotify([in] struct HRilRadioResponseInfo responseInfo, [in] String response); + SimStkCallSetupNotify([in] struct HRilRadioResponseInfo responseInfo); + SimRefreshNotify([in] struct HRilRadioResponseInfo responseInfo); + SimRadioProtocolUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct RadioProtocol radioProtocol); + GetSimIOResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); + GetSimStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct CardStatusInfo result); GetImsiResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String response); GetSimLockStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int simLockStatus); - SetSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - ChangeSimPasswordResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPinResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPukResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPin2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); - UnlockPuk2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + SetSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + ChangeSimPasswordResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPinResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPukResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPin2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPuk2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); SetActiveSimResponse([in] struct HRilRadioResponseInfo responseInfo); SimStkSendTerminalResponseResponse([in] struct HRilRadioResponseInfo responseInfo); SimStkSendEnvelopeResponse([in] struct HRilRadioResponseInfo responseInfo); SimStkSendCallSetupRequestResultResponse([in] struct HRilRadioResponseInfo responseInfo); SimStkIsReadyResponse([in] struct HRilRadioResponseInfo responseInfo); - GetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct IRadioProtocol radioProtocol); - SetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct IRadioProtocol radioProtocol); + GetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct RadioProtocol radioProtocol); + SetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct RadioProtocol radioProtocol); SimOpenLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IOpenLogicalChannelResponse pOpenLogicalChannelResponse); + [in] struct OpenLogicalChannelResponse pOpenLogicalChannelResponse); SimCloseLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo); SimTransmitApduLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IIccIoResultInfo result); + [in] struct IccIoResultInfo result); SimTransmitApduBasicChannelResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IIccIoResultInfo result); - SimAuthenticationResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IIccIoResultInfo result); - UnlockSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct ILockStatusResp lockStatus); + [in] struct IccIoResultInfo result); + SimAuthenticationResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); + UnlockSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); NetworkCsRegStatusUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct CsRegStatusInfo csRegStatusInfo); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 2386194f..179f4e96 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -140,14 +140,14 @@ enum HRilRegNotifyMode { REG_NOTIFY_STAT_ONLY = 1, REG_NOTIFY_STAT_LAC_CELLID = 2, }; -enum IRadioProtocolPhase { +enum RadioProtocolPhase { RADIO_PROTOCOL_PHASE_INITIAL, RADIO_PROTOCOL_PHASE_CHECK, RADIO_PROTOCOL_PHASE_UPDATE, RADIO_PROTOCOL_PHASE_NOTIFY, RADIO_PROTOCOL_PHASE_COMPLETE, }; -enum IRadioProtocolStatus { +enum RadioProtocolStatus { RADIO_PROTOCOL_STATUS_NONE, RADIO_PROTOCOL_STATUS_SUCCESS, RADIO_PROTOCOL_STATUS_FAIL, @@ -364,64 +364,53 @@ struct ISetBarringInfo { String oldPassword; String newPassword; }; -struct ICardStatusInfo { +struct CardStatusInfo { int index; int simType; int simState; }; -struct ISimIoRequestInfo { +struct SimIoRequestInfo { int command; int fileId; int p1; int p2; int p3; + int serial; String data; String path; - int serial; String pin2; String aid; }; -struct IIccIoResultInfo { +struct IccIoResultInfo { int sw1; int sw2; String response; }; -struct ISimLockInfo { +struct SimLockInfo { + int classx; int serial; String fac; int mode; int status; String passwd; - int classx; }; -struct ISimPasswordInfo { - int serial; +struct SimPasswordInfo { String fac; String oldPassword; String newPassword; + int serial; int passwordLength; }; -struct ISimPinInputTimes { +struct SimPinInputTimes { int serial; - String code; int times; int pukTimes; int pinTimes; int puk2Times; int pin2Times; + String code; }; -struct ISimProtocolRequest { - int serial; - int phase; - int protocol; - int slotId; -}; -struct ISimProtocolResponse { - int phase; - int result; - int slotId; -}; -struct IApduSimIORequestInfo { +struct ApduSimIORequestInfo { int serial; int channelId; int type; @@ -431,28 +420,28 @@ struct IApduSimIORequestInfo { int p3; String data; }; -struct ISimAuthenticationRequestInfo { +struct SimAuthenticationRequestInfo { int serial; String aid; String authData; }; -struct IOpenLogicalChannelResponse { +struct OpenLogicalChannelResponse { int sw1; int sw2; int channelId; String response; }; -struct ILockStatusResp { +struct LockStatusResp { int result; int remain; }; -struct IRadioProtocol { +struct RadioProtocol { int slotId; int sessionId; - enum IRadioProtocolPhase phase; + enum RadioProtocolPhase phase; int technology; int modemId; - enum IRadioProtocolStatus status; + enum RadioProtocolStatus status; }; struct GsmRssi { int rxlev; -- Gitee From f68b32fd4ab006c86e896973c4690ba01ad6c37c Mon Sep 17 00:00:00 2001 From: qiusz0701 Date: Wed, 7 Sep 2022 17:30:11 +0800 Subject: [PATCH 07/11] =?UTF-8?q?IssueNo:=20Call=E6=A8=A1=E5=9D=97IDL?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: Call模块IDL优化 Sig: SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: qiusz0701 Change-Id: I5b4fccc0dfb286e34e60d16ed867c047558156c7 --- ril/v1_0/IRil.idl | 14 +++++------ ril/v1_0/IRilCallback.idl | 27 ++++++++++++--------- ril/v1_0/Types.idl | 50 +++++++++++++++++++-------------------- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index 9b97e798..e0310eba 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -23,7 +23,7 @@ interface IRil { [oneway] SetEmergencyCallList([in] int slotId, [in] int serialId, [in] struct EmergencyInfoList emergencyInfoList); [oneway] GetEmergencyCallList([in] int slotId, [in] int serialId); [oneway] GetCallList([in] int slotId, [in] int serialId); - [oneway] Dial([in] int slotId, [in] int serialId, [in] struct IDialInfo dialInfo); + [oneway] Dial([in] int slotId, [in] int serialId, [in] struct DialInfo dialInfo); [oneway] Reject([in] int slotId, [in] int serialId); [oneway] Hangup([in] int slotId, [in] int serialId, [in] int gsmIndex); [oneway] Answer([in] int slotId, [in] int serialId); @@ -36,10 +36,10 @@ interface IRil { [oneway] SetCallWaiting([in] int slotId, [in] int serialId, [in] int activate); [oneway] GetCallTransferInfo([in] int slotId, [in] int serialId, [in] int reason); [oneway] SetCallTransferInfo([in] int slotId, [in] int serialId, - [in] struct ICallForwardSetInfo callForwardSetInfo); + [in] struct CallForwardSetInfo callForwardSetInfo); [oneway] GetCallRestriction([in] int slotId, [in] int serialId, [in] String fac); [oneway] SetCallRestriction([in] int slotId, [in] int serialId, - [in] struct ICallRestrictionInfo callRestrictionInfo); + [in] struct CallRestrictionInfo callRestrictionInfo); [oneway] GetClip([in] int slotId, [in] int serialId); [oneway] SetClip([in] int slotId, [in] int serialId, [in] int action); [oneway] GetClir([in] int slotId, [in] int serialId); @@ -52,10 +52,10 @@ interface IRil { [oneway] GetMute([in] int slotId, [in] int serialId); [oneway] GetCallFailReason([in] int slotId, [in] int serialId); [oneway] CallSupplement([in] int slotId, [in] int serialId, [in] int type); - [oneway] SendDtmf([in] int slotId, [in] int serialId, [in] struct IDtmfInfo dtmfInfo); - [oneway] StartDtmf([in] int slotId, [in] int serialId, [in] struct IDtmfInfo dtmfInfo); - [oneway] StopDtmf([in] int slotId, [in] int serialId, [in] struct IDtmfInfo dtmfInfo); - [oneway] SetBarringPassword([in] int slotId, [in] int serialId, [in] struct ISetBarringInfo setBarringInfo); + [oneway] SendDtmf([in] int slotId, [in] int serialId, [in] struct DtmfInfo dtmfInfo); + [oneway] StartDtmf([in] int slotId, [in] int serialId, [in] struct DtmfInfo dtmfInfo); + [oneway] StopDtmf([in] int slotId, [in] int serialId, [in] struct DtmfInfo dtmfInfo); + [oneway] SetBarringPassword([in] int slotId, [in] int serialId, [in] struct SetBarringInfo setBarringInfo); [oneway] ActivatePdpContext([in] int slotId, [in] int serialId, [in] struct DataCallInfo dataCallInfo); [oneway] DeactivatePdpContext([in] int slotId, [in] int serialId, [in] struct UniInfo uniInfo); diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index c5893e04..51c55c6d 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -20,16 +20,21 @@ import ohos.hdi.ril.v1_0.Types; [callback] interface IRilCallback { CallEmergencyNotice([in] struct HRilRadioResponseInfo responseInfo, [in] struct EmergencyInfoList emergencyInfoList); - CallStateUpdated([in] int slotId, [in] int type); - CallRingbackVoiceNotice([in] int slotId, [in] struct IRingbackVoice ringbackVoice); - CallSrvccStatusNotice([in] int slotId, [in] struct ISrvccStatus srvccStatus); - CallUssdNotice([in] int slotId, [in] struct IUssdNoticeInfo ussdNoticeInfo); - CallSsNotice([in] int slotId, [in] struct ISsNoticeInfo ssNoticeInfo); + CallStateUpdated([in] struct HRilRadioResponseInfo responseInfo); + CallRingbackVoiceNotice([in] struct HRilRadioResponseInfo responseInfo, + [in] struct RingbackVoice ringbackVoice); + CallSrvccStatusNotice([in] struct HRilRadioResponseInfo responseInfo, + [in] struct SrvccStatus srvccStatus); + CallUssdNotice([in] struct HRilRadioResponseInfo responseInfo, + [in] struct UssdNoticeInfo ussdNoticeInfo); + CallSsNotice([in] struct HRilRadioResponseInfo responseInfo, + [in] struct SsNoticeInfo ssNoticeInfo); + SetEmergencyCallListResponse([in] struct HRilRadioResponseInfo responseInfo); GetEmergencyCallListResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct EmergencyInfoList emergencyInfoList); GetCallListResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICallInfoList callList); + [in] struct CallInfoList callList); DialResponse([in] struct HRilRadioResponseInfo responseInfo); HangupResponse([in] struct HRilRadioResponseInfo responseInfo); RejectResponse([in] struct HRilRadioResponseInfo responseInfo); @@ -38,22 +43,22 @@ import ohos.hdi.ril.v1_0.Types; UnHoldCallResponse([in] struct HRilRadioResponseInfo responseInfo); SwitchCallResponse([in] struct HRilRadioResponseInfo responseInfo); GetClipResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IGetClipResult getClipResult); + [in] struct GetClipResult getClipResult); SetClipResponse([in] struct HRilRadioResponseInfo responseInfo); CombineConferenceResponse([in] struct HRilRadioResponseInfo responseInfo); SeparateConferenceResponse([in] struct HRilRadioResponseInfo responseInfo); CallSupplementResponse([in] struct HRilRadioResponseInfo responseInfo); GetCallWaitingResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICallWaitResult callWaitResult); + [in] struct CallWaitResult callWaitResult); SetCallWaitingResponse([in] struct HRilRadioResponseInfo responseInfo); GetCallTransferInfoResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICallForwardQueryInfoList cFQueryList); + [in] struct CallForwardQueryInfoList cFQueryList); SetCallTransferInfoResponse([in] struct HRilRadioResponseInfo responseInfo); GetCallRestrictionResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct ICallRestrictionResult result); + [in] struct CallRestrictionResult result); SetCallRestrictionResponse([in] struct HRilRadioResponseInfo responseInfo); GetClirResponse([in] struct HRilRadioResponseInfo responseInfo, - [in] struct IGetClirResult getClirResult); + [in] struct GetClirResult getClirResult); SetClirResponse([in] struct HRilRadioResponseInfo responseInfo); StartDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); SendDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 179f4e96..e093f94e 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -268,12 +268,12 @@ struct VoiceRadioTechnology { String actName; int flag; }; -struct IDialInfo { +struct DialInfo { int serial; - String address; int clir; + String address; }; -struct ICallInfo { +struct CallInfo { int index; int dir; int state; @@ -281,85 +281,85 @@ struct ICallInfo { int mpty; int voiceDomain; int callType; - String number; int type; + String number; String alpha; }; -struct ICallInfoList { +struct CallInfoList { int callSize; int flag; - List calls; + List calls; }; -struct IGetClipResult { +struct GetClipResult { int result; int action; int clipStat; }; -struct IGetClirResult { +struct GetClirResult { int result; int action; int clirStat; }; -struct ICallWaitResult { +struct CallWaitResult { int result; int status; int classCw; }; -struct ICallRestrictionInfo { - String fac; +struct CallRestrictionInfo { int mode; + String fac; String password; }; -struct ICallRestrictionResult { +struct CallRestrictionResult { int result; int status; int classCw; }; -struct ICallForwardSetInfo { +struct CallForwardSetInfo { int reason; int mode; - String number; int classx; + String number; }; -struct ICallForwardQueryResult { +struct CallForwardQueryResult { int serial; int result; int status; int classx; - String number; int type; int reason; int time; + String number; }; -struct ICallForwardQueryInfoList { +struct CallForwardQueryInfoList { int callSize; int flag; - List calls; + List calls; }; -struct IUssdNoticeInfo { +struct UssdNoticeInfo { int m; String str; }; -struct ISsNoticeInfo { +struct SsNoticeInfo { int serviceType; int requestType; int serviceClass; int result; }; -struct ISrvccStatus { +struct SrvccStatus { int status; }; -struct IRingbackVoice { +struct RingbackVoice { int status; }; -struct IDtmfInfo { +struct DtmfInfo { int callId; - String dtmfKey; int onLength; int offLength; int stringLength; + String dtmfKey; }; -struct ISetBarringInfo { +struct SetBarringInfo { String fac; String oldPassword; String newPassword; -- Gitee From 8394bbe87f768b15dcf09b56d47f49e99d75f4d0 Mon Sep 17 00:00:00 2001 From: "cheng.wang_c" Date: Thu, 8 Sep 2022 14:38:37 +0800 Subject: [PATCH 08/11] update --- ril/v1_0/BUILD.gn | 2 +- ril/v1_0/Types.idl | 112 ++++++++++++++++++++++----------------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/ril/v1_0/BUILD.gn b/ril/v1_0/BUILD.gn index 31d5238c..0746f079 100644 --- a/ril/v1_0/BUILD.gn +++ b/ril/v1_0/BUILD.gn @@ -21,8 +21,8 @@ if (defined(ohos_lite)) { hdi("ril") { module_name = "ril_service" sources = [ - "IRilCallback.idl", "IRil.idl", + "IRilCallback.idl", "Types.idl", ] language = "cpp" diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index e093f94e..61d86ad4 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -62,64 +62,64 @@ enum HRilResponseTypes { HRIL_RESPONSE_NOTICE_MUST_ACK = 4, }; enum HRilSrvStatus { - HRIL_NO_SRV_SERVICE = 0, - HRIL_RESTRICTED_SERVICE = 1, - HRIL_SERVICE_VALID = 2, - HRIL_REGIONAL_SERVICE = 3, - HRIL_ENERGY_SAVING_SERVICE = 4, + HRIL_NO_SRV_SERVICE = 0, + HRIL_RESTRICTED_SERVICE = 1, + HRIL_SERVICE_VALID = 2, + HRIL_REGIONAL_SERVICE = 3, + HRIL_ENERGY_SAVING_SERVICE = 4, }; enum HRilSrvDomain { - HRIL_NO_DOMAIN_SERVICE = 0, - HRIL_CS_SERVICE = 1, - HRIL_PS_SERVICE = 2, - HRIL_CS_PS_SERVICE = 3, - HRIL_CS_PS_SEARCHING = 4, - HRIL_CDMA_NOT_SUPPORT = 255, + HRIL_NO_DOMAIN_SERVICE = 0, + HRIL_CS_SERVICE = 1, + HRIL_PS_SERVICE = 2, + HRIL_CS_PS_SERVICE = 3, + HRIL_CS_PS_SEARCHING = 4, + HRIL_CDMA_NOT_SUPPORT = 255, }; enum HRilRoamStatus { - HRIL_NO_ROAM = 0, - HRIL_ROAMING = 1, - HRIL_ROAM_UNKNOWN = 2, + HRIL_NO_ROAM = 0, + HRIL_ROAMING = 1, + HRIL_ROAM_UNKNOWN = 2, }; enum HRilSimLockStatus { - HRIL_SIM_CARD_UNLOCK = 0, - HRIL_SIM_CARD_LOCK = 1, + HRIL_SIM_CARD_UNLOCK = 0, + HRIL_SIM_CARD_LOCK = 1, }; enum HRilSysMode { - HRIL_NO_SYSMODE_SERVICE = 0, - HRIL_GSM_MODE = 1, - HRIL_CDMA_MODE = 2, - HRIL_WCDMA_MODE = 3, - HRIL_TDSCDMA_MODE = 4, - HRIL_WIMAX_MODE = 5, - HRIL_LTE_MODE = 6, - HRIL_LTE_CA_MODE = 7, - HRIL_NR_MODE = 8, + HRIL_NO_SYSMODE_SERVICE = 0, + HRIL_GSM_MODE = 1, + HRIL_CDMA_MODE = 2, + HRIL_WCDMA_MODE = 3, + HRIL_TDSCDMA_MODE = 4, + HRIL_WIMAX_MODE = 5, + HRIL_LTE_MODE = 6, + HRIL_LTE_CA_MODE = 7, + HRIL_NR_MODE = 8, }; enum HRilRadioTech { - RADIO_TECHNOLOGY_INVALID = 65535, - RADIO_TECHNOLOGY_UNKNOWN = 0, - RADIO_TECHNOLOGY_GSM = 1, - RADIO_TECHNOLOGY_1XRTT = 2, - RADIO_TECHNOLOGY_WCDMA = 3, - RADIO_TECHNOLOGY_HSPA = 4, - RADIO_TECHNOLOGY_HSPAP = 5, - RADIO_TECHNOLOGY_TD_SCDMA = 6, - RADIO_TECHNOLOGY_EVDO = 7, - RADIO_TECHNOLOGY_EHRPD = 8, - RADIO_TECHNOLOGY_LTE = 9, - RADIO_TECHNOLOGY_LTE_CA = 10, - RADIO_TECHNOLOGY_IWLAN = 11, - RADIO_TECHNOLOGY_NR = 12, + RADIO_TECHNOLOGY_INVALID = 65535, + RADIO_TECHNOLOGY_UNKNOWN = 0, + RADIO_TECHNOLOGY_GSM = 1, + RADIO_TECHNOLOGY_1XRTT = 2, + RADIO_TECHNOLOGY_WCDMA = 3, + RADIO_TECHNOLOGY_HSPA = 4, + RADIO_TECHNOLOGY_HSPAP = 5, + RADIO_TECHNOLOGY_TD_SCDMA = 6, + RADIO_TECHNOLOGY_EVDO = 7, + RADIO_TECHNOLOGY_EHRPD = 8, + RADIO_TECHNOLOGY_LTE = 9, + RADIO_TECHNOLOGY_LTE_CA = 10, + RADIO_TECHNOLOGY_IWLAN = 11, + RADIO_TECHNOLOGY_NR = 12, }; enum HRilSimStatus { - HRIL_USIM_INVALID = 0, - HRIL_USIM_VALID = 1, - HRIL_USIM_CS_INVALID = 2, - HRIL_USIM_PS_INVALID = 3, - HRIL_USIM_CS_PS_INVALID = 4, - HRIL_ROM_SIM = 240, - HRIL_NO_USIM = 255, + HRIL_USIM_INVALID = 0, + HRIL_USIM_VALID = 1, + HRIL_USIM_CS_INVALID = 2, + HRIL_USIM_PS_INVALID = 3, + HRIL_USIM_CS_PS_INVALID = 4, + HRIL_ROM_SIM = 240, + HRIL_NO_USIM = 255, }; enum HRilRegStatus { NO_REG_MT_NO_SEARCH = 0, @@ -257,16 +257,16 @@ struct UniInfo { String strTmp; }; struct VoiceRadioTechnology { - enum HRilSrvStatus srvStatus; - enum HRilSrvDomain srvDomain; - enum HRilRoamStatus roamStatus; - enum HRilSimStatus simStatus; - enum HRilSimLockStatus lockStatus; - enum HRilSysMode sysMode; - String sysModeName; - enum HRilRadioTech actType; - String actName; - int flag; + enum HRilSrvStatus srvStatus; + enum HRilSrvDomain srvDomain; + enum HRilRoamStatus roamStatus; + enum HRilSimStatus simStatus; + enum HRilSimLockStatus lockStatus; + enum HRilSysMode sysMode; + String sysModeName; + enum HRilRadioTech actType; + String actName; + int flag; }; struct DialInfo { int serial; -- Gitee From 13132ae5616ce807f3debb310e7d033b279dc172 Mon Sep 17 00:00:00 2001 From: qiusz0701 Date: Thu, 8 Sep 2022 18:56:13 +0800 Subject: [PATCH 09/11] =?UTF-8?q?IssueNo:=20=E4=BF=AE=E6=94=B9UssdNoticeIn?= =?UTF-8?q?fo=E7=BB=93=E6=9E=84=E4=BD=93=E5=8F=82=E6=95=B0=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: 修改UssdNoticeInfo结构体参数描述 Sig: SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: qiusz0701 Change-Id: I12f935dc5aeee8e1456b327603d66479f08a1520 --- ril/v1_0/Types.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 61d86ad4..15497497 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -337,8 +337,8 @@ struct CallForwardQueryInfoList { List calls; }; struct UssdNoticeInfo { - int m; - String str; + int type; + String message; }; struct SsNoticeInfo { int serviceType; -- Gitee From a7a49bf88318a026d1c8c168702f190c444f8e05 Mon Sep 17 00:00:00 2001 From: "cheng.wang_c" Date: Thu, 8 Sep 2022 14:30:08 +0800 Subject: [PATCH 10/11] IssueNo: idl code check Description: fix idl code check Sig:SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: cheng.wang_c Change-Id: Ib09076290ce555e6a3e3ba7151d11220265454d2 --- ril/v1_0/IRil.idl | 2 +- ril/v1_0/IRilCallback.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index e2a0f9d4..df2ffd23 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -138,5 +138,5 @@ interface IRil { [oneway] SendSmsMoreMode([in] int slotId, [in] int serialId, [in] struct GsmSmsMessageInfo gsmSmsMessageInfo); [oneway] SendSmsAck([in] int slotId, [in] int serialId, [in] struct ModeData modeData); - [oneway] SendRadioAck(); + [oneway] SendRilAck(); } diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index 51c55c6d..7182f188 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -194,5 +194,5 @@ import ohos.hdi.ril.v1_0.Types; [in] struct SendSmsResultInfo sendSmsResultInfo); SendSmsAckResponse([in] struct HRilRadioResponseInfo responseInfo); - ErrorResponse([in] struct HRilRadioResponseInfo responseInfo); + CommonErrorResponse([in] struct HRilRadioResponseInfo responseInfo); } -- Gitee From 232b4035792846f7f11130d20644c01180283253 Mon Sep 17 00:00:00 2001 From: "cheng.wang_c" Date: Thu, 8 Sep 2022 14:30:08 +0800 Subject: [PATCH 11/11] IssueNo: idl code check Description: fix idl code check Sig:SIG_Telephony Feature or Bugfix: Feature Binary Source: No Signed-off-by: cheng.wang_c Change-Id: Ib09076290ce555e6a3e3ba7151d11220265454d2 --- ril/v1_0/IRil.idl | 2 +- ril/v1_0/IRilCallback.idl | 264 +++++++++++++++++++------------------- ril/v1_0/Types.idl | 227 ++++++++++++++++---------------- 3 files changed, 246 insertions(+), 247 deletions(-) diff --git a/ril/v1_0/IRil.idl b/ril/v1_0/IRil.idl index df2ffd23..bb6ca5dc 100644 --- a/ril/v1_0/IRil.idl +++ b/ril/v1_0/IRil.idl @@ -117,7 +117,7 @@ interface IRil { [oneway] SetPreferredNetwork([in] int slotId, [in] int serialId, [in] int preferredNetworkType); [oneway] GetPreferredNetwork([in] int slotId, [in] int serialId); [oneway] GetPhysicalChannelConfig([in] int slotId, [in] int serialId); - [oneway] SetLocateUpdates([in] int slotId, [in] int serialId, [in] enum HRilRegNotifyMode mode); + [oneway] SetLocateUpdates([in] int slotId, [in] int serialId, [in] enum RilRegNotifyMode mode); [oneway] SetNotificationFilter([in] int slotId, [in] int serialId, [in] int newFilter); [oneway] SetDeviceState([in] int slotId, [in] int serialId, [in] int deviceStateType, [in] int deviceStateOn); diff --git a/ril/v1_0/IRilCallback.idl b/ril/v1_0/IRilCallback.idl index 7182f188..f818229f 100644 --- a/ril/v1_0/IRilCallback.idl +++ b/ril/v1_0/IRilCallback.idl @@ -18,181 +18,181 @@ package ohos.hdi.ril.v1_0; import ohos.hdi.ril.v1_0.Types; [callback] interface IRilCallback { - CallEmergencyNotice([in] struct HRilRadioResponseInfo responseInfo, + CallEmergencyNotice([in] struct RilRadioResponseInfo responseInfo, [in] struct EmergencyInfoList emergencyInfoList); - CallStateUpdated([in] struct HRilRadioResponseInfo responseInfo); - CallRingbackVoiceNotice([in] struct HRilRadioResponseInfo responseInfo, + CallStateUpdated([in] struct RilRadioResponseInfo responseInfo); + CallRingbackVoiceNotice([in] struct RilRadioResponseInfo responseInfo, [in] struct RingbackVoice ringbackVoice); - CallSrvccStatusNotice([in] struct HRilRadioResponseInfo responseInfo, + CallSrvccStatusNotice([in] struct RilRadioResponseInfo responseInfo, [in] struct SrvccStatus srvccStatus); - CallUssdNotice([in] struct HRilRadioResponseInfo responseInfo, + CallUssdNotice([in] struct RilRadioResponseInfo responseInfo, [in] struct UssdNoticeInfo ussdNoticeInfo); - CallSsNotice([in] struct HRilRadioResponseInfo responseInfo, + CallSsNotice([in] struct RilRadioResponseInfo responseInfo, [in] struct SsNoticeInfo ssNoticeInfo); - SetEmergencyCallListResponse([in] struct HRilRadioResponseInfo responseInfo); - GetEmergencyCallListResponse([in] struct HRilRadioResponseInfo responseInfo, + SetEmergencyCallListResponse([in] struct RilRadioResponseInfo responseInfo); + GetEmergencyCallListResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct EmergencyInfoList emergencyInfoList); - GetCallListResponse([in] struct HRilRadioResponseInfo responseInfo, + GetCallListResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CallInfoList callList); - DialResponse([in] struct HRilRadioResponseInfo responseInfo); - HangupResponse([in] struct HRilRadioResponseInfo responseInfo); - RejectResponse([in] struct HRilRadioResponseInfo responseInfo); - AnswerResponse([in] struct HRilRadioResponseInfo responseInfo); - HoldCallResponse([in] struct HRilRadioResponseInfo responseInfo); - UnHoldCallResponse([in] struct HRilRadioResponseInfo responseInfo); - SwitchCallResponse([in] struct HRilRadioResponseInfo responseInfo); - GetClipResponse([in] struct HRilRadioResponseInfo responseInfo, + DialResponse([in] struct RilRadioResponseInfo responseInfo); + HangupResponse([in] struct RilRadioResponseInfo responseInfo); + RejectResponse([in] struct RilRadioResponseInfo responseInfo); + AnswerResponse([in] struct RilRadioResponseInfo responseInfo); + HoldCallResponse([in] struct RilRadioResponseInfo responseInfo); + UnHoldCallResponse([in] struct RilRadioResponseInfo responseInfo); + SwitchCallResponse([in] struct RilRadioResponseInfo responseInfo); + GetClipResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct GetClipResult getClipResult); - SetClipResponse([in] struct HRilRadioResponseInfo responseInfo); - CombineConferenceResponse([in] struct HRilRadioResponseInfo responseInfo); - SeparateConferenceResponse([in] struct HRilRadioResponseInfo responseInfo); - CallSupplementResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCallWaitingResponse([in] struct HRilRadioResponseInfo responseInfo, + SetClipResponse([in] struct RilRadioResponseInfo responseInfo); + CombineConferenceResponse([in] struct RilRadioResponseInfo responseInfo); + SeparateConferenceResponse([in] struct RilRadioResponseInfo responseInfo); + CallSupplementResponse([in] struct RilRadioResponseInfo responseInfo); + GetCallWaitingResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CallWaitResult callWaitResult); - SetCallWaitingResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCallTransferInfoResponse([in] struct HRilRadioResponseInfo responseInfo, + SetCallWaitingResponse([in] struct RilRadioResponseInfo responseInfo); + GetCallTransferInfoResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CallForwardQueryInfoList cFQueryList); - SetCallTransferInfoResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCallRestrictionResponse([in] struct HRilRadioResponseInfo responseInfo, + SetCallTransferInfoResponse([in] struct RilRadioResponseInfo responseInfo); + GetCallRestrictionResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CallRestrictionResult result); - SetCallRestrictionResponse([in] struct HRilRadioResponseInfo responseInfo); - GetClirResponse([in] struct HRilRadioResponseInfo responseInfo, + SetCallRestrictionResponse([in] struct RilRadioResponseInfo responseInfo); + GetClirResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct GetClirResult getClirResult); - SetClirResponse([in] struct HRilRadioResponseInfo responseInfo); - StartDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); - SendDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); - StopDtmfResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCallPreferenceModeResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int mode); - SetCallPreferenceModeResponse([in] struct HRilRadioResponseInfo responseInfo); - SetUssdResponse([in] struct HRilRadioResponseInfo responseInfo); - GetUssdResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int cusd); - SetMuteResponse([in] struct HRilRadioResponseInfo responseInfo); - GetMuteResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int mute); - GetCallFailReasonResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int callFail); - SetBarringPasswordResponse([in] struct HRilRadioResponseInfo responseInfo); + SetClirResponse([in] struct RilRadioResponseInfo responseInfo); + StartDtmfResponse([in] struct RilRadioResponseInfo responseInfo); + SendDtmfResponse([in] struct RilRadioResponseInfo responseInfo); + StopDtmfResponse([in] struct RilRadioResponseInfo responseInfo); + GetCallPreferenceModeResponse([in] struct RilRadioResponseInfo responseInfo, [in] int mode); + SetCallPreferenceModeResponse([in] struct RilRadioResponseInfo responseInfo); + SetUssdResponse([in] struct RilRadioResponseInfo responseInfo); + GetUssdResponse([in] struct RilRadioResponseInfo responseInfo, [in] int cusd); + SetMuteResponse([in] struct RilRadioResponseInfo responseInfo); + GetMuteResponse([in] struct RilRadioResponseInfo responseInfo, [in] int mute); + GetCallFailReasonResponse([in] struct RilRadioResponseInfo responseInfo, [in] int callFail); + SetBarringPasswordResponse([in] struct RilRadioResponseInfo responseInfo); - PdpContextListUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct DataCallResultList dataCallResultList); - ActivatePdpContextResponse([in] struct HRilRadioResponseInfo responseInfo, + PdpContextListUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct DataCallResultList dataCallResultList); + ActivatePdpContextResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct SetupDataCallResultInfo setupDataCallResultInfo); - DeactivatePdpContextResponse([in] struct HRilRadioResponseInfo responseInfo); - GetPdpContextListResponse([in] struct HRilRadioResponseInfo responseInfo, + DeactivatePdpContextResponse([in] struct RilRadioResponseInfo responseInfo); + GetPdpContextListResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct DataCallResultList dataCallResultList); - SetInitApnInfoResponse([in] struct HRilRadioResponseInfo responseInfo); - GetLinkBandwidthInfoResponse([in] struct HRilRadioResponseInfo responseInfo, + SetInitApnInfoResponse([in] struct RilRadioResponseInfo responseInfo); + GetLinkBandwidthInfoResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct DataLinkBandwidthInfo dataLinkBandwidthInfo); - SetLinkBandwidthReportingRuleResponse([in] struct HRilRadioResponseInfo responseInfo); - SetDataPermittedResponse([in] struct HRilRadioResponseInfo responseInfo); + SetLinkBandwidthReportingRuleResponse([in] struct RilRadioResponseInfo responseInfo); + SetDataPermittedResponse([in] struct RilRadioResponseInfo responseInfo); - RadioStateUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] int state); - VoiceRadioTechUpdated([in] struct HRilRadioResponseInfo responseInfo, + RadioStateUpdated([in] struct RilRadioResponseInfo responseInfo, [in] int state); + VoiceRadioTechUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct VoiceRadioTechnology voiceRadioTechnology); - ShutDownResponse([in] struct HRilRadioResponseInfo responseInfo); - SetRadioStateResponse([in] struct HRilRadioResponseInfo responseInfo); - GetRadioStateResponse([in] struct HRilRadioResponseInfo responseInfo,[in] int state); - GetImeiResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String imei); - GetMeidResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String meid); - GetVoiceRadioTechnologyResponse([in] struct HRilRadioResponseInfo responseInfo, + ShutDownResponse([in] struct RilRadioResponseInfo responseInfo); + SetRadioStateResponse([in] struct RilRadioResponseInfo responseInfo); + GetRadioStateResponse([in] struct RilRadioResponseInfo responseInfo,[in] int state); + GetImeiResponse([in] struct RilRadioResponseInfo responseInfo, [in] String imei); + GetMeidResponse([in] struct RilRadioResponseInfo responseInfo, [in] String meid); + GetVoiceRadioTechnologyResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct VoiceRadioTechnology voiceRadioTechnology); - GetBasebandVersionResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String basebandVersion); + GetBasebandVersionResponse([in] struct RilRadioResponseInfo responseInfo, [in] String basebandVersion); - SimStateUpdated([in] struct HRilRadioResponseInfo responseInfo); - SimStkSessionEndNotify([in] struct HRilRadioResponseInfo responseInfo); - SimStkProactiveNotify([in] struct HRilRadioResponseInfo responseInfo, [in] String response); - SimStkAlphaNotify([in] struct HRilRadioResponseInfo responseInfo, [in] String response); - SimStkEventNotify([in] struct HRilRadioResponseInfo responseInfo, [in] String response); - SimStkCallSetupNotify([in] struct HRilRadioResponseInfo responseInfo); - SimRefreshNotify([in] struct HRilRadioResponseInfo responseInfo); - SimRadioProtocolUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct RadioProtocol radioProtocol); - GetSimIOResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); - GetSimStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct CardStatusInfo result); - GetImsiResponse([in] struct HRilRadioResponseInfo responseInfo, [in] String response); - GetSimLockStatusResponse([in] struct HRilRadioResponseInfo responseInfo, [in] int simLockStatus); - SetSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - ChangeSimPasswordResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - UnlockPinResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - UnlockPukResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - UnlockPin2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - UnlockPuk2Response([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - SetActiveSimResponse([in] struct HRilRadioResponseInfo responseInfo); - SimStkSendTerminalResponseResponse([in] struct HRilRadioResponseInfo responseInfo); - SimStkSendEnvelopeResponse([in] struct HRilRadioResponseInfo responseInfo); - SimStkSendCallSetupRequestResultResponse([in] struct HRilRadioResponseInfo responseInfo); - SimStkIsReadyResponse([in] struct HRilRadioResponseInfo responseInfo); - GetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct RadioProtocol radioProtocol); - SetRadioProtocolResponse([in] struct HRilRadioResponseInfo responseInfo,[in] struct RadioProtocol radioProtocol); - SimOpenLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo, + SimStateUpdated([in] struct RilRadioResponseInfo responseInfo); + SimStkSessionEndNotify([in] struct RilRadioResponseInfo responseInfo); + SimStkProactiveNotify([in] struct RilRadioResponseInfo responseInfo, [in] String response); + SimStkAlphaNotify([in] struct RilRadioResponseInfo responseInfo, [in] String response); + SimStkEventNotify([in] struct RilRadioResponseInfo responseInfo, [in] String response); + SimStkCallSetupNotify([in] struct RilRadioResponseInfo responseInfo); + SimRefreshNotify([in] struct RilRadioResponseInfo responseInfo); + SimRadioProtocolUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct RadioProtocol radioProtocol); + GetSimIOResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); + GetSimStatusResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CardStatusInfo result); + GetImsiResponse([in] struct RilRadioResponseInfo responseInfo, [in] String response); + GetSimLockStatusResponse([in] struct RilRadioResponseInfo responseInfo, [in] int simLockStatus); + SetSimLockResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + ChangeSimPasswordResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPinResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPukResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPin2Response([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + UnlockPuk2Response([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + SetActiveSimResponse([in] struct RilRadioResponseInfo responseInfo); + SimStkSendTerminalResponseResponse([in] struct RilRadioResponseInfo responseInfo); + SimStkSendEnvelopeResponse([in] struct RilRadioResponseInfo responseInfo); + SimStkSendCallSetupRequestResultResponse([in] struct RilRadioResponseInfo responseInfo); + SimStkIsReadyResponse([in] struct RilRadioResponseInfo responseInfo); + GetRadioProtocolResponse([in] struct RilRadioResponseInfo responseInfo,[in] struct RadioProtocol radioProtocol); + SetRadioProtocolResponse([in] struct RilRadioResponseInfo responseInfo,[in] struct RadioProtocol radioProtocol); + SimOpenLogicalChannelResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct OpenLogicalChannelResponse pOpenLogicalChannelResponse); - SimCloseLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo); - SimTransmitApduLogicalChannelResponse([in] struct HRilRadioResponseInfo responseInfo, + SimCloseLogicalChannelResponse([in] struct RilRadioResponseInfo responseInfo); + SimTransmitApduLogicalChannelResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); - SimTransmitApduBasicChannelResponse([in] struct HRilRadioResponseInfo responseInfo, + SimTransmitApduBasicChannelResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); - SimAuthenticationResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); - UnlockSimLockResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); + SimAuthenticationResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct IccIoResultInfo result); + UnlockSimLockResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct LockStatusResp lockStatus); - NetworkCsRegStatusUpdated([in] struct HRilRadioResponseInfo responseInfo, + NetworkCsRegStatusUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct CsRegStatusInfo csRegStatusInfo); - NetworkPsRegStatusUpdated([in] struct HRilRadioResponseInfo responseInfo, + NetworkPsRegStatusUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct PsRegStatusInfo psRegStatusInfo); - SignalStrengthUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] struct Rssi rssi); - NetworkTimeZoneUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] String timeZoneStr); - NetworkTimeUpdated([in] struct HRilRadioResponseInfo responseInfo, [in] String timeStr); - NetworkPhyChnlCfgUpdated([in] struct HRilRadioResponseInfo responseInfo, + SignalStrengthUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct Rssi rssi); + NetworkTimeZoneUpdated([in] struct RilRadioResponseInfo responseInfo, [in] String timeZoneStr); + NetworkTimeUpdated([in] struct RilRadioResponseInfo responseInfo, [in] String timeStr); + NetworkPhyChnlCfgUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct ChannelConfigInfoList channelConfigInfoList); - NetworkCurrentCellUpdated([in] struct HRilRadioResponseInfo responseInfo, + NetworkCurrentCellUpdated([in] struct RilRadioResponseInfo responseInfo, [in] struct CellListCurrentInfo cellListCurrentInfo); - GetSignalStrengthResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct Rssi rssi); - GetCsRegStatusResponse([in] struct HRilRadioResponseInfo responseInfo, + GetSignalStrengthResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct Rssi rssi); + GetCsRegStatusResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CsRegStatusInfo csRegStatusInfo); - GetPsRegStatusResponse([in] struct HRilRadioResponseInfo responseInfo, + GetPsRegStatusResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct PsRegStatusInfo psRegStatusInfo); - GetOperatorInfoResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct OperatorInfo psRegStatusInfo); - GetNetworkSearchInformationResponse([in] struct HRilRadioResponseInfo responseInfo, + GetOperatorInfoResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct OperatorInfo psRegStatusInfo); + GetNetworkSearchInformationResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct AvailableNetworkList availableNetworkList); - GetNetworkSelectionModeResponse([in] struct HRilRadioResponseInfo responseInfo, + GetNetworkSelectionModeResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct SetNetworkModeInfo setNetworkModeInfo); - SetNetworkSelectionModeResponse([in] struct HRilRadioResponseInfo responseInfo); - GetNeighboringCellInfoListResponse([in] struct HRilRadioResponseInfo responseInfo, + SetNetworkSelectionModeResponse([in] struct RilRadioResponseInfo responseInfo); + GetNeighboringCellInfoListResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CellListNearbyInfo cellListNearbyInfo); - GetCurrentCellInfoResponse([in] struct HRilRadioResponseInfo responseInfo, + GetCurrentCellInfoResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CellListCurrentInfo cellListCurrentInfo); - SetPreferredNetworkResponse([in] struct HRilRadioResponseInfo responseInfo); - GetPreferredNetworkResponse([in] struct HRilRadioResponseInfo responseInfo, + SetPreferredNetworkResponse([in] struct RilRadioResponseInfo responseInfo); + GetPreferredNetworkResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct PreferredNetworkTypeInfo preferredNetworkTypeInfo); - GetPhysicalChannelConfigResponse([in] struct HRilRadioResponseInfo responseInfo, + GetPhysicalChannelConfigResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct ChannelConfigInfoList channelConfigInfoList); - SetLocateUpdatesResponse([in] struct HRilRadioResponseInfo responseInfo); - SetNotificationFilterResponse([in] struct HRilRadioResponseInfo responseInfo); - SetDeviceStateResponse([in] struct HRilRadioResponseInfo responseInfo); + SetLocateUpdatesResponse([in] struct RilRadioResponseInfo responseInfo); + SetNotificationFilterResponse([in] struct RilRadioResponseInfo responseInfo); + SetDeviceStateResponse([in] struct RilRadioResponseInfo responseInfo); - NewSmsNotify([in] struct HRilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); - NewCdmaSmsNotify([in] struct HRilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); - SmsStatusReportNotify([in] struct HRilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); - NewSmsStoredOnSimNotify([in] struct HRilRadioResponseInfo responseInfo, [in] int recordNumber, + NewSmsNotify([in] struct RilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); + NewCdmaSmsNotify([in] struct RilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); + SmsStatusReportNotify([in] struct RilRadioResponseInfo responseInfo, [in] struct SmsMessageInfo smsMessageInfo); + NewSmsStoredOnSimNotify([in] struct RilRadioResponseInfo responseInfo, [in] int recordNumber, [in] int indicationType); - CBConfigNotify([in] struct HRilRadioResponseInfo responseInfo, + CBConfigNotify([in] struct RilRadioResponseInfo responseInfo, [in] struct CBConfigReportInfo cellBroadConfigReportInfo); - SendGsmSmsResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct SendSmsResultInfo sendSmsResultInfo); - SendCdmaSmsResponse([in] struct HRilRadioResponseInfo responseInfo, + SendGsmSmsResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct SendSmsResultInfo sendSmsResultInfo); + SendCdmaSmsResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct SendSmsResultInfo sendSmsResultInfo); - AddSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); - DelSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); - UpdateSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); - AddCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); - DelCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); - UpdateCdmaSimMessageResponse([in] struct HRilRadioResponseInfo responseInfo); - SetSmscAddrResponse([in] struct HRilRadioResponseInfo responseInfo); - GetSmscAddrResponse([in] struct HRilRadioResponseInfo responseInfo, + AddSimMessageResponse([in] struct RilRadioResponseInfo responseInfo); + DelSimMessageResponse([in] struct RilRadioResponseInfo responseInfo); + UpdateSimMessageResponse([in] struct RilRadioResponseInfo responseInfo); + AddCdmaSimMessageResponse([in] struct RilRadioResponseInfo responseInfo); + DelCdmaSimMessageResponse([in] struct RilRadioResponseInfo responseInfo); + UpdateCdmaSimMessageResponse([in] struct RilRadioResponseInfo responseInfo); + SetSmscAddrResponse([in] struct RilRadioResponseInfo responseInfo); + GetSmscAddrResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct ServiceCenterAddress serviceCenterAddress); - SetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, [in] struct CBConfigInfo cellBroadcastInfo); - SetCdmaCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo); - GetCdmaCBConfigResponse([in] struct HRilRadioResponseInfo responseInfo, + SetCBConfigResponse([in] struct RilRadioResponseInfo responseInfo); + GetCBConfigResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CBConfigInfo cellBroadcastInfo); + SetCdmaCBConfigResponse([in] struct RilRadioResponseInfo responseInfo); + GetCdmaCBConfigResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct CdmaCBConfigInfo cdmaCBConfigInfo); - SendSmsMoreModeResponse([in] struct HRilRadioResponseInfo responseInfo, + SendSmsMoreModeResponse([in] struct RilRadioResponseInfo responseInfo, [in] struct SendSmsResultInfo sendSmsResultInfo); - SendSmsAckResponse([in] struct HRilRadioResponseInfo responseInfo); + SendSmsAckResponse([in] struct RilRadioResponseInfo responseInfo); - CommonErrorResponse([in] struct HRilRadioResponseInfo responseInfo); + CommonErrorResponse([in] struct RilRadioResponseInfo responseInfo); } diff --git a/ril/v1_0/Types.idl b/ril/v1_0/Types.idl index 15497497..54210161 100644 --- a/ril/v1_0/Types.idl +++ b/ril/v1_0/Types.idl @@ -31,97 +31,96 @@ enum AbnormalServiceType { TYPE_ALL = 0, TYPE_ONLY_CS = 1, }; -enum HRilErrType { +enum RilErrType { NONE = 0, - HRIL_ERR_GENERIC_FAILURE = 1, - HRIL_ERR_INVALID_PARAMETER = 2, - HRIL_ERR_MEMORY_FULL = 3, - HRIL_ERR_CMD_SEND_FAILURE = 4, - HRIL_ERR_CMD_NO_CARRIER = 5, - HRIL_ERR_INVALID_RESPONSE = 6, - HRIL_ERR_REPEAT_STATUS = 7, - HRIL_ERR_NETWORK_SEARCHING = 8, - HRIL_ERR_NETWORK_SEARCHING_INTERRUPTED = 9, - HRIL_ERR_MODEM_DEVICE_CLOSE = 10, - HRIL_ERR_NO_SIMCARD_INSERTED = 11, - HRIL_ERR_NEED_PIN_CODE = 12, - HRIL_ERR_NEED_PUK_CODE = 13, - HRIL_ERR_NETWORK_SEARCH_TIMEOUT = 14, - HRIL_ERR_PINPUK_PASSWORD_NOCORRECT = 15, - HRIL_ERR_INVALID_MODEM_PARAMETER = 50, - - HRIL_ERR_HDF_IPC_FAILURE = 300, - HRIL_ERR_NULL_POINT = 301, - HRIL_ERR_VENTOR_NOT_IMPLEMENT = 302 -}; -enum HRilResponseTypes { - HRIL_RESPONSE_REQUEST = 0, - HRIL_RESPONSE_NOTICE = 1, - HRIL_RESPONSE_REQUEST_ACK = 2, - HRIL_RESPONSE_REQUEST_MUST_ACK = 3, - HRIL_RESPONSE_NOTICE_MUST_ACK = 4, -}; -enum HRilSrvStatus { - HRIL_NO_SRV_SERVICE = 0, - HRIL_RESTRICTED_SERVICE = 1, - HRIL_SERVICE_VALID = 2, - HRIL_REGIONAL_SERVICE = 3, - HRIL_ENERGY_SAVING_SERVICE = 4, -}; -enum HRilSrvDomain { - HRIL_NO_DOMAIN_SERVICE = 0, - HRIL_CS_SERVICE = 1, - HRIL_PS_SERVICE = 2, - HRIL_CS_PS_SERVICE = 3, - HRIL_CS_PS_SEARCHING = 4, - HRIL_CDMA_NOT_SUPPORT = 255, -}; -enum HRilRoamStatus { - HRIL_NO_ROAM = 0, - HRIL_ROAMING = 1, - HRIL_ROAM_UNKNOWN = 2, -}; -enum HRilSimLockStatus { - HRIL_SIM_CARD_UNLOCK = 0, - HRIL_SIM_CARD_LOCK = 1, -}; -enum HRilSysMode { - HRIL_NO_SYSMODE_SERVICE = 0, - HRIL_GSM_MODE = 1, - HRIL_CDMA_MODE = 2, - HRIL_WCDMA_MODE = 3, - HRIL_TDSCDMA_MODE = 4, - HRIL_WIMAX_MODE = 5, - HRIL_LTE_MODE = 6, - HRIL_LTE_CA_MODE = 7, - HRIL_NR_MODE = 8, -}; -enum HRilRadioTech { - RADIO_TECHNOLOGY_INVALID = 65535, - RADIO_TECHNOLOGY_UNKNOWN = 0, - RADIO_TECHNOLOGY_GSM = 1, - RADIO_TECHNOLOGY_1XRTT = 2, - RADIO_TECHNOLOGY_WCDMA = 3, - RADIO_TECHNOLOGY_HSPA = 4, - RADIO_TECHNOLOGY_HSPAP = 5, - RADIO_TECHNOLOGY_TD_SCDMA = 6, - RADIO_TECHNOLOGY_EVDO = 7, - RADIO_TECHNOLOGY_EHRPD = 8, - RADIO_TECHNOLOGY_LTE = 9, - RADIO_TECHNOLOGY_LTE_CA = 10, - RADIO_TECHNOLOGY_IWLAN = 11, - RADIO_TECHNOLOGY_NR = 12, -}; -enum HRilSimStatus { - HRIL_USIM_INVALID = 0, - HRIL_USIM_VALID = 1, - HRIL_USIM_CS_INVALID = 2, - HRIL_USIM_PS_INVALID = 3, - HRIL_USIM_CS_PS_INVALID = 4, - HRIL_ROM_SIM = 240, - HRIL_NO_USIM = 255, -}; -enum HRilRegStatus { + RIL_ERR_GENERIC_FAILURE = 1, + RIL_ERR_INVALID_PARAMETER = 2, + RIL_ERR_MEMORY_FULL = 3, + RIL_ERR_CMD_SEND_FAILURE = 4, + RIL_ERR_CMD_NO_CARRIER = 5, + RIL_ERR_INVALID_RESPONSE = 6, + RIL_ERR_REPEAT_STATUS = 7, + RIL_ERR_NETWORK_SEARCHING = 8, + RIL_ERR_NETWORK_SEARCHING_INTERRUPTED = 9, + RIL_ERR_MODEM_DEVICE_CLOSE = 10, + RIL_ERR_NO_SIMCARD_INSERTED = 11, + RIL_ERR_NEED_PIN_CODE = 12, + RIL_ERR_NEED_PUK_CODE = 13, + RIL_ERR_NETWORK_SEARCH_TIMEOUT = 14, + RIL_ERR_PINPUK_PASSWORD_NOCORRECT = 15, + RIL_ERR_INVALID_MODEM_PARAMETER = 50, + RIL_ERR_HDF_IPC_FAILURE = 300, + RIL_ERR_NULL_POINT = 301, + RIL_ERR_VENTOR_NOT_IMPLEMENT = 302 +}; +enum RilResponseTypes { + RIL_RESPONSE_REQUEST = 0, + RIL_RESPONSE_NOTICE = 1, + RIL_RESPONSE_REQUEST_ACK = 2, + RIL_RESPONSE_REQUEST_MUST_ACK = 3, + RIL_RESPONSE_NOTICE_MUST_ACK = 4, +}; +enum RilSrvStatus { + RIL_NO_SRV_SERVICE = 0, + RIL_RESTRICTED_SERVICE = 1, + RIL_SERVICE_VALID = 2, + RIL_REGIONAL_SERVICE = 3, + RIL_ENERGY_SAVING_SERVICE = 4, +}; +enum RilSrvDomain { + RIL_NO_DOMAIN_SERVICE = 0, + RIL_CS_SERVICE = 1, + RIL_PS_SERVICE = 2, + RIL_CS_PS_SERVICE = 3, + RIL_CS_PS_SEARCHING = 4, + RIL_CDMA_NOT_SUPPORT = 255, +}; +enum RilRoamStatus { + RIL_NO_ROAM = 0, + RIL_ROAMING = 1, + RIL_ROAM_UNKNOWN = 2, +}; +enum RilSimLockStatus { + RIL_SIM_CARD_UNLOCK = 0, + RIL_SIM_CARD_LOCK = 1, +}; +enum RilSysMode { + RIL_NO_SYSMODE_SERVICE = 0, + RIL_GSM_MODE = 1, + RIL_CDMA_MODE = 2, + RIL_WCDMA_MODE = 3, + RIL_TDSCDMA_MODE = 4, + RIL_WIMAX_MODE = 5, + RIL_LTE_MODE = 6, + RIL_LTE_CA_MODE = 7, + RIL_NR_MODE = 8, +}; +enum RilRadioTech { + RADIO_TECHNOLOGY_INVALID = 65535, + RADIO_TECHNOLOGY_UNKNOWN = 0, + RADIO_TECHNOLOGY_GSM = 1, + RADIO_TECHNOLOGY_1XRTT = 2, + RADIO_TECHNOLOGY_WCDMA = 3, + RADIO_TECHNOLOGY_HSPA = 4, + RADIO_TECHNOLOGY_HSPAP = 5, + RADIO_TECHNOLOGY_TD_SCDMA = 6, + RADIO_TECHNOLOGY_EVDO = 7, + RADIO_TECHNOLOGY_EHRPD = 8, + RADIO_TECHNOLOGY_LTE = 9, + RADIO_TECHNOLOGY_LTE_CA = 10, + RADIO_TECHNOLOGY_IWLAN = 11, + RADIO_TECHNOLOGY_NR = 12, +}; +enum RilSimStatus { + RIL_USIM_INVALID = 0, + RIL_USIM_VALID = 1, + RIL_USIM_CS_INVALID = 2, + RIL_USIM_PS_INVALID = 3, + RIL_USIM_CS_PS_INVALID = 4, + RIL_ROM_SIM = 240, + RIL_NO_USIM = 255, +}; +enum RilRegStatus { NO_REG_MT_NO_SEARCH = 0, REG_MT_HOME = 1, NO_REG_MT_SEARCHING = 2, @@ -130,12 +129,12 @@ enum HRilRegStatus { REG_MT_ROAMING = 5, REG_MT_EMERGENCY = 6, }; -enum HRilCellConnectionStatus { - HRIL_SERVING_CELL_UNKNOWN = 0, - HRIL_SERVING_CELL_PRIMARY = 1, - HRIL_SERVING_CELL_SECONDARY = 2, +enum RilCellConnectionStatus { + RIL_SERVING_CELL_UNKNOWN = 0, + RIL_SERVING_CELL_PRIMARY = 1, + RIL_SERVING_CELL_SECONDARY = 2, }; -enum HRilRegNotifyMode { +enum RilRegNotifyMode { REG_NOT_NOTIFY = 0, REG_NOTIFY_STAT_ONLY = 1, REG_NOTIFY_STAT_LAC_CELLID = 2, @@ -166,12 +165,12 @@ struct EmergencyInfoList { int flag; List calls; }; -struct HRilRadioResponseInfo { +struct RilRadioResponseInfo { int slotId; int flag; int serial; - enum HRilErrType error; - enum HRilResponseTypes type; + enum RilErrType error; + enum RilResponseTypes type; }; struct SetupDataCallResultInfo { int flag; @@ -257,16 +256,16 @@ struct UniInfo { String strTmp; }; struct VoiceRadioTechnology { - enum HRilSrvStatus srvStatus; - enum HRilSrvDomain srvDomain; - enum HRilRoamStatus roamStatus; - enum HRilSimStatus simStatus; - enum HRilSimLockStatus lockStatus; - enum HRilSysMode sysMode; - String sysModeName; - enum HRilRadioTech actType; - String actName; - int flag; + enum RilSrvStatus srvStatus; + enum RilSrvDomain srvDomain; + enum RilRoamStatus roamStatus; + enum RilSimStatus simStatus; + enum RilSimLockStatus lockStatus; + enum RilSysMode sysMode; + String sysModeName; + enum RilRadioTech actType; + String actName; + int flag; }; struct DialInfo { int serial; @@ -481,18 +480,18 @@ struct Rssi { }; struct CsRegStatusInfo { int notifyType; - enum HRilRegStatus regStatus; + enum RilRegStatus regStatus; int lacCode; int cellId; - enum HRilRadioTech radioTechnology; + enum RilRadioTech radioTechnology; int flag; }; struct PsRegStatusInfo { int notifyType; - enum HRilRegStatus regStatus; + enum RilRegStatus regStatus; int lacCode; int cellId; - enum HRilRadioTech radioTechnology; + enum RilRadioTech radioTechnology; boolean isNrAvailable; boolean isEnDcAvailable; boolean isDcNrRestricted; @@ -665,8 +664,8 @@ struct PreferredNetworkTypeInfo { int flag; }; struct PhysicalChannelConfig { - enum HRilCellConnectionStatus cellConnStatus; - enum HRilRadioTech ratType; + enum RilCellConnectionStatus cellConnStatus; + enum RilRadioTech ratType; int cellBandwidthDownlinkKhz; int cellBandwidthUplinkKhz; int freqRange; -- Gitee