summaryrefslogtreecommitdiffstats
path: root/libril/ril_commands.h
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2009-05-22 13:26:36 -0700
committerWink Saville <wink@google.com>2009-05-27 13:34:43 -0700
commita592eebc476a3d234f47f93e58252f8c822fc772 (patch)
treebe79ef738341b9f53b735ca28232adba60228b4f /libril/ril_commands.h
parentfdf825f9d0dc639787b8523638bb61874ed0b540 (diff)
downloadandroid_hardware_ril-a592eebc476a3d234f47f93e58252f8c822fc772.tar.gz
android_hardware_ril-a592eebc476a3d234f47f93e58252f8c822fc772.tar.bz2
android_hardware_ril-a592eebc476a3d234f47f93e58252f8c822fc772.zip
Cleanup and changes of responseCdmaInformationReocrds, Broadcast SMS
configuration and reponseRilSignalStrength. From Motorola, change reponseCdmaInformationRecords to use string for marshalling and simplify by removing duplicate code. Change Broadcast SMS configuration adding some some new fields for Gsm Broadcast configuration and some name changes to be more coherent. Cleanup responseRilSignalStrength, includes some code refactoring and removing the sending of the number of intergers. Now it is assumed that a RIL_SignalStrength structure being sent so it is not necessary to send the length. There is a corresponding change in frameworks/base/telephony/java/com/android/internal/telephony/RIL.java.
Diffstat (limited to 'libril/ril_commands.h')
-rw-r--r--libril/ril_commands.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/libril/ril_commands.h b/libril/ril_commands.h
index 896b44e..9a81e5b 100644
--- a/libril/ril_commands.h
+++ b/libril/ril_commands.h
@@ -33,7 +33,7 @@
{RIL_REQUEST_CONFERENCE, dispatchVoid, responseVoid},
{RIL_REQUEST_UDUB, dispatchVoid, responseVoid},
{RIL_REQUEST_LAST_CALL_FAIL_CAUSE, dispatchVoid, responseInts},
- {RIL_REQUEST_SIGNAL_STRENGTH, dispatchVoid, responseInts},
+ {RIL_REQUEST_SIGNAL_STRENGTH, dispatchVoid, responseRilSignalStrength},
{RIL_REQUEST_REGISTRATION_STATE, dispatchVoid, responseStrings},
{RIL_REQUEST_GPRS_REGISTRATION_STATE, dispatchVoid, responseStrings},
{RIL_REQUEST_OPERATOR, dispatchVoid, responseStrings},
@@ -101,16 +101,16 @@
{RIL_REQUEST_CDMA_FLASH, dispatchString, responseVoid},
{RIL_REQUEST_CDMA_BURST_DTMF, dispatchString, responseVoid},
{RIL_REQUEST_CDMA_VALIDATE_AKEY, dispatchString, responseVoid},
- {RIL_REQUEST_CDMA_SEND_SMS, dispatchCdmaSms, responseSMS}, //new DISPATCH function
- {RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE, dispatchCdmaSmsAck, responseVoid}, //new DISPATCH function
- {RIL_REQUEST_GET_BROADCAST_CONFIG, dispatchVoid, responseBrSmsCnf}, //new RESPONSE function
- {RIL_REQUEST_SET_BROADCAST_CONFIG, dispatchBrSmsCnf, responseVoid}, //new DISPATCH function
- {RIL_REQUEST_BROADCAST_ACTIVATION, dispatchInts, responseVoid},
- {RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG, dispatchVoid, responseCdmaBrCnf}, //new RESPONSE function
- {RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG, dispatchCdmaBrSmsCnf, responseVoid}, //new DISPATCH unction
- {RIL_REQUEST_CDMA_BROADCAST_ACTIVATION, dispatchInts, responseVoid},
- {RIL_REQUEST_CDMA_SUBSCRIPTION, dispatchVoid, responseStrings},//Assumption Made here to use DispatchVoid!
- {RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM, dispatchRilCdmaSmsWriteArgs, responseInts}, //new DISPATCH function
+ {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},