colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

novatel: port load_current_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-12 04:27:46 -07:00
committed by Aleksander Morgado
parent b25b7723ec
commit b14a3be4f1
1 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
plugins/novatel/mm-broadband-modem-novatel.c
View File

@@ -149,22 +149,23 @@ load_current_modes_finish (MMIfaceModem *self,
{ {
LoadCurrentModesResult *result; LoadCurrentModesResult *result;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) result = g_task_propagate_pointer (G_TASK (res), error);
if (!result)
return FALSE; return FALSE;
/* When a valid result is given, we never complete in idle */
result = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
*allowed = result->allowed; *allowed = result->allowed;
*preferred = result->preferred; *preferred = result->preferred;
g_free (result);
return TRUE; return TRUE;
} }
static void static void
nwrat_query_ready (MMBaseModem *self, nwrat_query_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
LoadCurrentModesResult result; LoadCurrentModesResult *result;
GError *error = NULL; GError *error = NULL;
const gchar *response; const gchar *response;
GRegex *r; GRegex *r;
@@ -174,9 +175,8 @@ nwrat_query_ready (MMBaseModem *self,
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!response) { if (!response) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -186,15 +186,14 @@ nwrat_query_ready (MMBaseModem *self,
if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &error)) { if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &error)) {
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Couldn't match NWRAT reply: %s", "Couldn't match NWRAT reply: %s",
response); response);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
g_match_info_free (match_info); g_match_info_free (match_info);
g_regex_unref (r); g_regex_unref (r);
return; return;
@@ -204,40 +203,41 @@ nwrat_query_ready (MMBaseModem *self,
!mm_get_int_from_match_info (match_info, 2, &b) || !mm_get_int_from_match_info (match_info, 2, &b) ||
a < 0 || a > 2 || a < 0 || a > 2 ||
b < 1 || b > 2) { b < 1 || b > 2) {
g_simple_async_result_set_error ( g_task_return_new_error (
simple, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Failed to parse mode/tech response '%s': invalid modes reported", "Failed to parse mode/tech response '%s': invalid modes reported",
response); response);
g_object_unref (task);
g_match_info_free (match_info); g_match_info_free (match_info);
g_regex_unref (r); g_regex_unref (r);
g_simple_async_result_complete (simple);
g_object_unref (simple);
return; return;
} }
result = g_new0 (LoadCurrentModesResult, 1);
switch (a) { switch (a) {
case 0: case 0:
result.allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); result->allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
result.preferred = MM_MODEM_MODE_NONE; result->preferred = MM_MODEM_MODE_NONE;
break; break;
case 1: case 1:
if (b == 1) { if (b == 1) {
result.allowed = MM_MODEM_MODE_2G; result->allowed = MM_MODEM_MODE_2G;
result.preferred = MM_MODEM_MODE_NONE; result->preferred = MM_MODEM_MODE_NONE;
} else /* b == 2 */ { } else /* b == 2 */ {
result.allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); result->allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
result.preferred = MM_MODEM_MODE_2G; result->preferred = MM_MODEM_MODE_2G;
} }
break; break;
case 2: case 2:
if (b == 1) { if (b == 1) {
result.allowed = MM_MODEM_MODE_3G; result->allowed = MM_MODEM_MODE_3G;
result.preferred = MM_MODEM_MODE_NONE; result->preferred = MM_MODEM_MODE_NONE;
} else /* b == 2 */ { } else /* b == 2 */ {
result.allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G); result->allowed = (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
result.preferred = MM_MODEM_MODE_3G; result->preferred = MM_MODEM_MODE_3G;
} }
break; break;
default: default:
@@ -249,10 +249,8 @@ nwrat_query_ready (MMBaseModem *self,
g_match_info_free (match_info); g_match_info_free (match_info);
g_regex_unref (r); g_regex_unref (r);
/* When a valid result is given, we never complete in idle */ g_task_return_pointer (task, result, g_free);
g_simple_async_result_set_op_res_gpointer (simple, &result, NULL); g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -260,22 +258,18 @@ load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
load_current_modes);
/* Load allowed modes only in 3GPP modems */ /* Load allowed modes only in 3GPP modems */
if (!mm_iface_modem_is_3gpp (self)) { if (!mm_iface_modem_is_3gpp (self)) {
g_simple_async_result_set_error ( g_task_return_new_error (
result, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED, MM_CORE_ERROR_UNSUPPORTED,
"Loading allowed modes not supported in CDMA-only modems"); "Loading allowed modes not supported in CDMA-only modems");
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -284,7 +278,7 @@ load_current_modes (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)nwrat_query_ready, (GAsyncReadyCallback)nwrat_query_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/