diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 16:48:36 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 16:48:36 -0800 |
commit | 2c464b0d9dbc759e4021b90029c4224adc1c8851 (patch) | |
tree | b54c45e92dc4a7aea836df336ccadddb5aec51f2 /include/telephony/ril.h | |
parent | 6a775fe2ff760239ddce5d20813518ef8944d3cc (diff) | |
parent | a18b9d1e1a014290691d63a7f335085dadc83e46 (diff) | |
download | android_hardware_ril-2c464b0d9dbc759e4021b90029c4224adc1c8851.tar.gz android_hardware_ril-2c464b0d9dbc759e4021b90029c4224adc1c8851.tar.bz2 android_hardware_ril-2c464b0d9dbc759e4021b90029c4224adc1c8851.zip |
Merge commit 'a18b9d1e1a014290691d63a7f335085dadc83e46' into HEAD
Diffstat (limited to 'include/telephony/ril.h')
-rw-r--r-- | include/telephony/ril.h | 113 |
1 files changed, 111 insertions, 2 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 9ce86de..803d965 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -19,6 +19,7 @@ #include <stdlib.h> #include <stdint.h> +#include <telephony/ril_cdma_sms.h> #ifndef FEATURE_UNIT_TEST #include <sys/time.h> #endif /* !FEATURE_UNIT_TEST */ @@ -27,7 +28,7 @@ extern "C" { #endif -#define RIL_VERSION 8 /* Current version */ +#define RIL_VERSION 9 /* Current version */ #define RIL_VERSION_MIN 6 /* Minimum RIL_VERSION supported */ #define CDMA_ALPHA_INFO_BUFFER_LENGTH 64 @@ -233,6 +234,28 @@ typedef struct { to point connections. */ } RIL_Data_Call_Response_v6; +typedef enum { + RADIO_TECH_3GPP = 1, /* 3GPP Technologies - GSM, WCDMA */ + RADIO_TECH_3GPP2 = 2 /* 3GPP2 Technologies - CDMA */ +} RIL_RadioTechnologyFamily; + +typedef struct { + RIL_RadioTechnologyFamily tech; + unsigned char retry; /* 0 == not retry, nonzero == retry */ + int messageRef; /* Valid field if retry is set to nonzero. + Contains messageRef from RIL_SMS_Response + corresponding to failed MO SMS. + */ + + union { + /* Valid field if tech is RADIO_TECH_3GPP2. See RIL_REQUEST_CDMA_SEND_SMS */ + RIL_CDMA_SMS_Message* cdmaMessage; + + /* Valid field if tech is RADIO_TECH_3GPP. See RIL_REQUEST_SEND_SMS */ + char** gsmMessage; + } message; +} RIL_IMS_SMS_Message; + typedef struct { int messageRef; /* TP-Message-Reference for GSM, and BearerData MessageId for CDMA @@ -388,6 +411,7 @@ typedef enum { PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21, /* no retry */ PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22, PDP_FAIL_NSAPI_IN_USE = 0x23, /* no retry */ + PDP_FAIL_REGULAR_DEACTIVATION = 0x24, /* restart radio */ PDP_FAIL_ONLY_IPV4_ALLOWED = 0x32, /* no retry */ PDP_FAIL_ONLY_IPV6_ALLOWED = 0x33, /* no retry */ PDP_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34, @@ -398,7 +422,7 @@ typedef enum { PDP_FAIL_DATA_REGISTRATION_FAIL = -2, /* reasons for data call drop - network/modem disconnect */ - PDP_FAIL_SIGNAL_LOST = -3, /* no retry */ + PDP_FAIL_SIGNAL_LOST = -3, PDP_FAIL_PREF_RADIO_TECH_CHANGED = -4,/* preferred technology has changed, should retry with parameters appropriate for new technology */ PDP_FAIL_RADIO_POWER_OFF = -5, /* data call was disconnected because radio was resetting, @@ -3483,6 +3507,64 @@ typedef struct { */ #define RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE 110 +/** + * RIL_REQUEST_SET_INITIAL_ATTACH_APN + * + * Set an apn to initial attach network + * "response" is NULL + * + * Valid errors: + * SUCCESS + * RADIO_NOT_AVAILABLE (radio resetting) + * GENERIC_FAILURE + * SUBSCRIPTION_NOT_AVAILABLE + */ +#define RIL_REQUEST_SET_INITIAL_ATTACH_APN 111 + +/** + * RIL_REQUEST_IMS_REGISTRATION_STATE + * + * Request current IMS registration state + * + * "data" is NULL + * + * "response" is int * + * ((int *)response)[0] is registration state: + * 0 - Not registered + * 1 - Registered + * ((int *)response)[1] is bitmap of the supported services: + * & 0x1 - SMS supported + * + * If IMS is registered and supports SMS, then ((int *) response)[2] + * must follow with IMS SMS format: + * + * ((int *) response)[2] is of type const RIL_IMS_SMS_Format + */ +#define RIL_REQUEST_IMS_REGISTRATION_STATE 112 + +/** + * RIL_REQUEST_IMS_SEND_SMS + * + * Send a SMS message over IMS + * + * "data" is const RIL_IMS_SMS_Message * + * + * "response" is a const RIL_SMS_Response * + * + * Based on the return error, caller decides to resend if sending sms + * fails. SMS_SEND_FAIL_RETRY means retry, and other errors means no retry. + * In case of retry, data is encoded based on Voice Technology available. + * + * Valid errors: + * SUCCESS + * RADIO_NOT_AVAILABLE + * SMS_SEND_FAIL_RETRY + * FDN_CHECK_FAILURE + * GENERIC_FAILURE + * + */ +#define RIL_REQUEST_IMS_SEND_SMS 113 + /***********************************************************************/ @@ -3973,6 +4055,25 @@ typedef struct { */ #define RIL_UNSOL_CELL_INFO_LIST 1036 +/* + * RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED + * + * Called when IMS registration state has changed + * + * "data" is int * + * ((int *)response)[0] is registration state: + * 0 - Not registered + * 1 - Registered + * ((int *)response)[1] is bitmap of the services supported: + * & 0x1 - SMS supported + * + * If IMS is registered and supports SMS, then ((int *) response)[2] + * must follow with IMS SMS format: + * + * ((int *) response)[2] is of type const RIL_IMS_SMS_Format + */ +#define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1037 + /***********************************************************************/ @@ -4041,6 +4142,14 @@ typedef struct { RIL_GetVersion getVersion; } RIL_RadioFunctions; +typedef struct { + char *apn; + char *protocol; + int authtype; + char *username; + char *password; +} RIL_InitialAttachApn; + #ifdef RIL_SHLIB struct RIL_Env { /** |