Bug 728886 - Part 1: Introduce constants from ril.h version 6. r=qDot

This commit is contained in:
Philipp von Weitershausen 2012-03-19 15:49:27 -07:00
parent f189b6f345
commit e55de01d49
3 changed files with 186 additions and 47 deletions

View File

@ -194,15 +194,15 @@ RadioInterfaceLayer.prototype = {
// This one will handle its own notifications.
this.handleEnumerateCalls(message.calls);
break;
case "registrationstatechange":
this.updateDataConnection(message.registrationState);
case "voiceregistrationstatechange":
this.updateDataConnection(message.voiceRegistrationState);
break;
case "gprsregistrationstatechange":
let state = message.gprsRegistrationState;
case "dataregistrationstatechange":
let state = message.dataRegistrationState;
this.updateDataConnection(state);
//TODO for simplicity's sake, for now we only look at
// gprsRegistrationState for the radio registration state.
// dataRegistrationState for the radio registration state.
if (!state || state.regState == RIL.NETWORK_CREG_STATE_UNKNOWN) {
this.resetRadioState();

View File

@ -57,8 +57,8 @@ const REQUEST_CONFERENCE = 16;
const REQUEST_UDUB = 17;
const REQUEST_LAST_CALL_FAIL_CAUSE = 18;
const REQUEST_SIGNAL_STRENGTH = 19;
const REQUEST_REGISTRATION_STATE = 20;
const REQUEST_GPRS_REGISTRATION_STATE = 21;
const REQUEST_VOICE_REGISTRATION_STATE = 20;
const REQUEST_DATA_REGISTRATION_STATE = 21;
const REQUEST_OPERATOR = 22;
const REQUEST_RADIO_POWER = 23;
const REQUEST_DTMF = 24;
@ -114,7 +114,7 @@ const REQUEST_SET_PREFERRED_NETWORK_TYPE = 73;
const REQUEST_GET_PREFERRED_NETWORK_TYPE = 74;
const REQUEST_GET_NEIGHBORING_CELL_IDS = 75;
const REQUEST_SET_LOCATION_UPDATES = 76;
const REQUEST_CDMA_SET_SUBSCRIPTION = 77;
const REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE = 77;
const REQUEST_CDMA_SET_ROAMING_PREFERENCE = 78;
const REQUEST_CDMA_QUERY_ROAMING_PREFERENCE = 79;
const REQUEST_SET_TTY_MODE = 80;
@ -141,6 +141,28 @@ const REQUEST_GET_SMSC_ADDRESS = 100;
const REQUEST_SET_SMSC_ADDRESS = 101;
const REQUEST_REPORT_SMS_MEMORY_STATUS = 102;
const REQUEST_REPORT_STK_SERVICE_IS_RUNNING = 103;
const REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE = 104;
const REQUEST_ISIM_AUTHENTICATION = 105;
const REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU = 106;
const REQUEST_STK_SEND_ENVELOPE_WITH_STATUS = 107;
// Akami/Maguro specific parcel types.
const REQUEST_VOICE_RADIO_TECH = 105;
const REQUEST_IMS_REGISTRATION_STATE = 106;
const REQUEST_IMS_SEND_SMS = 107;
const REQUEST_GET_DATA_CALL_PROFILE = 108;
const REQUEST_SET_UICC_SUBSCRIPTION = 109;
const REQUEST_SET_DATA_SUBSCRIPTION = 110;
const REQUEST_GET_UICC_SUBSCRIPTION = 111;
const REQUEST_GET_DATA_SUBSCRIPTION = 112;
const REQUEST_SET_SUBSCRIPTION_MODE = 113;
const REQUEST_SET_TRANSMIT_POWER = 114;
const REQUEST_SETUP_QOS = 115;
const REQUEST_RELEASE_QOS = 116;
const REQUEST_GET_QOS_STATUS = 117;
const REQUEST_MODIFY_QOS = 118;
const REQUEST_SUSPEND_QOS = 119;
const REQUEST_RESUME_QOS = 120;
const RESPONSE_TYPE_SOLICITED = 0;
const RESPONSE_TYPE_UNSOLICITED = 1;
@ -148,7 +170,7 @@ const RESPONSE_TYPE_UNSOLICITED = 1;
const UNSOLICITED_RESPONSE_BASE = 1000;
const UNSOLICITED_RESPONSE_RADIO_STATE_CHANGED = 1000;
const UNSOLICITED_RESPONSE_CALL_STATE_CHANGED = 1001;
const UNSOLICITED_RESPONSE_NETWORK_STATE_CHANGED = 1002;
const UNSOLICITED_RESPONSE_VOICE_NETWORK_STATE_CHANGED = 1002;
const UNSOLICITED_RESPONSE_NEW_SMS = 1003;
const UNSOLICITED_RESPONSE_NEW_SMS_STATUS_REPORT = 1004;
const UNSOLICITED_RESPONSE_NEW_SMS_ON_SIM = 1005;
@ -177,6 +199,20 @@ const UNSOLICITED_CDMA_INFO_REC = 1027;
const UNSOLICITED_OEM_HOOK_RAW = 1028;
const UNSOLICITED_RINGBACK_TONE = 1029;
const UNSOLICITED_RESEND_INCALL_MUTE = 1030;
const UNSOLICITED_CDMA_SUBSCRIPTION_SOURCE_CHANGED = 1031;
const UNSOLICITED_CDMA_PRL_CHANGED = 1032;
const UNSOLICITED_EXIT_EMERGENCY_CALLBACK_MODE = 1033;
const UNSOLICITED_RIL_CONNECTED = 1034;
// Akami/Maguro specific parcels.
const UNSOLICITED_VOICE_RADIO_TECH_CHANGED = 1034;
const UNSOLICITED_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1035;
const UNSOLICITED_RESPONSE_TETHERED_MODE_STATE_CHANGED = 1036;
const UNSOLICITED_RESPONSE_DATA_NETWORK_STATE_CHANGED = 1037;
const UNSOLICITED_ON_SS = 1038;
const UNSOLICITED_STK_CC_ALPHA_NOTIFY = 1039;
const UNSOLICITED_UICC_SUBSCRIPTION_STATUS_CHANGED = 1040;
const UNSOLICITED_QOS_STATE_CHANGED_IND = 1041;
const ERROR_SUCCESS = 0;
const ERROR_RADIO_NOT_AVAILABLE = 1;
@ -194,9 +230,22 @@ const ERROR_SUBSCRIPTION_NOT_AVAILABLE = 12;
const ERROR_MODE_NOT_SUPPORTED = 13;
const ERROR_FDN_CHECK_FAILURE = 14;
const ERROR_ILLEGAL_SIM_OR_ME = 15;
const ERROR_DIAL_MODIFIED_TO_USSD = 17;
const ERROR_DIAL_MODIFIED_TO_SS = 18;
const ERROR_DIAL_MODIFIED_TO_DIAL = 19;
const ERROR_USSD_MODIFIED_TO_DIAL = 20;
const ERROR_USSD_MODIFIED_TO_SS = 21;
const ERROR_USSD_MODIFIED_TO_USSD = 22;
const ERROR_SS_MODIFIED_TO_DIAL = 23;
const ERROR_SS_MODIFIED_TO_USSD = 24;
const ERROR_SS_MODIFIED_TO_SS = 25;
const ERROR_SUBSCRIPTION_NOT_SUPPORTED = 26;
const RADIO_STATE_OFF = 0;
const RADIO_STATE_UNAVAILABLE = 1;
const RADIO_STATE_ON = 2;
// RIL v5 legacy constants:
const RADIO_STATE_SIM_NOT_READY = 2;
const RADIO_STATE_SIM_LOCKED_OR_ABSENT = 3;
const RADIO_STATE_SIM_READY = 4;
@ -210,17 +259,74 @@ const CARD_STATE_ABSENT = 0;
const CARD_STATE_PRESENT = 1;
const CARD_STATE_ERROR = 2;
const CARD_APP_STATE_UNKNOWN = 0;
const CARD_APP_STATE_DETECTED = 1;
const CARD_APP_STATE_PIN = 2; // If PIN1 or UPin is required.
const CARD_APP_STATE_PUK = 3; // If PUK1 or Puk for UPin is required.
const CARD_APP_STATE_SUBSCRIPTION_PERSO = 4; // perso_substate should be looked
// at when app_state is assigned
// to this value.
const CARD_APP_STATE_READY = 5;
const CARD_PERSOSUBSTATE_UNKNOWN = 0;
const CARD_PERSOSUBSTATE_IN_PROGRESS = 1;
const CARD_PERSOSUBSTATE_READY = 2;
const CARD_PERSOSUBSTATE_SIM_NETWORK = 3;
const CARD_PERSOSUBSTATE_SIM_NETWORK_SUBSET = 4;
const CARD_PERSOSUBSTATE_SIM_CORPORATE = 5;
const CARD_PERSOSUBSTATE_SIM_SERVICE_PROVIDER = 6;
const CARD_PERSOSUBSTATE_SIM_SIM = 7;
const CARD_PERSOSUBSTATE_SIM_NETWORK_PUK = 8;
const CARD_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK = 9;
const CARD_PERSOSUBSTATE_SIM_CORPORATE_PUK = 10;
const CARD_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK = 11;
const CARD_PERSOSUBSTATE_SIM_SIM_PUK = 12;
const CARD_PERSOSUBSTATE_RUIM_NETWORK1 = 13;
const CARD_PERSOSUBSTATE_RUIM_NETWORK2 = 14;
const CARD_PERSOSUBSTATE_RUIM_HRPD = 15;
const CARD_PERSOSUBSTATE_RUIM_CORPORATE = 16;
const CARD_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER = 17;
const CARD_PERSOSUBSTATE_RUIM_RUIM = 18;
const CARD_PERSOSUBSTATE_RUIM_NETWORK1_PUK = 19;
const CARD_PERSOSUBSTATE_RUIM_NETWORK2_PUK = 20;
const CARD_PERSOSUBSTATE_RUIM_HRPD_PUK = 21;
const CARD_PERSOSUBSTATE_RUIM_CORPORATE_PUK = 22;
const CARD_PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK = 23;
const CARD_PERSOSUBSTATE_RUIM_RUIM_PUK = 24;
const CARD_APPSTATE_ILLEGAL = -1;
const CARD_APPSTATE_UNKNOWN = 0;
const CARD_APPSTATE_DETECTED = 1;
const CARD_APPSTATE_PIN = 2; // If PIN1 or UPin is required.
const CARD_APPSTATE_PUK = 3; // If PUK1 or Puk for UPin is required.
const CARD_APPSTATE_SUBSCRIPTION_PERSO = 4; // perso_substate should be looked
// at when app_state is assigned
// to this value.
const CARD_APPSTATE_READY = 5;
const CARD_PINSTATE_UNKNOWN = 0;
const CARD_PINSTATE_ENABLED_NOT_VERIFIED = 1;
const CARD_PINSTATE_ENABLED_VERIFIED = 2;
const CARD_PINSTATE_DISABLED = 3;
const CARD_PINSTATE_ENABLED_BLOCKED = 4;
const CARD_PINSTATE_ENABLED_PERM_BLOCKED = 5;
const CARD_APPTYPE_UNKNOWN = 0;
const CARD_APPTYPE_SIM = 1;
const CARD_APPTYPE_USIM = 2;
const CARD_APPTYPE_RUIM = 3;
const CARD_APPTYPE_CSIM = 4;
const CARD_APPTYPE_ISIM = 5;
const CARD_MAX_APPS = 8;
const NETWORK_SELECTION_MODE_AUTOMATIC = 0;
const NETWORK_SELECTION_MODE_MANUAL = 1;
const PREFERRED_NETWORK_TYPE_GSM_WCDMA = 0;
const PREFERRED_NETWORK_TYPE_GSM_ONLY = 1;
const PREFERRED_NETWORK_TYPE_WCDMA = 2;
const PREFERRED_NETWORK_TYPE_GSM_WCDMA_AUTO = 3;
const PREFERRED_NETWORK_TYPE_CDMA_EVDO_AUTO = 4;
const PREFERRED_NETWORK_TYPE_CDMA_ONLY = 5;
const PREFERRED_NETWORK_TYPE_EVDO_ONLY = 6;
const PREFERRED_NETWORK_TYPE_GSM_WCDMA_CDMA_EVDO_AUTO = 7;
const PREFERRED_NETWORK_TYPE_LTE_CDMA_EVDO = 8;
const PREFERRED_NETWORK_TYPE_LTE_GSM_WCDMA = 9;
const PREFERRED_NETWORK_TYPE_LTE_CMDA_EVDO_GSM_WCDMA = 10;
const PREFERRED_NETWORK_TYPE_LTE_ONLY = 11;
// Network registration states. See TS 27.007 7.2
const NETWORK_CREG_STATE_NOT_SEARCHING = 0;
const NETWORK_CREG_STATE_REGISTERED_HOME = 1;
@ -242,6 +348,9 @@ const NETWORK_CREG_TECH_HSDPA = 9;
const NETWORK_CREG_TECH_HSUPA = 10;
const NETWORK_CREG_TECH_HSPA = 11;
const NETWORK_CREG_TECH_EVDOB = 12;
const NETWORK_CREG_TECH_EHRPD = 13;
const NETWORK_CREG_TECH_LTE = 14;
const NETWORK_CREG_TECH_HSPAP = 15;
const CALL_STATE_ACTIVE = 0;
const CALL_STATE_HOLDING = 1;
@ -1094,6 +1203,9 @@ const PDU_NL_SINGLE_SHIFT_TABLES = [
+ " "
];
const RADIOTECH_FAMILY_3GPP = 1; // GSM, WCDMA, LTE
const RADIOTECH_FAMILY_3GPP2 = 2; // CDMA, EVDO
const DATACALL_RADIOTECHNOLOGY_CDMA = 0;
const DATACALL_RADIOTECHNOLOGY_GSM = 1;
@ -1114,6 +1226,30 @@ const DATACALL_INACTIVE = 0;
const DATACALL_ACTIVE_DOWN = 1;
const DATACALL_ACTIVE_UP = 2;
const DATACALL_FAIL_NONE = 0;
const DATACALL_FAIL_OPERATOR_BARRED = 0x08;
const DATACALL_FAIL_INSUFFICIENT_RESOURCES = 0x1A;
const DATACALL_FAIL_MISSING_UKNOWN_APN = 0x1B;
const DATACALL_FAIL_UNKNOWN_PDP_ADDRESS_TYPE = 0x1C;
const DATACALL_FAIL_USER_AUTHENTICATION = 0x1D;
const DATACALL_FAIL_ACTIVATION_REJECT_GGSN = 0x1E;
const DATACALL_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F;
const DATACALL_FAIL_SERVICE_OPTION_NOT_SUPPORTED = 0x20;
const DATACALL_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21;
const DATACALL_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22;
const DATACALL_FAIL_NSAPI_IN_USE = 0x23;
const DATACALL_FAIL_ONLY_IPV4_ALLOWED = 0x32;
const DATACALL_FAIL_ONLY_IPV6_ALLOWED = 0x33;
const DATACALL_FAIL_ONLY_SINGLE_BEARER_ALLOWED = 0x34;
const DATACALL_FAIL_PROTOCOL_ERRORS = 0x6F;
const DATACALL_FAIL_VOICE_REGISTRATION_FAIL = -1;
const DATACALL_FAIL_DATA_REGISTRATION_FAIL = -2;
const DATACALL_FAIL_SIGNAL_LOST = -3;
const DATACALL_FAIL_PREF_RADIO_TECH_CHANGED = -4;
const DATACALL_FAIL_RADIO_POWER_OFF = -5;
const DATACALL_FAIL_TETHERED_CALL_ACTIVE = -6;
const DATACALL_FAIL_ERROR_UNSPECIFIED = 0xffff;
// Keep consistent with nsINetworkManager.NETWORK_STATE_*.
const GECKO_NETWORK_STATE_UNKNOWN = -1;
const GECKO_NETWORK_STATE_CONNECTING = 0;
@ -1149,6 +1285,9 @@ const GECKO_RADIO_TECH = [
"hsupa",
"hspa",
"evdob",
"ehrpd",
"lte",
"hspa+",
];
// Allow this file to be imported via Components.utils.import().

View File

@ -576,8 +576,8 @@ let RIL = {
SMSC: null,
MSISDN: null,
registrationState: {},
gprsRegistrationState: {},
voiceRegistrationState: {},
dataRegistrationState: {},
/**
* List of strings identifying the network operator.
@ -820,12 +820,12 @@ let RIL = {
Buf.sendParcel();
},
getRegistrationState: function getRegistrationState() {
Buf.simpleRequest(REQUEST_REGISTRATION_STATE);
getVoiceRegistrationState: function getVoiceRegistrationState() {
Buf.simpleRequest(REQUEST_VOICE_REGISTRATION_STATE);
},
getGPRSRegistrationState: function getGPRSRegistrationState() {
Buf.simpleRequest(REQUEST_GPRS_REGISTRATION_STATE);
getDataRegistrationState: function getDataRegistrationState() {
Buf.simpleRequest(REQUEST_DATA_REGISTRATION_STATE);
},
getOperator: function getOperator() {
@ -841,8 +841,8 @@ let RIL = {
*/
requestNetworkInfo: function requestNetworkInfo() {
if (DEBUG) debug("Requesting phone state");
this.getRegistrationState();
this.getGPRSRegistrationState(); //TODO only GSM
this.getVoiceRegistrationState();
this.getDataRegistrationState(); //TODO only GSM
this.getOperator();
this.getNetworkSelectionMode();
},
@ -1205,20 +1205,20 @@ let RIL = {
let newCardState;
switch (app.app_state) {
case CARD_APP_STATE_PIN:
case CARD_APPSTATE_PIN:
newCardState = GECKO_CARDSTATE_PIN_REQUIRED;
break;
case CARD_APP_STATE_PUK:
case CARD_APPSTATE_PUK:
newCardState = GECKO_CARDSTATE_PUK_REQUIRED;
break;
case CARD_APP_STATE_SUBSCRIPTION_PERSO:
case CARD_APPSTATE_SUBSCRIPTION_PERSO:
newCardState = GECKO_CARDSTATE_NETWORK_LOCKED;
break;
case CARD_APP_STATE_READY:
case CARD_APPSTATE_READY:
newCardState = GECKO_CARDSTATE_READY;
break;
case CARD_APP_STATE_UNKNOWN:
case CARD_APP_STATE_DETECTED:
case CARD_APPSTATE_UNKNOWN:
case CARD_APPSTATE_DETECTED:
default:
newCardState = GECKO_CARDSTATE_NOT_READY;
}
@ -1274,8 +1274,8 @@ let RIL = {
}
},
_processRegistrationState: function _processRegistrationState(state) {
let rs = this.registrationState;
_processVoiceRegistrationState: function _processVoiceRegistrationState(state) {
let rs = this.voiceRegistrationState;
let stateChanged = false;
let regState = RIL.parseInt(state[0], NETWORK_CREG_STATE_UNKNOWN);
@ -1310,13 +1310,13 @@ let RIL = {
}
if (stateChanged) {
this.sendDOMMessage({type: "registrationstatechange",
registrationState: rs});
this.sendDOMMessage({type: "voiceregistrationstatechange",
voiceRegistrationState: rs});
}
},
_processGPRSRegistrationState: function _processGPRSRegistrationState(state) {
let rs = this.gprsRegistrationState;
_processDataRegistrationState: function _processDataRegistrationState(state) {
let rs = this.dataRegistrationState;
let stateChanged = false;
let regState = RIL.parseInt(state[0], NETWORK_CREG_STATE_UNKNOWN);
@ -1332,8 +1332,8 @@ let RIL = {
}
if (stateChanged) {
this.sendDOMMessage({type: "gprsregistrationstatechange",
gprsRegistrationState: rs});
this.sendDOMMessage({type: "dataregistrationstatechange",
dataRegistrationState: rs});
}
},
@ -1584,9 +1584,9 @@ RIL[REQUEST_GET_SIM_STATUS] = function REQUEST_GET_SIM_STATUS() {
for (let i = 0 ; i < apps_length ; i++) {
iccStatus.apps.push({
app_type: Buf.readUint32(), // APPTYPE_*
app_state: Buf.readUint32(), // CARD_APP_STATE_*
perso_substate: Buf.readUint32(), // PERSOSUBSTATE_*
app_type: Buf.readUint32(), // CARD_APPTYPE_*
app_state: Buf.readUint32(), // CARD_APPSTATE_*
perso_substate: Buf.readUint32(), // CARD_PERSOSUBSTATE_*
aid: Buf.readString(),
app_label: Buf.readString(),
pin1_replaced: Buf.readUint32(),
@ -1700,13 +1700,13 @@ RIL[REQUEST_SIGNAL_STRENGTH] = function REQUEST_SIGNAL_STRENGTH() {
this.sendDOMMessage({type: "signalstrengthchange",
signalStrength: strength});
};
RIL[REQUEST_REGISTRATION_STATE] = function REQUEST_REGISTRATION_STATE(length) {
RIL[REQUEST_VOICE_REGISTRATION_STATE] = function REQUEST_VOICE_REGISTRATION_STATE(length) {
let state = Buf.readStringList();
this._processRegistrationState(state);
this._processVoiceRegistrationState(state);
};
RIL[REQUEST_GPRS_REGISTRATION_STATE] = function REQUEST_GPRS_REGISTRATION_STATE(length) {
RIL[REQUEST_DATA_REGISTRATION_STATE] = function REQUEST_DATA_REGISTRATION_STATE(length) {
let state = Buf.readStringList();
this._processGPRSRegistrationState(state);
this._processDataRegistrationState(state);
};
RIL[REQUEST_OPERATOR] = function REQUEST_OPERATOR(length) {
let operator = Buf.readStringList();
@ -1989,7 +1989,7 @@ RIL[UNSOLICITED_RESPONSE_RADIO_STATE_CHANGED] = function UNSOLICITED_RESPONSE_RA
RIL[UNSOLICITED_RESPONSE_CALL_STATE_CHANGED] = function UNSOLICITED_RESPONSE_CALL_STATE_CHANGED() {
this.getCurrentCalls();
};
RIL[UNSOLICITED_RESPONSE_NETWORK_STATE_CHANGED] = function UNSOLICITED_RESPONSE_NETWORK_STATE_CHANGED() {
RIL[UNSOLICITED_RESPONSE_VOICE_NETWORK_STATE_CHANGED] = function UNSOLICITED_RESPONSE_VOICE_NETWORK_STATE_CHANGED() {
if (DEBUG) debug("Network state changed, re-requesting phone state.");
this.requestNetworkInfo();
};