From 1d86dbc6c847620bbd1a5f2e4787d743a561e4c1 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 1 Jun 2021 11:20:37 -0500 Subject: radio-settings: Do not use enum ofono_access_mode Originally the enum was only meant to signify a single radio access mode preference, but over time its meaning was overloaded to be a bitfield with multiple preferences. Switch away from using an enum value to using an unsigned int to make it clearer that the value is a bitfield. --- drivers/hsomodem/radio-settings.c | 4 ++-- drivers/huaweimodem/radio-settings.c | 10 +++++----- drivers/iceramodem/radio-settings.c | 4 ++-- drivers/ifxmodem/radio-settings.c | 5 ++--- drivers/isimodem/radio-settings.c | 7 +++---- drivers/nwmodem/radio-settings.c | 5 ++--- drivers/qmimodem/radio-settings.c | 5 ++--- drivers/rilmodem/radio-settings.c | 3 +-- drivers/stemodem/radio-settings.c | 9 ++++----- drivers/xmm7modem/radio-settings.c | 5 ++--- drivers/ztemodem/radio-settings.c | 5 ++--- 11 files changed, 27 insertions(+), 35 deletions(-) (limited to 'drivers') diff --git a/drivers/hsomodem/radio-settings.c b/drivers/hsomodem/radio-settings.c index 0a5e48ff..c074d846 100644 --- a/drivers/hsomodem/radio-settings.c +++ b/drivers/hsomodem/radio-settings.c @@ -50,7 +50,7 @@ static void opsys_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value; @@ -120,7 +120,7 @@ static void opsys_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) } static void hso_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, + unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/huaweimodem/radio-settings.c b/drivers/huaweimodem/radio-settings.c index b3f31e56..60a15bc9 100644 --- a/drivers/huaweimodem/radio-settings.c +++ b/drivers/huaweimodem/radio-settings.c @@ -134,7 +134,7 @@ static void syscfg_query_mode_cb(gboolean ok, GAtResult *result, { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value; @@ -182,7 +182,7 @@ static void syscfgex_query_mode_cb(gboolean ok, GAtResult *result, { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; const char *acqorder; @@ -262,7 +262,7 @@ static void syscfgxx_modify_mode_cb(gboolean ok, GAtResult *result, } static void syscfg_set_rat_mode(struct radio_settings_data *rsd, - enum ofono_radio_access_mode mode, + unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { @@ -302,7 +302,7 @@ error: } static void syscfgex_set_rat_mode(struct radio_settings_data *rsd, - enum ofono_radio_access_mode mode, + unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { @@ -344,7 +344,7 @@ static void syscfgex_set_rat_mode(struct radio_settings_data *rsd, } static void huawei_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, + unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/iceramodem/radio-settings.c b/drivers/iceramodem/radio-settings.c index defa4330..77498f37 100644 --- a/drivers/iceramodem/radio-settings.c +++ b/drivers/iceramodem/radio-settings.c @@ -51,7 +51,7 @@ static void ipsys_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value; @@ -121,7 +121,7 @@ static void ipsys_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) } static void icera_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, + unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/ifxmodem/radio-settings.c b/drivers/ifxmodem/radio-settings.c index c132ba70..ebc21e0a 100644 --- a/drivers/ifxmodem/radio-settings.c +++ b/drivers/ifxmodem/radio-settings.c @@ -50,7 +50,7 @@ static void xrat_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value, preferred; @@ -120,8 +120,7 @@ static void xrat_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) cb(&error, cbd->data); } -static void ifx_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void ifx_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/isimodem/radio-settings.c b/drivers/isimodem/radio-settings.c index fa533005..f3f35e3e 100644 --- a/drivers/isimodem/radio-settings.c +++ b/drivers/isimodem/radio-settings.c @@ -52,7 +52,7 @@ struct radio_data { uint16_t quick_release:1; }; -static enum ofono_radio_access_mode isi_mode_to_ofono_mode(guint8 mode) +static unsigned int isi_mode_to_ofono_mode(guint8 mode) { switch (mode) { case GSS_DUAL_RAT: @@ -66,7 +66,7 @@ static enum ofono_radio_access_mode isi_mode_to_ofono_mode(guint8 mode) } } -static int ofono_mode_to_isi_mode(enum ofono_radio_access_mode mode) +static int ofono_mode_to_isi_mode(unsigned int mode) { switch (mode) { case OFONO_RADIO_ACCESS_MODE_ANY: @@ -184,8 +184,7 @@ error: return; } -static void isi_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void isi_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/nwmodem/radio-settings.c b/drivers/nwmodem/radio-settings.c index 13330e0b..0a363f8f 100644 --- a/drivers/nwmodem/radio-settings.c +++ b/drivers/nwmodem/radio-settings.c @@ -50,7 +50,7 @@ static void nwrat_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value; @@ -117,8 +117,7 @@ static void nwrat_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) cb(&error, cbd->data); } -static void nw_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void nw_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c index abddc7e3..7ee95216 100644 --- a/drivers/qmimodem/radio-settings.c +++ b/drivers/qmimodem/radio-settings.c @@ -45,7 +45,7 @@ static void get_system_selection_pref_cb(struct qmi_result *result, { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode = OFONO_RADIO_ACCESS_MODE_ANY; + unsigned int mode = OFONO_RADIO_ACCESS_MODE_ANY; uint16_t pref; DBG(""); @@ -109,8 +109,7 @@ static void set_system_selection_pref_cb(struct qmi_result *result, CALLBACK_WITH_SUCCESS(cb, cbd->data); } -static void qmi_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void qmi_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *user_data) { diff --git a/drivers/rilmodem/radio-settings.c b/drivers/rilmodem/radio-settings.c index a2e25e0b..446b97e1 100644 --- a/drivers/rilmodem/radio-settings.c +++ b/drivers/rilmodem/radio-settings.c @@ -102,8 +102,7 @@ static void ril_set_rat_cb(struct ril_msg *message, gpointer user_data) } } -static void ril_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void ril_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/stemodem/radio-settings.c b/drivers/stemodem/radio-settings.c index 5e726cd5..d30acbc9 100644 --- a/drivers/stemodem/radio-settings.c +++ b/drivers/stemodem/radio-settings.c @@ -56,7 +56,7 @@ enum ste_radio_mode { }; static gboolean ste_mode_to_ofono_mode(enum ste_radio_mode stemode, - enum ofono_radio_access_mode *mode) + unsigned int *mode) { switch (stemode) { case STE_RADIO_ON: @@ -76,7 +76,7 @@ static gboolean ste_mode_to_ofono_mode(enum ste_radio_mode stemode, return FALSE; } -static gboolean ofono_mode_to_ste_mode(enum ofono_radio_access_mode mode, +static gboolean ofono_mode_to_ste_mode(unsigned int mode, enum ste_radio_mode *stemode) { switch (mode) { @@ -100,7 +100,7 @@ static void rat_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value; @@ -161,8 +161,7 @@ static void rat_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) CALLBACK_WITH_SUCCESS(cb, cbd->data); } -static void ste_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void ste_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/xmm7modem/radio-settings.c b/drivers/xmm7modem/radio-settings.c index c7c2ce0e..19557bdc 100644 --- a/drivers/xmm7modem/radio-settings.c +++ b/drivers/xmm7modem/radio-settings.c @@ -50,7 +50,7 @@ static void xact_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value, preferred; @@ -133,8 +133,7 @@ static void xact_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) cb(&error, cbd->data); } -static void xmm_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void xmm_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { diff --git a/drivers/ztemodem/radio-settings.c b/drivers/ztemodem/radio-settings.c index 6a2b1fc1..e83f4550 100644 --- a/drivers/ztemodem/radio-settings.c +++ b/drivers/ztemodem/radio-settings.c @@ -50,7 +50,7 @@ static void zsnt_query_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb; - enum ofono_radio_access_mode mode; + unsigned int mode; struct ofono_error error; GAtResultIter iter; int value; @@ -117,8 +117,7 @@ static void zsnt_modify_cb(gboolean ok, GAtResult *result, gpointer user_data) cb(&error, cbd->data); } -static void zte_set_rat_mode(struct ofono_radio_settings *rs, - enum ofono_radio_access_mode mode, +static void zte_set_rat_mode(struct ofono_radio_settings *rs, unsigned int mode, ofono_radio_settings_rat_mode_set_cb_t cb, void *data) { -- cgit v1.2.1