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

Lots of random fixes:

Browse Source 
Rework the MMCallbackInfo callback invocation.
Always use g_error_literal() where it makes sense.
Replace sleep() calls, with timeouts to not block the whole MM.
This commit is contained in:
Tambet Ingo
2008-12-09 15:41:51 +02:00
parent a504fb408a
commit d1d94de6a1
12 changed files with 199 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/mm-modem-hso.c
View File

@@ -223,19 +223,14 @@ free_dns_array (gpointer data)
} }
static void static void
ip4_callback_wrapper (MMModem *modem, ip4_config_invoke (MMCallbackInfo *info)
GError *error,
gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemHsoIp4Fn callback = (MMModemHsoIp4Fn) info->callback;
MMModemHsoIp4Fn callback;
callback = mm_callback_info_get_data (info, "callback"); callback (MM_MODEM_HSO (info->modem),
callback (MM_MODEM_HSO (modem),
GPOINTER_TO_UINT (mm_callback_info_get_data (info, "ip4-address")), GPOINTER_TO_UINT (mm_callback_info_get_data (info, "ip4-address")),
mm_callback_info_get_data (info, "ip4-dns"), (GArray *) mm_callback_info_get_data (info, "ip4-dns"),
error, info->error, info->user_data);
mm_callback_info_get_data (info, "user-data"));
} }
static void static void
@@ -305,11 +300,7 @@ mm_hso_modem_get_ip4_config (MMModemHso *self,
g_return_if_fail (MM_IS_MODEM_HSO (self)); g_return_if_fail (MM_IS_MODEM_HSO (self));
g_return_if_fail (callback != NULL); g_return_if_fail (callback != NULL);
info = mm_callback_info_new (MM_MODEM (self), ip4_callback_wrapper, NULL); info = mm_callback_info_new_full (MM_MODEM (self), ip4_config_invoke, G_CALLBACK (callback), user_data);
info->user_data = info;
mm_callback_info_set_data (info, "callback", callback, NULL);
mm_callback_info_set_data (info, "user-data", user_data, NULL);
command = g_strdup_printf ("AT_OWANDATA=%d", hso_get_cid (self)); command = g_strdup_printf ("AT_OWANDATA=%d", hso_get_cid (self));
mm_serial_queue_command (MM_SERIAL (self), command, 3, get_ip4_config_done, info); mm_serial_queue_command (MM_SERIAL (self), command, 3, get_ip4_config_done, info);
g_free (command); g_free (command);

25
plugins/mm-modem-huawei.c
View File

@@ -41,14 +41,14 @@ static void
parent_enable_done (MMModem *modem, GError *error, gpointer user_data) parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModemFn cb = (MMModemFn) mm_callback_info_get_data (info, "callback");
if (!error) { if (error)
info->error = g_error_copy (error);
else
/* Enable unsolicited registration state changes */ /* Enable unsolicited registration state changes */
mm_serial_queue_command (MM_SERIAL (modem), "+CREG=1", 5, NULL, NULL); mm_serial_queue_command (MM_SERIAL (modem), "+CREG=1", 5, NULL, NULL);
}
cb (modem, error, mm_callback_info_get_data (info, "user-data")); mm_callback_info_schedule (info);
} }
static void static void
@@ -64,10 +64,7 @@ enable (MMModem *modem,
if (enable) { if (enable) {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (modem, parent_enable_done, NULL); info = mm_callback_info_new (modem, callback, user_data);
info->user_data = info;
mm_callback_info_set_data (info, "callback", callback, NULL);
mm_callback_info_set_data (info, "user-data", user_data, NULL);
parent_modem_iface->enable (modem, enable, parent_enable_done, info); parent_modem_iface->enable (modem, enable, parent_enable_done, info);
} else } else
parent_modem_iface->enable (modem, enable, callback, user_data); parent_modem_iface->enable (modem, enable, callback, user_data);
@@ -161,7 +158,7 @@ set_network_mode (MMModemGsmNetwork *modem,
mm_callback_info_set_data (info, "mode-b", GINT_TO_POINTER (2), NULL); mm_callback_info_set_data (info, "mode-b", GINT_TO_POINTER (2), NULL);
break; break;
default: default:
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Invalid mode."); info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid mode.");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
return; return;
break; break;
@@ -197,8 +194,8 @@ get_network_mode_done (MMSerial *serial,
} }
if (result == 0) if (result == 0)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse network mode results"); "Could not parse network mode results");
else else
mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL); mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
} }
@@ -280,7 +277,7 @@ set_band (MMModemGsmNetwork *modem,
mm_callback_info_set_data (info, "band", GUINT_TO_POINTER (0x200000), NULL); mm_callback_info_set_data (info, "band", GUINT_TO_POINTER (0x200000), NULL);
break; break;
default: default:
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Invalid band."); info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid band.");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
return; return;
break; break;
@@ -314,8 +311,8 @@ get_band_done (MMSerial *serial,
} }
if (result == 0xdeadbeaf) if (result == 0xdeadbeaf)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse band results"); "Could not parse band results");
else else
mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL); mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
} }

4
plugins/mm-modem-mbm.c
View File

@@ -308,8 +308,8 @@ get_network_mode_done (MMSerial *serial,
} }
if (result == 0) if (result == 0)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse network mode results"); "Could not parse network mode results");
else else
mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL); mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
} }

22
plugins/mm-modem-option.c
View File

@@ -33,6 +33,18 @@ pin_check_done (MMModem *modem, GError *error, gpointer user_data)
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
static gboolean
option_enabled (gpointer data)
{
MMCallbackInfo *info = (MMCallbackInfo *) data;
/* Now check the PIN explicitly, option doesn't seem to report
that it needs it otherwise */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
return FALSE;
}
static void static void
parent_enable_done (MMModem *modem, GError *error, gpointer user_data) parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{ {
@@ -43,11 +55,7 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "option-enable"))) { else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "option-enable"))) {
/* Option returns OK on +CFUN=1 right away but needs some time /* Option returns OK on +CFUN=1 right away but needs some time
to finish initialization */ to finish initialization */
sleep (10); g_timeout_add_seconds (10, option_enabled, info);
/* Now check the PIN explicitly, option doesn't seem to report
that it needs it otherwise */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), pin_check_done, info);
return; return;
} }
@@ -110,8 +118,8 @@ get_network_mode_done (MMSerial *serial,
} }
if (!error && !parsed) if (!error && !parsed)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse network mode results"); "Could not parse network mode results");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }

25
plugins/mm-modem-sierra.c
View File

@@ -23,6 +23,28 @@ mm_modem_sierra_new (const char *data_device,
NULL)); NULL));
} }
static void
pin_check_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error)
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
}
static gboolean
sierra_enabled (gpointer data)
{
MMCallbackInfo *info = (MMCallbackInfo *) data;
/* Now check the PIN explicitly, sierra doesn't seem to report
that it needs it otherwise */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
return FALSE;
}
static void static void
parent_enable_done (MMModem *modem, GError *error, gpointer user_data) parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{ {
@@ -33,7 +55,8 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "sierra-enable"))) { else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "sierra-enable"))) {
/* Sierra returns OK on +CFUN=1 right away but needs some time /* Sierra returns OK on +CFUN=1 right away but needs some time
to finish initialization */ to finish initialization */
sleep (10); g_timeout_add_seconds (10, sierra_enabled, info);
return;
} }
mm_callback_info_schedule (info); mm_callback_info_schedule (info);

89
src/mm-callback-info.c
View File

@@ -3,22 +3,45 @@
#include "mm-callback-info.h" #include "mm-callback-info.h"
#include "mm-errors.h" #include "mm-errors.h"
#define CALLBACK_INFO_RESULT "callback-info-result"
static void
invoke_mm_modem_fn (MMCallbackInfo *info)
{
MMModemFn callback = (MMModemFn) info->callback;
callback (info->modem, info->error, info->user_data);
}
static void
invoke_mm_modem_uint_fn (MMCallbackInfo *info)
{
MMModemUIntFn callback = (MMModemUIntFn) info->callback;
callback (info->modem,
GPOINTER_TO_UINT (mm_callback_info_get_data (info, CALLBACK_INFO_RESULT)),
info->error, info->user_data);
}
static void
invoke_mm_modem_string_fn (MMCallbackInfo *info)
{
MMModemStringFn callback = (MMModemStringFn) info->callback;
callback (info->modem,
(const char *) mm_callback_info_get_data (info, CALLBACK_INFO_RESULT),
info->error, info->user_data);
}
static void static void
callback_info_done (gpointer user_data) callback_info_done (gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
gpointer result;
info->pending_id = 0; info->pending_id = 0;
result = mm_callback_info_get_data (info, "callback-info-result"); if (info->invoke_fn && info->callback)
info->invoke_fn (info);
if (info->async_callback)
info->async_callback (info->modem, info->error, info->user_data);
else if (info->uint_callback)
info->uint_callback (info->modem, GPOINTER_TO_UINT (result), info->error, info->user_data);
else if (info->str_callback)
info->str_callback (info->modem, (const char *) result, info->error, info->user_data);
if (info->error) if (info->error)
g_error_free (info->error); g_error_free (info->error);
@@ -45,33 +68,41 @@ mm_callback_info_schedule (MMCallbackInfo *info)
} }
MMCallbackInfo * MMCallbackInfo *
mm_callback_info_new (MMModem *modem, MMModemFn callback, gpointer user_data) mm_callback_info_new_full (MMModem *modem,
MMCallbackInfoInvokeFn invoke_fn,
GCallback callback,
gpointer user_data)
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
g_return_val_if_fail (modem != NULL, NULL);
info = g_slice_new0 (MMCallbackInfo); info = g_slice_new0 (MMCallbackInfo);
g_datalist_init (&info->qdata); g_datalist_init (&info->qdata);
info->modem = g_object_ref (modem); info->modem = g_object_ref (modem);
info->async_callback = callback; info->invoke_fn = invoke_fn;
info->callback = callback;
info->user_data = user_data; info->user_data = user_data;
return info; return info;
} }
MMCallbackInfo *
mm_callback_info_new (MMModem *modem, MMModemFn callback, gpointer user_data)
{
g_return_val_if_fail (modem != NULL, NULL);
return mm_callback_info_new_full (modem, invoke_mm_modem_fn, (GCallback) callback, user_data);
}
MMCallbackInfo * MMCallbackInfo *
mm_callback_info_uint_new (MMModem *modem, mm_callback_info_uint_new (MMModem *modem,
MMModemUIntFn callback, MMModemUIntFn callback,
gpointer user_data) gpointer user_data)
{ {
MMCallbackInfo *info; g_return_val_if_fail (modem != NULL, NULL);
info = g_slice_new0 (MMCallbackInfo); return mm_callback_info_new_full (modem, invoke_mm_modem_uint_fn, (GCallback) callback, user_data);
g_datalist_init (&info->qdata);
info->modem = g_object_ref (modem);
info->uint_callback = callback;
info->user_data = user_data;
return info;
} }
MMCallbackInfo * MMCallbackInfo *
@@ -79,15 +110,9 @@ mm_callback_info_string_new (MMModem *modem,
MMModemStringFn callback, MMModemStringFn callback,
gpointer user_data) gpointer user_data)
{ {
MMCallbackInfo *info; g_return_val_if_fail (modem != NULL, NULL);
info = g_slice_new0 (MMCallbackInfo); return mm_callback_info_new_full (modem, invoke_mm_modem_string_fn, (GCallback) callback, user_data);
g_datalist_init (&info->qdata);
info->modem = g_object_ref (modem);
info->str_callback = callback;
info->user_data = user_data;
return info;
} }
void void
@@ -95,7 +120,9 @@ mm_callback_info_set_result (MMCallbackInfo *info,
gpointer data, gpointer data,
GDestroyNotify destroy) GDestroyNotify destroy)
{ {
mm_callback_info_set_data (info, "callback-info-result", data, destroy); g_return_if_fail (info != NULL);
mm_callback_info_set_data (info, CALLBACK_INFO_RESULT, data, destroy);
} }
void void
@@ -104,6 +131,9 @@ mm_callback_info_set_data (MMCallbackInfo *info,
gpointer data, gpointer data,
GDestroyNotify destroy) GDestroyNotify destroy)
{ {
g_return_if_fail (info != NULL);
g_return_if_fail (key != NULL);
g_datalist_id_set_data_full (&info->qdata, g_quark_from_string (key), data, g_datalist_id_set_data_full (&info->qdata, g_quark_from_string (key), data,
data ? destroy : (GDestroyNotify) NULL); data ? destroy : (GDestroyNotify) NULL);
} }
@@ -113,6 +143,9 @@ mm_callback_info_get_data (MMCallbackInfo *info, const char *key)
{ {
GQuark quark; GQuark quark;
g_return_val_if_fail (info != NULL, NULL);
g_return_val_if_fail (key != NULL, NULL);
quark = g_quark_try_string (key); quark = g_quark_try_string (key);
return quark ? g_datalist_id_get_data (&info->qdata, quark) : NULL; return quark ? g_datalist_id_get_data (&info->qdata, quark) : NULL;

18
src/mm-callback-info.h
View File

@@ -5,18 +5,26 @@
#include "mm-modem.h" #include "mm-modem.h"
typedef struct { typedef struct _MMCallbackInfo MMCallbackInfo;
typedef void (*MMCallbackInfoInvokeFn) (MMCallbackInfo *info);
struct _MMCallbackInfo {
GData *qdata; GData *qdata;
MMModem *modem; MMModem *modem;
MMModemFn async_callback; MMCallbackInfoInvokeFn invoke_fn;
MMModemUIntFn uint_callback; GCallback callback;
MMModemStringFn str_callback;
gpointer user_data; gpointer user_data;
GError *error; GError *error;
guint pending_id; guint pending_id;
} MMCallbackInfo; };
MMCallbackInfo *mm_callback_info_new_full (MMModem *modem,
MMCallbackInfoInvokeFn invoke_fn,
GCallback callback,
gpointer user_data);
MMCallbackInfo *mm_callback_info_new (MMModem *modem, MMCallbackInfo *mm_callback_info_new (MMModem *modem,
MMModemFn callback, MMModemFn callback,

87
src/mm-generic-gsm.c
View File

@@ -109,8 +109,8 @@ pin_check_done (MMSerial *serial,
} }
if (!info->error && !parsed) if (!info->error && !parsed)
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"%s", "Could not parse PIN request results"); "Could not parse PIN request results");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -247,22 +247,15 @@ get_imsi (MMModemGsmCard *modem,
} }
static void static void
card_info_wrapper (MMModem *modem, gsm_card_info_invoke (MMCallbackInfo *info)
GError *error,
gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemGsmCardInfoFn callback = (MMModemGsmCardInfoFn) info->callback;
MMModemGsmCardInfoFn info_cb;
gpointer data;
info_cb = (MMModemGsmCardInfoFn) mm_callback_info_get_data (info, "card-info-callback"); callback (MM_MODEM_GSM_CARD (info->modem),
data = mm_callback_info_get_data (info, "card-info-data"); (char *) mm_callback_info_get_data (info, "card-info-manufacturer"),
(char *) mm_callback_info_get_data (info, "card-info-model"),
info_cb (MM_MODEM_GSM_CARD (modem), (char *) mm_callback_info_get_data (info, "card-info-version"),
(char *) mm_callback_info_get_data (info, "card-info-manufacturer"), info->error, info->user_data);
(char *) mm_callback_info_get_data (info, "card-info-model"),
(char *) mm_callback_info_get_data (info, "card-info-version"),
error, data);
} }
static void static void
@@ -316,10 +309,10 @@ get_card_info (MMModemGsmCard *modem,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (modem), card_info_wrapper, NULL); info = mm_callback_info_new_full (MM_MODEM (modem),
info->user_data = info; gsm_card_info_invoke,
mm_callback_info_set_data (info, "card-info-callback", callback, NULL); G_CALLBACK (callback),
mm_callback_info_set_data (info, "card-info-data", user_data, NULL); user_data);
mm_serial_queue_command (MM_SERIAL (modem), "+CGMI", 3, get_manufacturer_done, info); mm_serial_queue_command (MM_SERIAL (modem), "+CGMI", 3, get_manufacturer_done, info);
mm_serial_queue_command (MM_SERIAL (modem), "+CGMM", 3, get_model_done, info); mm_serial_queue_command (MM_SERIAL (modem), "+CGMM", 3, get_model_done, info);
@@ -685,19 +678,17 @@ do_register (MMModemGsmNetwork *modem,
} }
static void static void
get_registration_info_done (MMModem *modem, GError *error, gpointer user_data) gsm_network_reg_info_invoke (MMCallbackInfo *info)
{ {
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem); MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (info->modem);
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemGsmNetworkRegInfoFn callback = (MMModemGsmNetworkRegInfoFn) info->callback;
MMModemGsmNetworkRegInfoFn reg_info_fn;
reg_info_fn = (MMModemGsmNetworkRegInfoFn) mm_callback_info_get_data (info, "reg-info-callback"); callback (MM_MODEM_GSM_NETWORK (info->modem),
reg_info_fn (MM_MODEM_GSM_NETWORK (modem), priv->reg_status,
priv->reg_status, priv->oper_code,
priv->oper_code, priv->oper_name,
priv->oper_name, info->error,
NULL, info->user_data);
mm_callback_info_get_data (info, "reg-info-data"));
} }
static void static void
@@ -707,10 +698,10 @@ get_registration_info (MMModemGsmNetwork *self,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), get_registration_info_done, NULL); info = mm_callback_info_new_full (MM_MODEM (self),
info->user_data = info; gsm_network_reg_info_invoke,
mm_callback_info_set_data (info, "reg-info-callback", callback, NULL); G_CALLBACK (callback),
mm_callback_info_set_data (info, "reg-info-data", user_data, NULL); user_data);
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -799,20 +790,14 @@ disconnect (MMModem *modem,
} }
static void static void
scan_callback_wrapper (MMModem *modem, gsm_network_scan_invoke (MMCallbackInfo *info)
GError *error,
gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemGsmNetworkScanFn callback = (MMModemGsmNetworkScanFn) info->callback;
MMModemGsmNetworkScanFn scan_fn;
GPtrArray *results;
gpointer data;
scan_fn = (MMModemGsmNetworkScanFn) mm_callback_info_get_data (info, "scan-callback"); callback (MM_MODEM_GSM_NETWORK (info->modem),
results = (GPtrArray *) mm_callback_info_get_data (info, "scan-results"); (GPtrArray *) mm_callback_info_get_data (info, "scan-results"),
data = mm_callback_info_get_data (info, "scan-data"); info->error,
info->user_data);
scan_fn (MM_MODEM_GSM_NETWORK (modem), results, error, data);
} }
static void static void
@@ -888,10 +873,10 @@ scan (MMModemGsmNetwork *modem,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (modem), scan_callback_wrapper, NULL); info = mm_callback_info_new_full (MM_MODEM (modem),
info->user_data = info; gsm_network_scan_invoke,
mm_callback_info_set_data (info, "scan-callback", callback, NULL); G_CALLBACK (callback),
mm_callback_info_set_data (info, "scan-data", user_data, NULL); user_data);
mm_serial_queue_command (MM_SERIAL (modem), "+COPS=?", 60, scan_done, info); mm_serial_queue_command (MM_SERIAL (modem), "+COPS=?", 60, scan_done, info);
} }

4
src/mm-modem-cdma.c
View File

@@ -26,8 +26,8 @@ uint_op_not_supported (MMModem *self,
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_uint_new (self, callback, user_data); info = mm_callback_info_uint_new (self, callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported"); "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }

40
src/mm-modem-gsm-card.c
View File

@@ -49,16 +49,6 @@ str_call_done (MMModem *modem, const char *result, GError *error, gpointer user_
dbus_g_method_return (context, result); dbus_g_method_return (context, result);
} }
static void
str_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModemStringFn callback;
callback = (MMModemStringFn) mm_callback_info_get_data (info, "str-callback");
callback (MM_MODEM (modem), NULL, error, mm_callback_info_get_data (info, "str-data"));
}
static void static void
str_call_not_supported (MMModemGsmCard *self, str_call_not_supported (MMModemGsmCard *self,
MMModemStringFn callback, MMModemStringFn callback,
@@ -66,12 +56,9 @@ str_call_not_supported (MMModemGsmCard *self,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), str_not_supported_wrapper, NULL); info = mm_callback_info_string_new (MM_MODEM (self), callback, user_data);
info->user_data = info; info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
mm_callback_info_set_data (info, "str-callback", callback, NULL); "Operation not supported");
mm_callback_info_set_data (info, "str-data", user_data, NULL);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -93,13 +80,11 @@ info_call_done (MMModemGsmCard *self,
} }
static void static void
info_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data) info_invoke (MMCallbackInfo *info)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemGsmCardInfoFn callback = (MMModemGsmCardInfoFn) info->callback;
MMModemGsmCardInfoFn callback;
callback = (MMModemGsmCardInfoFn) mm_callback_info_get_data (info, "info-callback"); callback (MM_MODEM_GSM_CARD (info->modem), NULL, NULL, NULL, info->error, info->user_data);
callback (MM_MODEM_GSM_CARD (modem), NULL, NULL, NULL, error, mm_callback_info_get_data (info, "info-data"));
} }
static void static void
@@ -109,12 +94,9 @@ info_call_not_supported (MMModemGsmCard *self,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), info_not_supported_wrapper, NULL); info = mm_callback_info_new_full (MM_MODEM (self), info_invoke, G_CALLBACK (callback), user_data);
info->user_data = info; info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
mm_callback_info_set_data (info, "info-callback", callback, NULL); "Operation not supported");
mm_callback_info_set_data (info, "info-data", user_data, NULL);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -138,8 +120,8 @@ async_call_not_supported (MMModemGsmCard *self,
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), callback, user_data); info = mm_callback_info_new (MM_MODEM (self), callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported"); "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }

42
src/mm-modem-gsm-network.c
View File

@@ -74,8 +74,8 @@ async_call_not_supported (MMModemGsmNetwork *self,
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), callback, user_data); info = mm_callback_info_new (MM_MODEM (self), callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported"); "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -98,8 +98,8 @@ uint_call_not_supported (MMModemGsmNetwork *self,
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_uint_new (MM_MODEM (self), callback, user_data); info = mm_callback_info_uint_new (MM_MODEM (self), callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported"); "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -123,13 +123,11 @@ reg_info_call_done (MMModemGsmNetwork *self,
} }
static void static void
reg_info_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data) reg_info_invoke (MMCallbackInfo *info)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemGsmNetworkRegInfoFn callback = (MMModemGsmNetworkRegInfoFn) info->callback;
MMModemGsmNetworkRegInfoFn callback;
callback = (MMModemGsmNetworkRegInfoFn) mm_callback_info_get_data (info, "reg-info-callback"); callback (MM_MODEM_GSM_NETWORK (info->modem), 0, NULL, NULL, info->error, info->user_data);
callback (MM_MODEM_GSM_NETWORK (modem), 0, NULL, NULL, error, mm_callback_info_get_data (info, "reg-info-data"));
} }
static void static void
@@ -139,12 +137,9 @@ reg_info_call_not_supported (MMModemGsmNetwork *self,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), reg_info_not_supported_wrapper, NULL); info = mm_callback_info_new_full (MM_MODEM (self), reg_info_invoke, G_CALLBACK (callback), user_data);
info->user_data = info; info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
mm_callback_info_set_data (info, "reg-info-callback", callback, NULL); "Operation not supported");
mm_callback_info_set_data (info, "reg-info-data", user_data, NULL);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -164,13 +159,11 @@ scan_call_done (MMModemGsmNetwork *self,
} }
static void static void
scan_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data) gsm_network_scan_invoke (MMCallbackInfo *info)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMModemGsmNetworkScanFn callback = (MMModemGsmNetworkScanFn) info->callback;
MMModemGsmNetworkScanFn callback;
callback = (MMModemGsmNetworkScanFn) mm_callback_info_get_data (info, "scan-callback"); callback (MM_MODEM_GSM_NETWORK (info->modem), NULL, info->error, info->user_data);
callback (MM_MODEM_GSM_NETWORK (modem), NULL, error, mm_callback_info_get_data (info, "scan-data"));
} }
static void static void
@@ -180,12 +173,9 @@ scan_call_not_supported (MMModemGsmNetwork *self,
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (MM_MODEM (self), scan_not_supported_wrapper, NULL); info = mm_callback_info_new_full (MM_MODEM (self), gsm_network_scan_invoke, G_CALLBACK (callback), user_data);
info->user_data = info; info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
mm_callback_info_set_data (info, "scan-callback", callback, NULL); "Operation not supported");
mm_callback_info_set_data (info, "scan-data", user_data, NULL);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }

4
src/mm-modem.c
View File

@@ -20,8 +20,8 @@ async_op_not_supported (MMModem *self,
MMCallbackInfo *info; MMCallbackInfo *info;
info = mm_callback_info_new (self, callback, user_data); info = mm_callback_info_new (self, callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
"%s", "Operation not supported"); "Operation not supported");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }