diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2012-11-01 12:40:36 +0100 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2012-11-01 12:40:36 +0100 |
| commit | 1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1 (patch) | |
| tree | 164fbd51f937f62cab5e212674cd16fa223286d8 /disp.c | |
| parent | afb3c6b921053af7d92701f3580be6c04a337990 (diff) | |
| download | hardware_replicant_libsamsung-ril-1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1.tar.gz hardware_replicant_libsamsung-ril-1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1.tar.bz2 hardware_replicant_libsamsung-ril-1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1.zip | |
Reworked RIL requests, globals, SIM status, client
* Handling ril requests with lists
* Renamed functions to complete requests
* Globals (most of them) are held in ril_data
* Renamed SIM_Status to ril_sim_state
* Renamed client object to data
* Moved client funcs to a sub-structure
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'disp.c')
| -rw-r--r-- | disp.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -59,7 +59,7 @@ void ril_request_signal_strength(RIL_Token t) { unsigned char request = 1; - ipc_fmt_send(IPC_DISP_ICON_INFO, IPC_TYPE_GET, &request, sizeof(request), reqGetId(t)); + ipc_fmt_send(IPC_DISP_ICON_INFO, IPC_TYPE_GET, &request, sizeof(request), ril_request_get_id(t)); } void ipc_disp_icon_info(struct ipc_message_info *info) @@ -68,7 +68,7 @@ void ipc_disp_icon_info(struct ipc_message_info *info) RIL_SignalStrength ss; /* Don't consider this if modem isn't in normal power mode. */ - if(ril_state.power_mode < POWER_MODE_NORMAL) + if(ril_data.state.power_state != IPC_PWR_PHONE_STATE_NORMAL) return; if(info->type == IPC_TYPE_NOTI && icon_info->rssi == 0xff) @@ -78,10 +78,10 @@ void ipc_disp_icon_info(struct ipc_message_info *info) if(info->type == IPC_TYPE_NOTI) { LOGD("Unsol request!"); - RIL_onUnsolicitedResponse(RIL_UNSOL_SIGNAL_STRENGTH, &ss, sizeof(ss)); + ril_request_unsolicited(RIL_UNSOL_SIGNAL_STRENGTH, &ss, sizeof(ss)); } else if(info->type == IPC_TYPE_RESP) { LOGD("Sol request!"); - RIL_onRequestComplete(reqGetToken(info->aseq), RIL_E_SUCCESS, &ss, sizeof(ss)); + ril_request_complete(ril_request_get_token(info->aseq), RIL_E_SUCCESS, &ss, sizeof(ss)); } } @@ -92,10 +92,10 @@ void ipc_disp_rssi_info(struct ipc_message_info *info) int rssi; /* Don't consider this if modem isn't in normal power mode. */ - if(ril_state.power_mode < POWER_MODE_NORMAL) + if(ril_data.state.power_state != IPC_PWR_PHONE_STATE_NORMAL) return; ipc2ril_rssi(rssi_info->rssi, &ss); - RIL_onUnsolicitedResponse(RIL_UNSOL_SIGNAL_STRENGTH, &ss, sizeof(ss)); + ril_request_unsolicited(RIL_UNSOL_SIGNAL_STRENGTH, &ss, sizeof(ss)); } |