From d91d6429805d4c9564b06e76ad3800d1823b560b Mon Sep 17 00:00:00 2001 From: KeeBum Kim Date: Fri, 24 Aug 2012 21:41:41 +0900 Subject: [PATCH] Modify to support SAT & CB. --- plugin/sms_plugin/SmsPluginCallback.cpp | 15 +++++++++------ plugin/sms_plugin/include/SmsPluginCallback.h | 6 +++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/plugin/sms_plugin/SmsPluginCallback.cpp b/plugin/sms_plugin/SmsPluginCallback.cpp index 9fabe41..60ab3c0 100755 --- a/plugin/sms_plugin/SmsPluginCallback.cpp +++ b/plugin/sms_plugin/SmsPluginCallback.cpp @@ -172,12 +172,11 @@ void TapiEventMsgIncoming(TapiHandle *handle, const char *noti_id, void *data, v } -void TapiEventCbMsgIncoming(TapiHandle *handle, int result, void *data, void *user_data) +void TapiEventCbMsgIncoming(TapiHandle *handle, const char *noti_id, void *data, void *user_data) { - MSG_DEBUG("TapiEventCbMsgIncoming is called."); + MSG_DEBUG("TapiEventCbMsgIncoming is called. noti_id [%s]", noti_id); - if (result != TAPI_API_SUCCESS || data == NULL) - { + if (data == NULL) { MSG_DEBUG("Error. evt->pData is NULL."); return; } @@ -677,11 +676,11 @@ void TapiEventSatSmsRefresh(TapiHandle *handle, int result, void *data, void *us } -void TapiEventSatSendSms(TapiHandle *handle, int result, void *data, void *user_data) +void TapiEventSatSendSms(TapiHandle *handle, const char *noti_id, void *data, void *user_data) { MSG_DEBUG("TapiEventSatSendSms is called."); - if (result != TAPI_API_SUCCESS || data == NULL) + if (data == NULL) { MSG_DEBUG("Error. data is NULL."); return; @@ -759,6 +758,10 @@ void SmsPluginCallback::registerEvent() unsigned int tempId = 0; tel_register_noti_event(pTapiHandle, TAPI_NOTI_SMS_INCOM_MSG, TapiEventMsgIncoming, NULL); + tel_register_noti_event(pTapiHandle, TAPI_NOTI_SMS_CB_INCOM_MSG, TapiEventCbMsgIncoming, NULL); +// tel_register_noti_event(pTapiHandle, TAPI_NOTI_SAT_REFRESH, TapiEventSatSmsRefresh, NULL); + tel_register_noti_event(pTapiHandle, TAPI_NOTI_SAT_SEND_SMS, TapiEventSatSendSms, NULL); +// tel_register_noti_event(pTapiHandle, TAPI_NOTI_SAT_MO_SMS_CTRL, TapiEventSatMoSmsCtrl, NULL); } diff --git a/plugin/sms_plugin/include/SmsPluginCallback.h b/plugin/sms_plugin/include/SmsPluginCallback.h index eff1409..90a07ba 100755 --- a/plugin/sms_plugin/include/SmsPluginCallback.h +++ b/plugin/sms_plugin/include/SmsPluginCallback.h @@ -38,8 +38,8 @@ extern "C" void TapiEventDeviceReady(TapiHandle *handle, int result, void *data, void *user_data); void TapiEventSentStatus(TapiHandle *handle, int result, void *data, void *user_data); -void TapiEventMsgIncoming(TapiHandle *handle, int result, void *data, void *user_data); -void TapiEventCbMsgIncoming(TapiHandle *handle, int result, void *data, void *user_data); +void TapiEventMsgIncoming(TapiHandle *handle, const char *noti_id, void *data, void *user_data); +void TapiEventCbMsgIncoming(TapiHandle *handle, const char *noti_id, void *data, void *user_data); void TapiEventDeliveryReportCNF(TapiHandle *handle, int result, void *data, void *user_data); void TapiEventGetSimMsgCnt(TapiHandle *handle, int result, void *data, void *user_data); @@ -55,7 +55,7 @@ void TapiEventGetParamCnt(TapiHandle *handle, int result, void *data, void *user void TapiEventGetParam(TapiHandle *handle, int result, void *data, void *user_data); void TapiEventSatSmsRefresh(TapiHandle *handle, int result, void *data, void *user_data); -void TapiEventSatSendSms(TapiHandle *handle, int result, void *data, void *user_data); +void TapiEventSatSendSms(TapiHandle *handle, const char *noti_id, void *data, void *user_data); void TapiEventSatMoSmsCtrl(TapiHandle *handle, int result, void *data, void *user_data); void TapiEventSimFileInfo(TapiHandle *handle, int result, void *data, void *user_data); -- 2.34.1