From 17efc93f28d9d59b2553c81004caede7f592396e Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Thu, 6 Feb 2014 14:52:05 -0800 Subject: Remove unneeded new RIL command. Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter. Also, space out the NV item enum values so we can add new items per category. Bug: 12864208 Change-Id: I0831b8495d06065e96239ef74d67342daa7b3743 --- include/telephony/ril.h | 25 ++--------- include/telephony/ril_nv_items.h | 93 ++++++++++++++++++++-------------------- libril/ril_commands.h | 1 - 3 files changed, 49 insertions(+), 70 deletions(-) diff --git a/include/telephony/ril.h b/include/telephony/ril.h index afd6d85..c04f560 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -3734,8 +3734,9 @@ typedef struct { * This is used for device configuration by some CDMA operators. * * "data" is int * - * ((int *)data)[0] is 1 for a factory reset (RTN) - * ((int *)data)[0] is 2 for a radio reset (SCRTN) + * ((int *)data)[0] is 1 to reload all NV items + * ((int *)data)[0] is 2 for erase NV reset (SCRTN) + * ((int *)data)[0] is 3 for factory reset (RTN) * * "response" is NULL * @@ -3746,26 +3747,6 @@ typedef struct { */ #define RIL_REQUEST_NV_RESET_CONFIG 121 -/** - * RIL_REQUEST_SET_RADIO_MODE - * - * Set radio mode. The exact meaning of these states is defined by the OEM. - * - * "data" is int * - * ((int *)data)[0] is 0 for "offline mode" - * ((int *)data)[0] is 1 for "online mode" - * ((int *)data)[0] is 2 for "low-power mode" - * ((int *)data)[0] is 3 for "reset radio" - * - * "response" is NULL - * - * Valid errors: - * SUCCESS - * RADIO_NOT_AVAILABLE - * GENERIC_FAILURE - */ -#define RIL_REQUEST_SET_RADIO_MODE 122 - /***********************************************************************/ diff --git a/include/telephony/ril_nv_items.h b/include/telephony/ril_nv_items.h index 817681d..748ea07 100644 --- a/include/telephony/ril_nv_items.h +++ b/include/telephony/ril_nv_items.h @@ -23,62 +23,61 @@ extern "C" { #endif -/* Must match the values in RadioNVItems.java. */ +/* Must match the values in RadioNVItems.java in frameworks/opt/telephony. */ typedef enum { - // CDMA radio information - RIL_NV_CDMA_MEID = 1, // hex MEID - RIL_NV_CDMA_PRL_VERSION = 2, // CDMA PRL version - - // CDMA mobile account information + // CDMA radio and account information (items 1-10) + RIL_NV_CDMA_MEID = 1, // CDMA MEID (hex) + RIL_NV_CDMA_MIN = 2, // CDMA MIN (MSID) RIL_NV_CDMA_MDN = 3, // CDMA MDN - RIL_NV_CDMA_MIN = 4, // CDMA MIN (MSID) + RIL_NV_CDMA_ACCOLC = 4, // CDMA access overload control - // Carrier device provisioning - RIL_NV_DEVICE_MSL = 5, // device MSL - RIL_NV_RTN_RECONDITIONED_STATUS = 6, // RTN reconditioned status - RIL_NV_RTN_ACTIVATION_DATE = 7, // RTN activation date - RIL_NV_RTN_LIFE_TIMER = 8, // RTN life timer - RIL_NV_RTN_LIFE_CALLS = 9, // RTN life calls - RIL_NV_RTN_LIFE_DATA_TX = 10, // RTN life data TX - RIL_NV_RTN_LIFE_DATA_RX = 11, // RTN life data RX - RIL_NV_OMADM_HFA_LEVEL = 12, // HFA in progress + // Carrier device provisioning (items 11-30) + RIL_NV_DEVICE_MSL = 11, // device MSL + RIL_NV_RTN_RECONDITIONED_STATUS = 12, // RTN reconditioned status + RIL_NV_RTN_ACTIVATION_DATE = 13, // RTN activation date + RIL_NV_RTN_LIFE_TIMER = 14, // RTN life timer + RIL_NV_RTN_LIFE_CALLS = 15, // RTN life calls + RIL_NV_RTN_LIFE_DATA_TX = 16, // RTN life data TX + RIL_NV_RTN_LIFE_DATA_RX = 17, // RTN life data RX + RIL_NV_OMADM_HFA_LEVEL = 18, // HFA in progress - // Mobile IP profile information - RIL_NV_MIP_PROFILE_NAI = 13, // NAI realm - RIL_NV_MIP_PROFILE_HOME_ADDRESS = 14, // MIP home address - RIL_NV_MIP_PROFILE_AAA_AUTH = 15, // AAA auth - RIL_NV_MIP_PROFILE_HA_AUTH = 16, // HA auth - RIL_NV_MIP_PROFILE_PRI_HA_ADDR = 17, // primary HA address - RIL_NV_MIP_PROFILE_SEC_HA_ADDR = 18, // secondary HA address - RIL_NV_MIP_PROFILE_REV_TUN_PREF = 19, // reverse TUN preference - RIL_NV_MIP_PROFILE_HA_SPI = 20, // HA SPI - RIL_NV_MIP_PROFILE_AAA_SPI = 21, // AAA SPI - RIL_NV_MIP_PROFILE_MN_HA_SS = 22, // HA shared secret - RIL_NV_MIP_PROFILE_MN_AAA_SS = 23, // AAA shared secret + // Mobile IP profile information (items 31-50) + RIL_NV_MIP_PROFILE_NAI = 31, // NAI realm + RIL_NV_MIP_PROFILE_HOME_ADDRESS = 32, // MIP home address + RIL_NV_MIP_PROFILE_AAA_AUTH = 33, // AAA auth + RIL_NV_MIP_PROFILE_HA_AUTH = 34, // HA auth + RIL_NV_MIP_PROFILE_PRI_HA_ADDR = 35, // primary HA address + RIL_NV_MIP_PROFILE_SEC_HA_ADDR = 36, // secondary HA address + RIL_NV_MIP_PROFILE_REV_TUN_PREF = 37, // reverse TUN preference + RIL_NV_MIP_PROFILE_HA_SPI = 38, // HA SPI + RIL_NV_MIP_PROFILE_AAA_SPI = 39, // AAA SPI + RIL_NV_MIP_PROFILE_MN_HA_SS = 40, // HA shared secret + RIL_NV_MIP_PROFILE_MN_AAA_SS = 41, // AAA shared secret - // CDMA network and band config - RIL_NV_CDMA_BC10 = 24, // CDMA band class 10 - RIL_NV_CDMA_BC14 = 25, // CDMA band class 14 - RIL_NV_CDMA_SO68 = 26, // CDMA SO68 - RIL_NV_CDMA_SO73_COP0 = 27, // CDMA SO73 COP0 - RIL_NV_CDMA_SO73_COP1TO7 = 28, // CDMA SO73 COP1-7 - RIL_NV_CDMA_1X_ADVANCED_ENABLED = 29, // CDMA 1X Advanced enabled - RIL_NV_CDMA_EHRPD_ENABLED = 30, // CDMA eHRPD enabled - RIL_NV_CDMA_EHRPD_FORCED = 31, // CDMA eHRPD forced + // CDMA network and band config (items 51-70) + RIL_NV_CDMA_PRL_VERSION = 51, // CDMA PRL version + RIL_NV_CDMA_BC10 = 52, // CDMA band class 10 + RIL_NV_CDMA_BC14 = 53, // CDMA band class 14 + RIL_NV_CDMA_SO68 = 54, // CDMA SO68 + RIL_NV_CDMA_SO73_COP0 = 55, // CDMA SO73 COP0 + RIL_NV_CDMA_SO73_COP1TO7 = 56, // CDMA SO73 COP1-7 + RIL_NV_CDMA_1X_ADVANCED_ENABLED = 57, // CDMA 1X Advanced enabled + RIL_NV_CDMA_EHRPD_ENABLED = 58, // CDMA eHRPD enabled + RIL_NV_CDMA_EHRPD_FORCED = 59, // CDMA eHRPD forced - // LTE network and band config - RIL_NV_LTE_BAND_ENABLE_25 = 32, // LTE band 25 enable - RIL_NV_LTE_BAND_ENABLE_26 = 33, // LTE band 26 enable - RIL_NV_LTE_BAND_ENABLE_41 = 34, // LTE band 41 enable + // LTE network and band config (items 71-90) + RIL_NV_LTE_BAND_ENABLE_25 = 71, // LTE band 25 enable + RIL_NV_LTE_BAND_ENABLE_26 = 72, // LTE band 26 enable + RIL_NV_LTE_BAND_ENABLE_41 = 73, // LTE band 41 enable - RIL_NV_LTE_SCAN_PRIORITY_25 = 35, // LTE band 25 scan priority - RIL_NV_LTE_SCAN_PRIORITY_26 = 36, // LTE band 26 scan priority - RIL_NV_LTE_SCAN_PRIORITY_41 = 37, // LTE band 41 scan priority + RIL_NV_LTE_SCAN_PRIORITY_25 = 74, // LTE band 25 scan priority + RIL_NV_LTE_SCAN_PRIORITY_26 = 75, // LTE band 26 scan priority + RIL_NV_LTE_SCAN_PRIORITY_41 = 76, // LTE band 41 scan priority - RIL_NV_LTE_HIDDEN_BAND_PRIORITY_25 = 38, // LTE hidden band 25 priority - RIL_NV_LTE_HIDDEN_BAND_PRIORITY_26 = 39, // LTE hidden band 26 priority - RIL_NV_LTE_HIDDEN_BAND_PRIORITY_41 = 40, // LTE hidden band 41 priority + RIL_NV_LTE_HIDDEN_BAND_PRIORITY_25 = 77, // LTE hidden band 25 priority + RIL_NV_LTE_HIDDEN_BAND_PRIORITY_26 = 78, // LTE hidden band 26 priority + RIL_NV_LTE_HIDDEN_BAND_PRIORITY_41 = 79, // LTE hidden band 41 priority } RIL_NV_Item; diff --git a/libril/ril_commands.h b/libril/ril_commands.h index 6a3e47a..1b1a4da 100644 --- a/libril/ril_commands.h +++ b/libril/ril_commands.h @@ -136,4 +136,3 @@ {RIL_REQUEST_NV_WRITE_ITEM, dispatchNVWriteItem, responseVoid}, {RIL_REQUEST_NV_WRITE_CDMA_PRL, dispatchRaw, responseVoid}, {RIL_REQUEST_NV_RESET_CONFIG, dispatchInts, responseVoid}, - {RIL_REQUEST_SET_RADIO_MODE, dispatchInts, responseVoid}, -- cgit v1.2.3