Reorder dispatch tables to be numeric.
Change-Id: I0c79797bf997e33adde4383496102e7ccbee2ab4
diff --git a/mock-ril/src/cpp/requests.cpp b/mock-ril/src/cpp/requests.cpp
index 935f01f..6d0800e 100644
--- a/mock-ril/src/cpp/requests.cpp
+++ b/mock-ril/src/cpp/requests.cpp
@@ -270,14 +270,14 @@
int requestsInit(v8::Handle<v8::Context> context, RilRequestWorkerQueue **rwq) {
LOGD("requestsInit E");
- rilReqConversionMap[RIL_REQUEST_GET_SIM_STATUS] = ReqWithNoData;
- rilReqConversionMap[RIL_REQUEST_ENTER_SIM_PIN] = ReqEnterSimPin;
- rilReqConversionMap[RIL_REQUEST_HANGUP] = ReqHangUp;
- rilReqConversionMap[RIL_REQUEST_SCREEN_STATE] = ReqScreenState;
- rilReqConversionMap[RIL_REQUEST_OPERATOR] = ReqWithNoData;
- rilReqConversionMap[RIL_REQUEST_GPRS_REGISTRATION_STATE] = ReqWithNoData;
- rilReqConversionMap[RIL_REQUEST_REGISTRATION_STATE] = ReqWithNoData;
- rilReqConversionMap[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = ReqWithNoData;
+ rilReqConversionMap[RIL_REQUEST_GET_SIM_STATUS] = ReqWithNoData; // 1
+ rilReqConversionMap[RIL_REQUEST_ENTER_SIM_PIN] = ReqEnterSimPin; // 2
+ rilReqConversionMap[RIL_REQUEST_HANGUP] = ReqHangUp; // 12
+ rilReqConversionMap[RIL_REQUEST_REGISTRATION_STATE] = ReqWithNoData; // 20
+ rilReqConversionMap[RIL_REQUEST_GPRS_REGISTRATION_STATE] = ReqWithNoData; // 21
+ rilReqConversionMap[RIL_REQUEST_OPERATOR] = ReqWithNoData; // 22
+ rilReqConversionMap[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = ReqWithNoData; // 45
+ rilReqConversionMap[RIL_REQUEST_SCREEN_STATE] = ReqScreenState; // 61
*rwq = new RilRequestWorkerQueue(context);
int status = (*rwq)->Run();
diff --git a/mock-ril/src/cpp/responses.cpp b/mock-ril/src/cpp/responses.cpp
index 8179324..b7c9b00 100644
--- a/mock-ril/src/cpp/responses.cpp
+++ b/mock-ril/src/cpp/responses.cpp
@@ -340,13 +340,14 @@
LOGD("responsesInit E");
int status = STATUS_OK;
- rilRspConversionMap[RIL_REQUEST_GET_SIM_STATUS] = RspGetSimStatus;
- rilRspConversionMap[RIL_REQUEST_ENTER_SIM_PIN] = RspEnterSimPinData;
- rilRspConversionMap[RIL_REQUEST_SCREEN_STATE] = RspWithNoData;
- rilRspConversionMap[RIL_REQUEST_OPERATOR] = RspOperator;
- rilRspConversionMap[RIL_REQUEST_GPRS_REGISTRATION_STATE] = RspStrings;
- rilRspConversionMap[RIL_REQUEST_REGISTRATION_STATE] = RspStrings;
- rilRspConversionMap[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = RspIntegers;
+ rilRspConversionMap[RIL_REQUEST_GET_SIM_STATUS] = RspGetSimStatus; // 1
+ rilRspConversionMap[RIL_REQUEST_ENTER_SIM_PIN] = RspEnterSimPinData; // 2
+ rilRspConversionMap[RIL_REQUEST_HANGUP] = RspWithNoData; // 12
+ rilRspConversionMap[RIL_REQUEST_REGISTRATION_STATE] = RspStrings; // 20
+ rilRspConversionMap[RIL_REQUEST_GPRS_REGISTRATION_STATE] = RspStrings; // 21
+ rilRspConversionMap[RIL_REQUEST_OPERATOR] = RspOperator; // 22
+ rilRspConversionMap[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = RspIntegers; // 45
+ rilRspConversionMap[RIL_REQUEST_SCREEN_STATE] = RspWithNoData; // 61
LOGD("responsesInit X: status=%d", status);
return STATUS_OK;
diff --git a/mock-ril/src/js/mock_ril.js b/mock-ril/src/js/mock_ril.js
index ee1e3db..5810350 100644
--- a/mock-ril/src/js/mock_ril.js
+++ b/mock-ril/src/js/mock_ril.js
@@ -143,33 +143,33 @@
*/
var dispatchTable = new Array();
-dispatchTable[RIL_REQUEST_GET_SIM_STATUS] = {
+dispatchTable[RIL_REQUEST_GET_SIM_STATUS] = { // 1
'components' : [simulatedIccWorker],
'schemaName' : 'ReqGetSimStatus',
},
-dispatchTable[RIL_REQUEST_ENTER_SIM_PIN] = {
+dispatchTable[RIL_REQUEST_ENTER_SIM_PIN] = { // 2
'components' : [simulatedIccWorker],
'schemaName' : 'ReqEnterSimPin',
},
-dispatchTable[RIL_REQUEST_HANGUP] = {
+dispatchTable[RIL_REQUEST_HANGUP] = { // 12
'components' : [simulatedRadioWorker],
'schemaName' : 'ReqHangUp',
};
-dispatchTable[RIL_REQUEST_SCREEN_STATE] = {
+dispatchTable[RIL_REQUEST_REGISTRATION_STATE] = { // 20
'components' : [simulatedRadioWorker],
- 'schemaName' : 'ReqScreenState',
};
-dispatchTable[RIL_REQUEST_OPERATOR] = {
+dispatchTable[RIL_REQUEST_GPRS_REGISTRATION_STATE] = { // 21
+ 'components' : [simulatedRadioWorker],
+};
+dispatchTable[RIL_REQUEST_OPERATOR] = { // 22
'components' : [simulatedIccWorker],
};
-dispatchTable[RIL_REQUEST_GPRS_REGISTRATION_STATE] = {
+dispatchTable[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = { // 45
'components' : [simulatedRadioWorker],
};
-dispatchTable[RIL_REQUEST_REGISTRATION_STATE] = {
+dispatchTable[RIL_REQUEST_SCREEN_STATE] = { // 61
'components' : [simulatedRadioWorker],
-};
-dispatchTable[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = {
- 'components' : [simulatedRadioWorker],
+ 'schemaName' : 'ReqScreenState',
};
/**
diff --git a/mock-ril/src/js/simulated_icc.js b/mock-ril/src/js/simulated_icc.js
index edb47fb..0fc5116 100644
--- a/mock-ril/src/js/simulated_icc.js
+++ b/mock-ril/src/js/simulated_icc.js
@@ -97,9 +97,9 @@
print('SimulatedIcc() ctor E');
this.simDispatchTable = new Array();
- this.simDispatchTable[RIL_REQUEST_GET_SIM_STATUS] = this.rilRequestGetSimStatus;
- this.simDispatchTable[RIL_REQUEST_ENTER_SIM_PIN] = this.rilRequestEnterSimPin;
- this.simDispatchTable[RIL_REQUEST_OPERATOR] = this.rilRequestOperator;
+ this.simDispatchTable[RIL_REQUEST_GET_SIM_STATUS] = this.rilRequestGetSimStatus; // 1
+ this.simDispatchTable[RIL_REQUEST_ENTER_SIM_PIN] = this.rilRequestEnterSimPin; // 2
+ this.simDispatchTable[RIL_REQUEST_OPERATOR] = this.rilRequestOperator; // 22
print('SimulatedIcc() ctor X');
}
diff --git a/mock-ril/src/js/simulated_radio.js b/mock-ril/src/js/simulated_radio.js
index 1022f59..707b790 100644
--- a/mock-ril/src/js/simulated_radio.js
+++ b/mock-ril/src/js/simulated_radio.js
@@ -136,16 +136,16 @@
print('SimulatedRadio() ctor E');
this.radioDispatchTable = new Array();
- this.radioDispatchTable[RIL_REQUEST_HANGUP] =
+ this.radioDispatchTable[RIL_REQUEST_HANGUP] = // 12
this.rilRequestHangUp;
- this.radioDispatchTable[RIL_REQUEST_SCREEN_STATE] =
- this.rilRequestScreenState;
- this.radioDispatchTable[RIL_REQUEST_GPRS_REGISTRATION_STATE] =
- this.rilRequestGprsRegistrationState;
- this.radioDispatchTable[RIL_REQUEST_REGISTRATION_STATE] =
+ this.radioDispatchTable[RIL_REQUEST_REGISTRATION_STATE] = // 20
this.rilRequestRegistrationState;
- this.radioDispatchTable[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] =
+ this.radioDispatchTable[RIL_REQUEST_GPRS_REGISTRATION_STATE] = // 21
+ this.rilRequestGprsRegistrationState;
+ this.radioDispatchTable[RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE] = // 45
this.rilRequestQueryNeworkSelectionMode;
+ this.radioDispatchTable[RIL_REQUEST_SCREEN_STATE] = // 61
+ this.rilRequestScreenState;
print('SimulatedRadio() ctor X');
}
