sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

xmm7xxx: Various style cleanups

This commit is contained in:
Denis Kenzior 2018-12-13 10:11:00 -06:00
parent 06d16faeda
commit a10f444a3e
1 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/xmm7xxx.c
View File

@ -157,7 +157,8 @@ static void coex_agent_set_removed_notify(struct coex_agent *agent,
agent->removed_data = user_data; agent->removed_data = user_data;
} }
static void coex_agent_send_noreply(struct coex_agent *agent, const char *method) static void coex_agent_send_noreply(struct coex_agent *agent,
const char *method)
{ {
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
DBusMessage *message; DBusMessage *message;
@ -169,7 +170,6 @@ static void coex_agent_send_noreply(struct coex_agent *agent, const char *method
return; return;
dbus_message_set_no_reply(message, TRUE); dbus_message_set_no_reply(message, TRUE);
g_dbus_send_message(conn, message); g_dbus_send_message(conn, message);
} }
@ -257,17 +257,13 @@ static int coex_agent_coex_wlan_notify(struct coex_agent *agent,
"{sv}", &wl_dict); "{sv}", &wl_dict);
value = wlan_info.safe_tx_min; value = wlan_info.safe_tx_min;
ofono_dbus_dict_append(&wl_dict, "SafeTxMin", ofono_dbus_dict_append(&wl_dict, "SafeTxMin", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = wlan_info.safe_tx_max; value = wlan_info.safe_tx_max;
ofono_dbus_dict_append(&wl_dict, "SafeTxMax", ofono_dbus_dict_append(&wl_dict, "SafeTxMax", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = wlan_info.safe_rx_min; value = wlan_info.safe_rx_min;
ofono_dbus_dict_append(&wl_dict, "SafeRxMin", ofono_dbus_dict_append(&wl_dict, "SafeRxMin", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = wlan_info.safe_rx_max; value = wlan_info.safe_rx_max;
ofono_dbus_dict_append(&wl_dict, "SafeRxMax", ofono_dbus_dict_append(&wl_dict, "SafeRxMax", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = wlan_info.num_safe_vector; value = wlan_info.num_safe_vector;
ofono_dbus_dict_append(&wl_dict, "NumSafeVector", ofono_dbus_dict_append(&wl_dict, "NumSafeVector",
DBUS_TYPE_UINT32, &value); DBUS_TYPE_UINT32, &value);
@ -316,20 +312,20 @@ static int coex_agent_coex_bt_notify(struct coex_agent *agent,
value = bt_info.safe_tx_min; value = bt_info.safe_tx_min;
DBG("value = %d", value); DBG("value = %d", value);
ofono_dbus_dict_append(&bt_dict, "SafeTxMin", ofono_dbus_dict_append(&bt_dict, "SafeTxMin", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = bt_info.safe_tx_max; value = bt_info.safe_tx_max;
DBG("value = %d", value); DBG("value = %d", value);
ofono_dbus_dict_append(&bt_dict, "SafeTxMax", ofono_dbus_dict_append(&bt_dict, "SafeTxMax", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = bt_info.safe_rx_min; value = bt_info.safe_rx_min;
DBG("value = %d", value); DBG("value = %d", value);
ofono_dbus_dict_append(&bt_dict, "SafeRxMin", ofono_dbus_dict_append(&bt_dict, "SafeRxMin", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = bt_info.safe_rx_max; value = bt_info.safe_rx_max;
DBG("value = %d", value); DBG("value = %d", value);
ofono_dbus_dict_append(&bt_dict, "SafeRxMax", ofono_dbus_dict_append(&bt_dict, "SafeRxMax", DBUS_TYPE_UINT32, &value);
DBUS_TYPE_UINT32, &value);
value = bt_info.num_safe_vector; value = bt_info.num_safe_vector;
DBG("value = %d", value); DBG("value = %d", value);
ofono_dbus_dict_append(&bt_dict, "NumSafeVector", ofono_dbus_dict_append(&bt_dict, "NumSafeVector",
@ -383,7 +379,7 @@ static void xmm_get_band_string(int lte_band, char *band)
{ {
int band_lte; int band_lte;
band_lte = lte_band-NET_BAND_LTE_1+1; band_lte = lte_band - NET_BAND_LTE_1 + 1;
if (lte_band >= NET_BAND_LTE_1 && lte_band <= NET_BAND_LTE_43) if (lte_band >= NET_BAND_LTE_1 && lte_band <= NET_BAND_LTE_43)
sprintf(band, "BAND_LTE_%d", band_lte); sprintf(band, "BAND_LTE_%d", band_lte);
@ -469,8 +465,8 @@ static void coex_set_params_cb(gboolean ok, GAtResult *result,
if (coex->wlan_bw != coex->pending_wlan_bw) { if (coex->wlan_bw != coex->pending_wlan_bw) {
const char *str_band = wlan_bw_to_string(coex->wlan_bw); const char *str_band = wlan_bw_to_string(coex->wlan_bw);
coex->wlan_bw = coex->pending_wlan_bw;
coex->wlan_bw = coex->pending_wlan_bw;
ofono_dbus_signal_property_changed(conn, path, ofono_dbus_signal_property_changed(conn, path,
OFONO_COEX_INTERFACE, "WLANBandwidth", OFONO_COEX_INTERFACE, "WLANBandwidth",
DBUS_TYPE_STRING, &str_band); DBUS_TYPE_STRING, &str_band);
@ -814,9 +810,8 @@ static void xmm_coex_w_notify(GAtResult *result, gpointer user_data)
g_at_result_iter_skip_next(&iter); g_at_result_iter_skip_next(&iter);
g_at_result_iter_next_number(&iter, &wlan.num_safe_vector); g_at_result_iter_next_number(&iter, &wlan.num_safe_vector);
for (count = 0; count < wlan.num_safe_vector; count++) { for (count = 0; count < wlan.num_safe_vector; count++)
g_at_result_iter_next_number(&iter, &wlan.safe_vector[count]); g_at_result_iter_next_number(&iter, &wlan.safe_vector[count]);
}
DBG("WLAN notification"); DBG("WLAN notification");
@ -842,9 +837,8 @@ static void xmm_coex_b_notify(GAtResult *result, gpointer user_data)
g_at_result_iter_next_number(&iter, &bt.safe_tx_max); g_at_result_iter_next_number(&iter, &bt.safe_tx_max);
g_at_result_iter_next_number(&iter, &bt.num_safe_vector); g_at_result_iter_next_number(&iter, &bt.num_safe_vector);
for (count = 0; count < bt.num_safe_vector; count++) { for (count = 0; count < bt.num_safe_vector; count++)
g_at_result_iter_next_number(&iter, &bt.safe_vector[count]); g_at_result_iter_next_number(&iter, &bt.safe_vector[count]);
}
DBG("BT notification"); DBG("BT notification");
@ -912,10 +906,9 @@ static void coex_cleanup(void *data)
static int xmm_coex_enable(struct ofono_modem *modem, void *data) static int xmm_coex_enable(struct ofono_modem *modem, void *data)
{ {
struct xmm7xxx_coex *coex; struct xmm7xxx_coex *coex = g_new0(struct xmm7xxx_coex, 1);
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
const char *path = ofono_modem_get_path(modem); const char *path = ofono_modem_get_path(modem);
coex = g_new0(struct xmm7xxx_coex, 1);
DBG("coex enable"); DBG("coex enable");