diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2013-02-09 10:44:48 +0100 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2013-02-09 10:44:48 +0100 |
| commit | f53bf346ed8a843414a339646b9362d4015bfc25 (patch) | |
| tree | 08609f947286659837ab70eb4c6c18fd60d70399 /samsung-ril.h | |
| parent | d738d983c7d90b727ddda0f3fb3078a9334f5b6e (diff) | |
| download | hardware_ril_samsung-ril-f53bf346ed8a843414a339646b9362d4015bfc25.zip hardware_ril_samsung-ril-f53bf346ed8a843414a339646b9362d4015bfc25.tar.gz hardware_ril_samsung-ril-f53bf346ed8a843414a339646b9362d4015bfc25.tar.bz2 | |
compat: Removed separate header: apply per-version changes in the code
This is especially relevant when the elements of the structures changed
or need a different handling in the code: that way, we don't confuse which
structure is declared.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'samsung-ril.h')
| -rw-r--r-- | samsung-ril.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/samsung-ril.h b/samsung-ril.h index 9fce50b..1643658 100644 --- a/samsung-ril.h +++ b/samsung-ril.h @@ -29,7 +29,6 @@ #include <radio.h> -#include "compat.h" #include "ipc.h" #include "srs.h" @@ -37,6 +36,18 @@ * Defines */ +#ifndef LOGE + #define LOGE ALOGE +#endif + +#ifndef LOGI + #define LOGI ALOGI +#endif + +#ifndef LOGD + #define LOGD ALOGD +#endif + #define RIL_VERSION_STRING "Samsung RIL" #define RIL_LOCK() pthread_mutex_lock(&ril_data.mutex) @@ -282,8 +293,13 @@ void ril_plmn_string(char *plmn_data, char *response[3]); unsigned char ril_plmn_act_get(char *plmn_data); void ril_request_operator(RIL_Token t); void ipc_net_current_plmn(struct ipc_message_info *message); +#if RIL_VERSION >= 6 +void ril_request_voice_registration_state(RIL_Token t); +void ril_request_data_registration_state(RIL_Token t); +#else void ril_request_registration_state(RIL_Token t); void ril_request_gprs_registration_state(RIL_Token t); +#endif void ipc_net_regist(struct ipc_message_info *message); void ril_request_query_available_networks(RIL_Token t); void ipc_net_plmn_list(struct ipc_message_info *info); |