The difference between two libs are very minor, includes one hack around ucsInfo and the logic to adjust signal strength. Besides that other diffs are some logs. The new version of code is minaly based on xmm6262, especially the logic to adjust singal strength. Merge them to easy maintain the code. Change-Id: I76390541d017576591860c8701bb9763c460b8be (cherry picked from commit 56b8dcfa3094f93698dda9f6731fa845f00ef287)tirimbino
Howard Su
10 years ago
committed by
Caio Schnepper
parent
6b9cd5f8b4
commit
e32dbfd56b
File diff suppressed because it is too large
Load Diff
@ -1,46 +0,0 @@ |
||||
# Copyright 2006 The Android Open Source Project
|
||||
|
||||
ifeq ($(BOARD_PROVIDES_LIBRIL),true) |
||||
|
||||
LOCAL_PATH:= $(call my-dir)
|
||||
include $(CLEAR_VARS) |
||||
|
||||
LOCAL_SRC_FILES:= \
|
||||
ril.cpp \
|
||||
ril_event.cpp
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
liblog \
|
||||
libutils \
|
||||
libbinder \
|
||||
libcutils \
|
||||
libhardware_legacy \
|
||||
librilutils
|
||||
|
||||
LOCAL_CFLAGS :=
|
||||
|
||||
LOCAL_MODULE:= libril
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY) |
||||
|
||||
|
||||
# For RdoServD which needs a static library
|
||||
# =========================================
|
||||
ifneq ($(ANDROID_BIONIC_TRANSITION),) |
||||
include $(CLEAR_VARS) |
||||
|
||||
LOCAL_SRC_FILES:= \
|
||||
ril.cpp
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libutils_static \
|
||||
libcutils \
|
||||
librilutils_static
|
||||
|
||||
LOCAL_CFLAGS :=
|
||||
|
||||
LOCAL_MODULE:= libril_static
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY) |
||||
endif # ANDROID_BIONIC_TRANSITION
|
||||
endif # BOARD_PROVIDES_LIBRIL
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,182 +0,0 @@ |
||||
/* //device/libs/telephony/ril_commands.h
|
||||
** |
||||
** Copyright 2006, The Android Open Source Project |
||||
** |
||||
** Licensed under the Apache License, Version 2.0 (the "License"); |
||||
** you may not use this file except in compliance with the License. |
||||
** You may obtain a copy of the License at |
||||
** |
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
** |
||||
** Unless required by applicable law or agreed to in writing, software |
||||
** distributed under the License is distributed on an "AS IS" BASIS, |
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
** See the License for the specific language governing permissions and |
||||
** limitations under the License. |
||||
*/ |
||||
{0, NULL, NULL}, //none
|
||||
{RIL_REQUEST_GET_SIM_STATUS, dispatchVoid, responseSimStatus}, |
||||
{RIL_REQUEST_ENTER_SIM_PIN, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_ENTER_SIM_PUK, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_ENTER_SIM_PIN2, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_ENTER_SIM_PUK2, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_CHANGE_SIM_PIN, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_CHANGE_SIM_PIN2, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_GET_CURRENT_CALLS, dispatchVoid, responseCallList}, |
||||
{RIL_REQUEST_DIAL, dispatchDial, responseVoid}, |
||||
{RIL_REQUEST_GET_IMSI, dispatchStrings, responseString}, |
||||
{RIL_REQUEST_HANGUP, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CONFERENCE, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_UDUB, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_LAST_CALL_FAIL_CAUSE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_SIGNAL_STRENGTH, dispatchVoid, responseRilSignalStrength}, |
||||
{RIL_REQUEST_VOICE_REGISTRATION_STATE, dispatchVoid, responseStrings}, |
||||
{RIL_REQUEST_DATA_REGISTRATION_STATE, dispatchVoid, responseStrings}, |
||||
{RIL_REQUEST_OPERATOR, dispatchVoid, responseStrings}, |
||||
{RIL_REQUEST_RADIO_POWER, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_DTMF, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_SEND_SMS, dispatchStrings, responseSMS}, |
||||
{RIL_REQUEST_SEND_SMS_EXPECT_MORE, dispatchStrings, responseSMS}, |
||||
{RIL_REQUEST_SETUP_DATA_CALL, dispatchDataCall, responseSetupDataCall}, |
||||
{RIL_REQUEST_SIM_IO, dispatchSIM_IO, responseSIM_IO}, |
||||
{RIL_REQUEST_SEND_USSD, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_CANCEL_USSD, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_CLIR, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_SET_CLIR, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_QUERY_CALL_FORWARD_STATUS, dispatchCallForward, responseCallForwards}, |
||||
{RIL_REQUEST_SET_CALL_FORWARD, dispatchCallForward, responseVoid}, |
||||
{RIL_REQUEST_QUERY_CALL_WAITING, dispatchInts, responseInts}, |
||||
{RIL_REQUEST_SET_CALL_WAITING, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_SMS_ACKNOWLEDGE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_GET_IMEI, dispatchVoid, responseString}, |
||||
{RIL_REQUEST_GET_IMEISV, dispatchVoid, responseString}, |
||||
{RIL_REQUEST_ANSWER,dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_DEACTIVATE_DATA_CALL, dispatchStrings, responseVoid}, |
||||
{RIL_REQUEST_QUERY_FACILITY_LOCK, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_SET_FACILITY_LOCK, dispatchStrings, responseInts}, |
||||
{RIL_REQUEST_CHANGE_BARRING_PASSWORD, dispatchStrings, responseVoid}, |
||||
{RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_QUERY_AVAILABLE_NETWORKS , dispatchVoid, responseStringsNetworks}, |
||||
{RIL_REQUEST_DTMF_START, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_DTMF_STOP, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_BASEBAND_VERSION, dispatchVoid, responseString}, |
||||
{RIL_REQUEST_SEPARATE_CONNECTION, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_SET_MUTE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_GET_MUTE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_QUERY_CLIP, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_DATA_CALL_LIST, dispatchVoid, responseDataCallList}, |
||||
{RIL_REQUEST_RESET_RADIO, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_OEM_HOOK_RAW, dispatchRaw, responseRaw}, |
||||
{RIL_REQUEST_OEM_HOOK_STRINGS, dispatchStrings, responseStrings}, |
||||
{RIL_REQUEST_SCREEN_STATE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_WRITE_SMS_TO_SIM, dispatchSmsWrite, responseInts}, |
||||
{RIL_REQUEST_DELETE_SMS_ON_SIM, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_SET_BAND_MODE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_STK_GET_PROFILE, dispatchVoid, responseString}, |
||||
{RIL_REQUEST_STK_SET_PROFILE, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND, dispatchString, responseString}, |
||||
{RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_EXPLICIT_CALL_TRANSFER, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE, dispatchVoid, responseIntsGetPreferredNetworkType}, |
||||
{RIL_REQUEST_GET_NEIGHBORING_CELL_IDS, dispatchVoid, responseCellList}, |
||||
{RIL_REQUEST_SET_LOCATION_UPDATES, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_SET_TTY_MODE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_QUERY_TTY_MODE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_CDMA_FLASH, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_CDMA_BURST_DTMF, dispatchStrings, responseVoid}, |
||||
{RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SEND_SMS, dispatchCdmaSms, responseSMS}, |
||||
{RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE, dispatchCdmaSmsAck, responseVoid}, |
||||
{RIL_REQUEST_GSM_GET_BROADCAST_SMS_CONFIG, dispatchVoid, responseGsmBrSmsCnf}, |
||||
{RIL_REQUEST_GSM_SET_BROADCAST_SMS_CONFIG, dispatchGsmBrSmsCnf, responseVoid}, |
||||
{RIL_REQUEST_GSM_SMS_BROADCAST_ACTIVATION, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_CDMA_GET_BROADCAST_SMS_CONFIG, dispatchVoid, responseCdmaBrSmsCnf}, |
||||
{RIL_REQUEST_CDMA_SET_BROADCAST_SMS_CONFIG, dispatchCdmaBrSmsCnf, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SMS_BROADCAST_ACTIVATION, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SUBSCRIPTION, dispatchVoid, responseStrings}, |
||||
{RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM, dispatchRilCdmaSmsWriteArgs, responseInts}, |
||||
{RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_DEVICE_IDENTITY, dispatchVoid, responseStrings}, |
||||
{RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_SMSC_ADDRESS, dispatchVoid, responseString}, |
||||
{RIL_REQUEST_SET_SMSC_ADDRESS, dispatchString, responseVoid}, |
||||
{RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, dispatchInts, responseVoid}, |
||||
{RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE, dispatchCdmaSubscriptionSource, responseInts}, |
||||
{RIL_REQUEST_ISIM_AUTHENTICATION, dispatchString, responseString}, |
||||
{RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU, dispatchStrings, responseVoid}, |
||||
{RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS, dispatchString, responseSIM_IO}, |
||||
{RIL_REQUEST_VOICE_RADIO_TECH, dispatchVoiceRadioTech, responseInts}, |
||||
{RIL_REQUEST_GET_CELL_INFO_LIST, dispatchVoid, responseCellInfoList}, |
||||
{RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, dispatchInts, responseVoid}, // 110
|
||||
{RIL_REQUEST_SET_INITIAL_ATTACH_APN, dispatchSetInitialAttachApn, responseVoid}, |
||||
{RIL_REQUEST_IMS_REGISTRATION_STATE, dispatchVoid, responseInts}, |
||||
{RIL_REQUEST_IMS_SEND_SMS, dispatchImsSms, responseSMS}, |
||||
{0, NULL, NULL}, // 10001
|
||||
{RIL_REQUEST_GET_CELL_BROADCAST_CONFIG, dispatchVoid, responseVoid}, |
||||
{0, NULL, NULL}, // 10003
|
||||
{0, NULL, NULL}, // 10004
|
||||
{RIL_REQUEST_SEND_ENCODED_USSD, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SET_PDA_MEMORY_STATUS, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_PHONEBOOK_STORAGE_INFO, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_PHONEBOOK_ENTRY, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_ACCESS_PHONEBOOK_ENTRY, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_DIAL_VIDEO_CALL, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CALL_DEFLECTION, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_READ_SMS_FROM_SIM, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_USIM_PB_CAPA, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_LOCK_INFO, dispatchVoid, responseVoid}, |
||||
{0, NULL, NULL}, // 10015
|
||||
{RIL_REQUEST_DIAL_EMERGENCY, dispatchDial, responseVoid}, |
||||
{RIL_REQUEST_GET_STOREAD_MSG_COUNT, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_STK_SIM_INIT_EVENT, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_LINE_ID, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SET_LINE_ID, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_SERIAL_NUMBER, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_MANUFACTURE_DATE_NUMBER, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_BARCODE_NUMBER, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_UICC_GBA_AUTHENTICATE_BOOTSTRAP, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_UICC_GBA_AUTHENTICATE_NAF, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SIM_TRANSMIT_BASIC, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SIM_OPEN_CHANNEL, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SIM_CLOSE_CHANNEL, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SIM_TRANSMIT_CHANNEL, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SIM_AUTH, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_PS_ATTACH, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_PS_DETACH, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_ACTIVATE_DATA_CALL, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CHANGE_SIM_PERSO, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_ENTER_SIM_PERSO, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_TIME_INFO, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_OMADM_SETUP_SESSION, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_OMADM_SERVER_START_SESSION, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_OMADM_CLIENT_START_SESSION, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_OMADM_SEND_DATA, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CDMA_GET_DATAPROFILE, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SET_DATAPROFILE, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CDMA_GET_SYSTEMPROPERTIES, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_CDMA_SET_SYSTEMPROPERTIES, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SEND_SMS_COUNT, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SEND_SMS_MSG, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SEND_SMS_MSG_READ_STATUS, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_MODEM_HANGUP, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SET_SIM_POWER, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_SET_PREFERRED_NETWORK_LIST, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_GET_PREFERRED_NETWORK_LIST, dispatchVoid, responseVoid}, |
||||
{RIL_REQUEST_HANGUP_VT, dispatchVoid, responseVoid}, |
||||
@ -1,56 +0,0 @@ |
||||
/* //device/libs/telephony/ril_unsol_commands.h
|
||||
** |
||||
** Copyright 2006, The Android Open Source Project |
||||
** |
||||
** Licensed under the Apache License, Version 2.0 (the "License"); |
||||
** you may not use this file except in compliance with the License. |
||||
** You may obtain a copy of the License at |
||||
** |
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
** |
||||
** Unless required by applicable law or agreed to in writing, software |
||||
** distributed under the License is distributed on an "AS IS" BASIS, |
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
** See the License for the specific language governing permissions and |
||||
** limitations under the License. |
||||
*/ |
||||
{RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_NEW_SMS, responseString, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT, responseString, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_ON_USSD, responseStrings, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_ON_USSD_REQUEST, responseVoid, DONT_WAKE}, |
||||
{RIL_UNSOL_NITZ_TIME_RECEIVED, responseString, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_SIGNAL_STRENGTH, responseRilSignalStrength, DONT_WAKE}, |
||||
{RIL_UNSOL_DATA_CALL_LIST_CHANGED, responseDataCallList, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_SUPP_SVC_NOTIFICATION, responseSsn, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_STK_SESSION_END, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_STK_PROACTIVE_COMMAND, responseString, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_STK_EVENT_NOTIFY, responseString, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_STK_CALL_SETUP, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_SIM_SMS_STORAGE_FULL, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_SIM_REFRESH, responseSimRefresh, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CALL_RING, responseCallRing, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_CDMA_NEW_SMS, responseCdmaSms, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, responseRaw, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESTRICTED_STATE_CHANGED, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CDMA_CALL_WAITING, responseCdmaCallWaiting, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CDMA_OTA_PROVISION_STATUS, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CDMA_INFO_REC, responseCdmaInformationRecords, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_OEM_HOOK_RAW, responseRaw, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RINGBACK_TONE, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RESEND_INCALL_MUTE, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CDMA_PRL_CHANGED, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RIL_CONNECTED, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_VOICE_RADIO_TECH_CHANGED, responseInts, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_CELL_INFO_LIST, responseCellInfoList, WAKE_PARTIAL}, // 1036
|
||||
{RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED, responseVoid, WAKE_PARTIAL}, |
||||
{RIL_UNSOL_RELEASE_COMPLETE_MESSAGE, responseVoid, WAKE_PARTIAL}, // 11001
|
||||
{RIL_UNSOL_STK_SEND_SMS_RESULT, responseInts, WAKE_PARTIAL}, // 11002
|
||||
@ -1,190 +0,0 @@ |
||||
|
||||
Copyright (c) 2005-2008, The Android Open Source Project |
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); |
||||
you may not use this file except in compliance with the License. |
||||
|
||||
Unless required by applicable law or agreed to in writing, software |
||||
distributed under the License is distributed on an "AS IS" BASIS, |
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
See the License for the specific language governing permissions and |
||||
limitations under the License. |
||||
|
||||
|
||||
Apache License |
||||
Version 2.0, January 2004 |
||||
http://www.apache.org/licenses/ |
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
||||
|
||||
1. Definitions. |
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction, |
||||
and distribution as defined by Sections 1 through 9 of this document. |
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by |
||||
the copyright owner that is granting the License. |
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all |
||||
other entities that control, are controlled by, or are under common |
||||
control with that entity. For the purposes of this definition, |
||||
"control" means (i) the power, direct or indirect, to cause the |
||||
direction or management of such entity, whether by contract or |
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the |
||||
outstanding shares, or (iii) beneficial ownership of such entity. |
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity |
||||
exercising permissions granted by this License. |
||||
|
||||
"Source" form shall mean the preferred form for making modifications, |
||||
including but not limited to software source code, documentation |
||||
source, and configuration files. |
||||
|
||||
"Object" form shall mean any form resulting from mechanical |
||||
transformation or translation of a Source form, including but |
||||
not limited to compiled object code, generated documentation, |
||||
and conversions to other media types. |
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or |
||||
Object form, made available under the License, as indicated by a |
||||
copyright notice that is included in or attached to the work |
||||
(an example is provided in the Appendix below). |
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object |
||||
form, that is based on (or derived from) the Work and for which the |
||||
editorial revisions, annotations, elaborations, or other modifications |
||||
represent, as a whole, an original work of authorship. For the purposes |
||||
of this License, Derivative Works shall not include works that remain |
||||
separable from, or merely link (or bind by name) to the interfaces of, |
||||
the Work and Derivative Works thereof. |
||||
|
||||
"Contribution" shall mean any work of authorship, including |
||||
the original version of the Work and any modifications or additions |
||||
to that Work or Derivative Works thereof, that is intentionally |
||||
submitted to Licensor for inclusion in the Work by the copyright owner |
||||
or by an individual or Legal Entity authorized to submit on behalf of |
||||
the copyright owner. For the purposes of this definition, "submitted" |
||||
means any form of electronic, verbal, or written communication sent |
||||
to the Licensor or its representatives, including but not limited to |
||||
communication on electronic mailing lists, source code control systems, |
||||
and issue tracking systems that are managed by, or on behalf of, the |
||||
Licensor for the purpose of discussing and improving the Work, but |
||||
excluding communication that is conspicuously marked or otherwise |
||||
designated in writing by the copyright owner as "Not a Contribution." |
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity |
||||
on behalf of whom a Contribution has been received by Licensor and |
||||
subsequently incorporated within the Work. |
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of |
||||
this License, each Contributor hereby grants to You a perpetual, |
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
||||
copyright license to reproduce, prepare Derivative Works of, |
||||
publicly display, publicly perform, sublicense, and distribute the |
||||
Work and such Derivative Works in Source or Object form. |
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of |
||||
this License, each Contributor hereby grants to You a perpetual, |
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
||||
(except as stated in this section) patent license to make, have made, |
||||
use, offer to sell, sell, import, and otherwise transfer the Work, |
||||
where such license applies only to those patent claims licensable |
||||
by such Contributor that are necessarily infringed by their |
||||
Contribution(s) alone or by combination of their Contribution(s) |
||||
with the Work to which such Contribution(s) was submitted. If You |
||||
institute patent litigation against any entity (including a |
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work |
||||
or a Contribution incorporated within the Work constitutes direct |
||||
or contributory patent infringement, then any patent licenses |
||||
granted to You under this License for that Work shall terminate |
||||
as of the date such litigation is filed. |
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the |
||||
Work or Derivative Works thereof in any medium, with or without |
||||
modifications, and in Source or Object form, provided that You |
||||
meet the following conditions: |
||||
|
||||
(a) You must give any other recipients of the Work or |
||||
Derivative Works a copy of this License; and |
||||
|
||||
(b) You must cause any modified files to carry prominent notices |
||||
stating that You changed the files; and |
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works |
||||
that You distribute, all copyright, patent, trademark, and |
||||
attribution notices from the Source form of the Work, |
||||
excluding those notices that do not pertain to any part of |
||||
the Derivative Works; and |
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its |
||||
distribution, then any Derivative Works that You distribute must |
||||
include a readable copy of the attribution notices contained |
||||
within such NOTICE file, excluding those notices that do not |
||||
pertain to any part of the Derivative Works, in at least one |
||||
of the following places: within a NOTICE text file distributed |
||||
as part of the Derivative Works; within the Source form or |
||||
documentation, if provided along with the Derivative Works; or, |
||||
within a display generated by the Derivative Works, if and |
||||
wherever such third-party notices normally appear. The contents |
||||
of the NOTICE file are for informational purposes only and |
||||
do not modify the License. You may add Your own attribution |
||||
notices within Derivative Works that You distribute, alongside |
||||
or as an addendum to the NOTICE text from the Work, provided |
||||
that such additional attribution notices cannot be construed |
||||
as modifying the License. |
||||
|
||||
You may add Your own copyright statement to Your modifications and |
||||
may provide additional or different license terms and conditions |
||||
for use, reproduction, or distribution of Your modifications, or |
||||
for any such Derivative Works as a whole, provided Your use, |
||||
reproduction, and distribution of the Work otherwise complies with |
||||
the conditions stated in this License. |
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, |
||||
any Contribution intentionally submitted for inclusion in the Work |
||||
by You to the Licensor shall be under the terms and conditions of |
||||
this License, without any additional terms or conditions. |
||||
Notwithstanding the above, nothing herein shall supersede or modify |
||||
the terms of any separate license agreement you may have executed |
||||
with Licensor regarding such Contributions. |
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade |
||||
names, trademarks, service marks, or product names of the Licensor, |
||||
except as required for reasonable and customary use in describing the |
||||
origin of the Work and reproducing the content of the NOTICE file. |
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or |
||||
agreed to in writing, Licensor provides the Work (and each |
||||
Contributor provides its Contributions) on an "AS IS" BASIS, |
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
||||
implied, including, without limitation, any warranties or conditions |
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
||||
PARTICULAR PURPOSE. You are solely responsible for determining the |
||||
appropriateness of using or redistributing the Work and assume any |
||||
risks associated with Your exercise of permissions under this License. |
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory, |
||||
whether in tort (including negligence), contract, or otherwise, |
||||
unless required by applicable law (such as deliberate and grossly |
||||
negligent acts) or agreed to in writing, shall any Contributor be |
||||
liable to You for damages, including any direct, indirect, special, |
||||
incidental, or consequential damages of any character arising as a |
||||
result of this License or out of the use or inability to use the |
||||
Work (including but not limited to damages for loss of goodwill, |
||||
work stoppage, computer failure or malfunction, or any and all |
||||
other commercial damages or losses), even if such Contributor |
||||
has been advised of the possibility of such damages. |
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing |
||||
the Work or Derivative Works thereof, You may choose to offer, |
||||
and charge a fee for, acceptance of support, warranty, indemnity, |
||||
or other liability obligations and/or rights consistent with this |
||||
License. However, in accepting such obligations, You may act only |
||||
on Your own behalf and on Your sole responsibility, not on behalf |
||||
of any other Contributor, and only if You agree to indemnify, |
||||
defend, and hold each Contributor harmless for any liability |
||||
incurred by, or claims asserted against, such Contributor by reason |
||||
of your accepting any such warranty or additional liability. |
||||
|
||||
END OF TERMS AND CONDITIONS |
||||
|
||||
@ -1,385 +0,0 @@ |
||||
/* //device/libs/telephony/ril_event.cpp
|
||||
** |
||||
** Copyright 2008, The Android Open Source Project |
||||
** |
||||
** Licensed under the Apache License, Version 2.0 (the "License"); |
||||
** you may not use this file except in compliance with the License. |
||||
** You may obtain a copy of the License at |
||||
** |
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
** |
||||
** Unless required by applicable law or agreed to in writing, software |
||||
** distributed under the License is distributed on an "AS IS" BASIS, |
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
** See the License for the specific language governing permissions and |
||||
** limitations under the License. |
||||
*/ |
||||
|
||||
#define LOG_TAG "RILC" |
||||
|
||||
#include <stdlib.h> |
||||
#include <unistd.h> |
||||
#include <errno.h> |
||||
#include <fcntl.h> |
||||
#include <utils/Log.h> |
||||
#include <ril_event.h> |
||||
#include <string.h> |
||||
#include <sys/time.h> |
||||
#include <time.h> |
||||
|
||||
#include <pthread.h> |
||||
static pthread_mutex_t listMutex; |
||||
#define MUTEX_ACQUIRE() pthread_mutex_lock(&listMutex) |
||||
#define MUTEX_RELEASE() pthread_mutex_unlock(&listMutex) |
||||
#define MUTEX_INIT() pthread_mutex_init(&listMutex, NULL) |
||||
#define MUTEX_DESTROY() pthread_mutex_destroy(&listMutex) |
||||
|
||||
#ifndef timeradd |
||||
#define timeradd(tvp, uvp, vvp) \ |
||||
do { \
|
||||
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
|
||||
(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
|
||||
if ((vvp)->tv_usec >= 1000000) { \
|
||||
(vvp)->tv_sec++; \
|
||||
(vvp)->tv_usec -= 1000000; \
|
||||
} \
|
||||
} while (0) |
||||
#endif |
||||
|
||||
#ifndef timercmp |
||||
#define timercmp(a, b, op) \ |
||||
((a)->tv_sec == (b)->tv_sec \
|
||||
? (a)->tv_usec op (b)->tv_usec \
|
||||
: (a)->tv_sec op (b)->tv_sec) |
||||
#endif |
||||
|
||||
#ifndef timersub |
||||
#define timersub(a, b, res) \ |
||||
do { \
|
||||
(res)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
|
||||
(res)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
|
||||
if ((res)->tv_usec < 0) { \
|
||||
(res)->tv_usec += 1000000; \
|
||||
(res)->tv_sec -= 1; \
|
||||
} \
|
||||
} while(0); |
||||
#endif |
||||
|
||||
static fd_set readFds; |
||||
static int nfds = 0; |
||||
|
||||
static struct ril_event * watch_table[MAX_FD_EVENTS]; |
||||
static struct ril_event timer_list; |
||||
static struct ril_event pending_list; |
||||
|
||||
#define DEBUG 0 |
||||
|
||||
#if DEBUG |
||||
#define dlog(x...) RLOGD( x ) |
||||
static void dump_event(struct ril_event * ev) |
||||
{ |
||||
dlog("~~~~ Event %x ~~~~", (unsigned int)ev); |
||||
dlog(" next = %x", (unsigned int)ev->next); |
||||
dlog(" prev = %x", (unsigned int)ev->prev); |
||||
dlog(" fd = %d", ev->fd); |
||||
dlog(" pers = %d", ev->persist); |
||||
dlog(" timeout = %ds + %dus", (int)ev->timeout.tv_sec, (int)ev->timeout.tv_usec); |
||||
dlog(" func = %x", (unsigned int)ev->func); |
||||
dlog(" param = %x", (unsigned int)ev->param); |
||||
dlog("~~~~~~~~~~~~~~~~~~"); |
||||
} |
||||
#else |
||||
#define dlog(x...) do {} while(0) |
||||
#define dump_event(x) do {} while(0) |
||||
#endif |
||||
|
||||
static void getNow(struct timeval * tv) |
||||
{ |
||||
#ifdef HAVE_POSIX_CLOCKS |
||||
struct timespec ts; |
||||
clock_gettime(CLOCK_MONOTONIC, &ts); |
||||
tv->tv_sec = ts.tv_sec; |
||||
tv->tv_usec = ts.tv_nsec/1000; |
||||
#else |
||||
gettimeofday(tv, NULL); |
||||
#endif |
||||
} |
||||
|
||||
static void init_list(struct ril_event * list) |
||||
{ |
||||
memset(list, 0, sizeof(struct ril_event)); |
||||
list->next = list; |
||||
list->prev = list; |
||||
list->fd = -1; |
||||
} |
||||
|
||||
static void addToList(struct ril_event * ev, struct ril_event * list) |
||||
{ |
||||
ev->next = list; |
||||
ev->prev = list->prev; |
||||
ev->prev->next = ev; |
||||
list->prev = ev; |
||||
dump_event(ev); |
||||
} |
||||
|
||||
static void removeFromList(struct ril_event * ev) |
||||
{ |
||||
dlog("~~~~ Removing event ~~~~"); |
||||
dump_event(ev); |
||||
|
||||
ev->next->prev = ev->prev; |
||||
ev->prev->next = ev->next; |
||||
ev->next = NULL; |
||||
ev->prev = NULL; |
||||
} |
||||
|
||||
|
||||
static void removeWatch(struct ril_event * ev, int index) |
||||
{ |
||||
watch_table[index] = NULL; |
||||
ev->index = -1; |
||||
|
||||
FD_CLR(ev->fd, &readFds); |
||||
|
||||
if (ev->fd+1 == nfds) { |
||||
int n = 0; |
||||
|
||||
for (int i = 0; i < MAX_FD_EVENTS; i++) { |
||||
struct ril_event * rev = watch_table[i]; |
||||
|
||||
if ((rev != NULL) && (rev->fd > n)) { |
||||
n = rev->fd; |
||||
} |
||||
} |
||||
nfds = n + 1; |
||||
dlog("~~~~ nfds = %d ~~~~", nfds); |
||||
} |
||||
} |
||||
|
||||
static void processTimeouts() |
||||
{ |
||||
dlog("~~~~ +processTimeouts ~~~~"); |
||||
MUTEX_ACQUIRE(); |
||||
struct timeval now; |
||||
struct ril_event * tev = timer_list.next; |
||||
struct ril_event * next; |
||||
|
||||
getNow(&now); |
||||
// walk list, see if now >= ev->timeout for any events
|
||||
|
||||
dlog("~~~~ Looking for timers <= %ds + %dus ~~~~", (int)now.tv_sec, (int)now.tv_usec); |
||||
while ((tev != &timer_list) && (timercmp(&now, &tev->timeout, >))) { |
||||
// Timer expired
|
||||
dlog("~~~~ firing timer ~~~~"); |
||||
next = tev->next; |
||||
removeFromList(tev); |
||||
addToList(tev, &pending_list); |
||||
tev = next; |
||||
} |
||||
MUTEX_RELEASE(); |
||||
dlog("~~~~ -processTimeouts ~~~~"); |
||||
} |
||||
|
||||
static void processReadReadies(fd_set * rfds, int n) |
||||
{ |
||||
dlog("~~~~ +processReadReadies (%d) ~~~~", n); |
||||
MUTEX_ACQUIRE(); |
||||
|
||||
for (int i = 0; (i < MAX_FD_EVENTS) && (n > 0); i++) { |
||||
struct ril_event * rev = watch_table[i]; |
||||
if (rev != NULL && FD_ISSET(rev->fd, rfds)) { |
||||
addToList(rev, &pending_list); |
||||
if (rev->persist == false) { |
||||
removeWatch(rev, i); |
||||
} |
||||
n--; |
||||
} |
||||
} |
||||
|
||||
MUTEX_RELEASE(); |
||||
dlog("~~~~ -processReadReadies (%d) ~~~~", n); |
||||
} |
||||
|
||||
static void firePending() |
||||
{ |
||||
dlog("~~~~ +firePending ~~~~"); |
||||
struct ril_event * ev = pending_list.next; |
||||
while (ev != &pending_list) { |
||||
struct ril_event * next = ev->next; |
||||
removeFromList(ev); |
||||
ev->func(ev->fd, 0, ev->param); |
||||
ev = next; |
||||
} |
||||
dlog("~~~~ -firePending ~~~~"); |
||||
} |
||||
|
||||
static int calcNextTimeout(struct timeval * tv) |
||||
{ |
||||
struct ril_event * tev = timer_list.next; |
||||
struct timeval now; |
||||
|
||||
getNow(&now); |
||||
|
||||
// Sorted list, so calc based on first node
|
||||
if (tev == &timer_list) { |
||||
// no pending timers
|
||||
return -1; |
||||
} |
||||
|
||||
dlog("~~~~ now = %ds + %dus ~~~~", (int)now.tv_sec, (int)now.tv_usec); |
||||
dlog("~~~~ next = %ds + %dus ~~~~", |
||||
(int)tev->timeout.tv_sec, (int)tev->timeout.tv_usec); |
||||
if (timercmp(&tev->timeout, &now, >)) { |
||||
timersub(&tev->timeout, &now, tv); |
||||
} else { |
||||
// timer already expired.
|
||||
tv->tv_sec = tv->tv_usec = 0; |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
// Initialize internal data structs
|
||||
void ril_event_init() |
||||
{ |
||||
MUTEX_INIT(); |
||||
|
||||
FD_ZERO(&readFds); |
||||
init_list(&timer_list); |
||||
init_list(&pending_list); |
||||
memset(watch_table, 0, sizeof(watch_table)); |
||||
} |
||||
|
||||
// Initialize an event
|
||||
void ril_event_set(struct ril_event * ev, int fd, bool persist, ril_event_cb func, void * param) |
||||
{ |
||||
dlog("~~~~ ril_event_set %x ~~~~", (unsigned int)ev); |
||||
memset(ev, 0, sizeof(struct ril_event)); |
||||
ev->fd = fd; |
||||
ev->index = -1; |
||||
ev->persist = persist; |
||||
ev->func = func; |
||||
ev->param = param; |
||||
fcntl(fd, F_SETFL, O_NONBLOCK); |
||||
} |
||||
|
||||
// Add event to watch list
|
||||
void ril_event_add(struct ril_event * ev) |
||||
{ |
||||
dlog("~~~~ +ril_event_add ~~~~"); |
||||
MUTEX_ACQUIRE(); |
||||
for (int i = 0; i < MAX_FD_EVENTS; i++) { |
||||
if (watch_table[i] == NULL) { |
||||
watch_table[i] = ev; |
||||
ev->index = i; |
||||
dlog("~~~~ added at %d ~~~~", i); |
||||
dump_event(ev); |
||||
FD_SET(ev->fd, &readFds); |
||||
if (ev->fd >= nfds) nfds = ev->fd+1; |
||||
dlog("~~~~ nfds = %d ~~~~", nfds); |
||||
break; |
||||
} |
||||
} |
||||
MUTEX_RELEASE(); |
||||
dlog("~~~~ -ril_event_add ~~~~"); |
||||
} |
||||
|
||||
// Add timer event
|
||||
void ril_timer_add(struct ril_event * ev, struct timeval * tv) |
||||
{ |
||||
dlog("~~~~ +ril_timer_add ~~~~"); |
||||
MUTEX_ACQUIRE(); |
||||
|
||||
struct ril_event * list; |
||||
if (tv != NULL) { |
||||
// add to timer list
|
||||
list = timer_list.next; |
||||
ev->fd = -1; // make sure fd is invalid
|
||||
|
||||
struct timeval now; |
||||
getNow(&now); |
||||
timeradd(&now, tv, &ev->timeout); |
||||
|
||||
// keep list sorted
|
||||
while (timercmp(&list->timeout, &ev->timeout, < ) |
||||
&& (list != &timer_list)) { |
||||
list = list->next; |
||||
} |
||||
// list now points to the first event older than ev
|
||||
addToList(ev, list); |
||||
} |
||||
|
||||
MUTEX_RELEASE(); |
||||
dlog("~~~~ -ril_timer_add ~~~~"); |
||||
} |
||||
|
||||
// Remove event from watch or timer list
|
||||
void ril_event_del(struct ril_event * ev) |
||||
{ |
||||
dlog("~~~~ +ril_event_del ~~~~"); |
||||
MUTEX_ACQUIRE(); |
||||
|
||||
if (ev->index < 0 || ev->index >= MAX_FD_EVENTS) { |
||||
MUTEX_RELEASE(); |
||||
return; |
||||
} |
||||
|
||||
removeWatch(ev, ev->index); |
||||
|
||||
MUTEX_RELEASE(); |
||||
dlog("~~~~ -ril_event_del ~~~~"); |
||||
} |
||||
|
||||
#if DEBUG |
||||
static void printReadies(fd_set * rfds) |
||||
{ |
||||
for (int i = 0; (i < MAX_FD_EVENTS); i++) { |
||||
struct ril_event * rev = watch_table[i]; |
||||
if (rev != NULL && FD_ISSET(rev->fd, rfds)) { |
||||
dlog("DON: fd=%d is ready", rev->fd); |
||||
} |
||||
} |
||||
} |
||||
#else |
||||
#define printReadies(rfds) do {} while(0) |
||||
#endif |
||||
|
||||
void ril_event_loop() |
||||
{ |
||||
int n; |
||||
fd_set rfds; |
||||
struct timeval tv; |
||||
struct timeval * ptv; |
||||
|
||||
|
||||
for (;;) { |
||||
|
||||
// make local copy of read fd_set
|
||||
memcpy(&rfds, &readFds, sizeof(fd_set)); |
||||
if (-1 == calcNextTimeout(&tv)) { |
||||
// no pending timers; block indefinitely
|
||||
dlog("~~~~ no timers; blocking indefinitely ~~~~"); |
||||
ptv = NULL; |
||||
} else { |
||||
dlog("~~~~ blocking for %ds + %dus ~~~~", (int)tv.tv_sec, (int)tv.tv_usec); |
||||
ptv = &tv; |
||||
} |
||||
printReadies(&rfds); |
||||
n = select(nfds, &rfds, NULL, NULL, ptv); |
||||
printReadies(&rfds); |
||||
dlog("~~~~ %d events fired ~~~~", n); |
||||
if (n < 0) { |
||||
if (errno == EINTR) continue; |
||||
|
||||
RLOGE("ril_event: select error (%d)", errno); |
||||
// bail?
|
||||
return; |
||||
} |
||||
|
||||
// Check for timeouts
|
||||
processTimeouts(); |
||||
// Check for read-ready
|
||||
processReadReadies(&rfds, n); |
||||
// Fire away
|
||||
firePending(); |
||||
} |
||||
} |
||||
@ -1,52 +0,0 @@ |
||||
/* //device/libs/telephony/ril_event.h
|
||||
** |
||||
** Copyright 2008, The Android Open Source Project |
||||
** |
||||
** Licensed under the Apache License, Version 2.0 (the "License"); |
||||
** you may not use this file except in compliance with the License. |
||||
** You may obtain a copy of the License at |
||||
** |
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
** |
||||
** Unless required by applicable law or agreed to in writing, software |
||||
** distributed under the License is distributed on an "AS IS" BASIS, |
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
** See the License for the specific language governing permissions and |
||||
** limitations under the License. |
||||
*/ |
||||
|
||||
// Max number of fd's we watch at any one time. Increase if necessary.
|
||||
#define MAX_FD_EVENTS 8 |
||||
|
||||
typedef void (*ril_event_cb)(int fd, short events, void *userdata); |
||||
|
||||
struct ril_event { |
||||
struct ril_event *next; |
||||
struct ril_event *prev; |
||||
|
||||
int fd; |
||||
int index; |
||||
bool persist; |
||||
struct timeval timeout; |
||||
ril_event_cb func; |
||||
void *param; |
||||
}; |
||||
|
||||
// Initialize internal data structs
|
||||
void ril_event_init(); |
||||
|
||||
// Initialize an event
|
||||
void ril_event_set(struct ril_event * ev, int fd, bool persist, ril_event_cb func, void * param); |
||||
|
||||
// Add event to watch list
|
||||
void ril_event_add(struct ril_event * ev); |
||||
|
||||
// Add timer event
|
||||
void ril_timer_add(struct ril_event * ev, struct timeval * tv); |
||||
|
||||
// Remove event from watch list
|
||||
void ril_event_del(struct ril_event * ev); |
||||
|
||||
// Event loop
|
||||
void ril_event_loop(); |
||||
|
||||
Loading…
Reference in new issue