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.c | |
| parent | d738d983c7d90b727ddda0f3fb3078a9334f5b6e (diff) | |
| download | hardware_replicant_libsamsung-ril-f53bf346ed8a843414a339646b9362d4015bfc25.tar.gz hardware_replicant_libsamsung-ril-f53bf346ed8a843414a339646b9362d4015bfc25.tar.bz2 hardware_replicant_libsamsung-ril-f53bf346ed8a843414a339646b9362d4015bfc25.zip | |
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.c')
| -rw-r--r-- | samsung-ril.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/samsung-ril.c b/samsung-ril.c index 73c2ecd..f84b9f0 100644 --- a/samsung-ril.c +++ b/samsung-ril.c @@ -522,12 +522,21 @@ void ril_on_request(int request, void *data, size_t length, RIL_Token t) case RIL_REQUEST_OPERATOR: ril_request_operator(t); break; +#if RIL_VERSION >= 6 + case RIL_REQUEST_VOICE_REGISTRATION_STATE: + ril_request_voice_registration_state(t); + break; + case RIL_REQUEST_DATA_REGISTRATION_STATE: + ril_request_data_registration_state(t); + break; +#else case RIL_REQUEST_REGISTRATION_STATE: ril_request_registration_state(t); break; case RIL_REQUEST_GPRS_REGISTRATION_STATE: ril_request_gprs_registration_state(t); break; +#endif case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS: ril_request_query_available_networks(t); break; @@ -650,7 +659,7 @@ void ril_data_init(void) */ static const RIL_RadioFunctions ril_ops = { - SAMSUNG_RIL_VERSION, + RIL_VERSION >= 6 ? 6 : RIL_VERSION, ril_on_request, ril_on_state_request, ril_on_supports, |