diff options
-rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 1 | ||||
-rw-r--r-- | plugins/icera/mm-broadband-bearer-icera.c | 7 | ||||
-rw-r--r-- | plugins/iridium/mm-bearer-iridium.c | 3 | ||||
-rw-r--r-- | plugins/mbm/mm-broadband-bearer-mbm.c | 4 | ||||
-rw-r--r-- | plugins/option/mm-broadband-bearer-hso.c | 32 | ||||
-rw-r--r-- | plugins/option/mm-broadband-modem-hso.c | 4 | ||||
-rw-r--r-- | plugins/sierra/mm-broadband-bearer-sierra.c | 4 | ||||
-rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra.c | 2 | ||||
-rw-r--r-- | src/mm-base-modem-at.c | 11 | ||||
-rw-r--r-- | src/mm-base-modem-at.h | 1 | ||||
-rw-r--r-- | src/mm-broadband-bearer.c | 9 | ||||
-rw-r--r-- | src/mm-broadband-modem.c | 8 |
12 files changed, 65 insertions, 21 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 9f5229ac..ffac200f 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -1054,6 +1054,7 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self, "^CURC=0", 5, FALSE, /* allow_cached */ + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)own_disable_unsolicited_events_ready, result); diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c index 44b2a38c..8a277f0f 100644 --- a/plugins/icera/mm-broadband-bearer-icera.c +++ b/plugins/icera/mm-broadband-bearer-icera.c @@ -244,6 +244,7 @@ get_ip_config_3gpp (MMBroadbandBearer *self, command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)ip_config_ready, ctx); @@ -441,6 +442,7 @@ disconnect_3gpp (MMBroadbandBearer *bearer, command, 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)disconnect_ipdpact_ready, g_object_ref (ctx->self)); /* we pass the bearer object! */ @@ -553,6 +555,7 @@ connect_reset (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)connect_reset_ready, ctx); @@ -685,6 +688,7 @@ report_connect_status (MMBroadbandBearerIcera *self, "%IER?", 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)ier_query_ready, ctx); @@ -781,6 +785,7 @@ deactivate_ready (MMBaseModem *modem, command, 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)activate_ready, g_object_ref (ctx->self)); /* we pass the bearer object! */ @@ -820,6 +825,7 @@ authenticate_ready (MMBaseModem *modem, command, 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)deactivate_ready, ctx); @@ -856,6 +862,7 @@ authenticate (Dial3gppContext *ctx) command, 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)authenticate_ready, ctx); diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c index 86c7e5fb..a3c81d6a 100644 --- a/plugins/iridium/mm-bearer-iridium.c +++ b/plugins/iridium/mm-bearer-iridium.c @@ -155,6 +155,7 @@ dial_ready (MMBaseModem *modem, "+CEER", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)connect_report_ready, ctx); @@ -215,6 +216,7 @@ service_type_ready (MMBaseModem *modem, "ATDT008816000025", 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)dial_ready, ctx); @@ -255,6 +257,7 @@ connect (MMBearer *self, "+CBST=71,0,1", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)service_type_ready, ctx); diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c index 1e2b9f7a..09853202 100644 --- a/plugins/mbm/mm-broadband-bearer-mbm.c +++ b/plugins/mbm/mm-broadband-bearer-mbm.c @@ -287,6 +287,7 @@ poll_timeout_cb (MMBroadbandBearerMbm *self) "AT*ENAP?", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)poll_ready, g_object_ref (ctx->self)); /* we pass the bearer object! */ @@ -360,6 +361,7 @@ activate (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)activate_ready, g_object_ref (ctx->self)); /* we pass the bearer object! */ @@ -416,6 +418,7 @@ authenticate (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)authenticate_ready, ctx); @@ -522,6 +525,7 @@ disconnect_3gpp (MMBroadbandBearer *self, "*ENAP=0", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)disconnect_enap_ready, ctx); diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c index 0fc96bc0..885082ff 100644 --- a/plugins/option/mm-broadband-bearer-hso.c +++ b/plugins/option/mm-broadband-bearer-hso.c @@ -212,19 +212,21 @@ get_ip_config_3gpp (MMBroadbandBearer *self, gchar *command; command = g_strdup_printf ("AT_OWANDATA=%d", cid); - mm_base_modem_at_command_full (MM_BASE_MODEM (modem), - primary, - command, - 3, - FALSE, - NULL, /* cancellable */ - (GAsyncReadyCallback)ip_config_ready, - get_ip_config_3gpp_context_new (MM_BROADBAND_BEARER_HSO (self), - MM_BASE_MODEM (modem), - primary, - cid, - callback, - user_data)); + mm_base_modem_at_command_full ( + MM_BASE_MODEM (modem), + primary, + command, + 3, + FALSE, + FALSE, /* raw */ + NULL, /* cancellable */ + (GAsyncReadyCallback)ip_config_ready, + get_ip_config_3gpp_context_new (MM_BROADBAND_BEARER_HSO (self), + MM_BASE_MODEM (modem), + primary, + cid, + callback, + user_data)); g_free (command); } @@ -401,6 +403,7 @@ connect_reset (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)connect_reset_ready, ctx); @@ -537,6 +540,7 @@ authenticate_ready (MMBaseModem *modem, command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)activate_ready, g_object_ref (ctx->self)); /* we pass the bearer object! */ @@ -588,6 +592,7 @@ authenticate (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)authenticate_ready, ctx); @@ -693,6 +698,7 @@ disconnect_3gpp (MMBroadbandBearer *self, command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)disconnect_owancall_ready, ctx); diff --git a/plugins/option/mm-broadband-modem-hso.c b/plugins/option/mm-broadband-modem-hso.c index 00db5c32..c3f8d1e4 100644 --- a/plugins/option/mm-broadband-modem-hso.c +++ b/plugins/option/mm-broadband-modem-hso.c @@ -481,6 +481,7 @@ disable_location_gathering (MMIfaceModemLocation *self, "_OGPS=0", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)gps_disabled_ready, result); @@ -582,6 +583,7 @@ parent_enable_location_gathering_ready (MMIfaceModemLocation *self, "_OGPS=2", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)gps_enabled_ready, ctx); @@ -659,7 +661,7 @@ setup_ports (MMBroadbandModem *self) mm_base_modem_at_command_full (MM_BASE_MODEM (self), gps_control_port, "_OGPS=0", - 3, FALSE, NULL, NULL, NULL); + 3, FALSE, FALSE, NULL, NULL, NULL); /* Add handler for the NMEA traces */ mm_gps_serial_port_add_trace_handler (gps_data_port, diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c index 58bec2f5..3a66fc8f 100644 --- a/plugins/sierra/mm-broadband-bearer-sierra.c +++ b/plugins/sierra/mm-broadband-bearer-sierra.c @@ -173,6 +173,7 @@ dial_3gpp_context_step (Dial3gppContext *ctx) "+CGATT=1", 10, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)cgatt_ready, ctx); @@ -201,6 +202,7 @@ dial_3gpp_context_step (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)authenticate_ready, ctx); @@ -218,6 +220,7 @@ dial_3gpp_context_step (Dial3gppContext *ctx) command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)scact_ready, ctx); @@ -350,6 +353,7 @@ disconnect_3gpp (MMBroadbandBearer *self, command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)disconnect_scact_ready, result); diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c index 6eddcd5e..1622fa73 100644 --- a/plugins/sierra/mm-broadband-modem-sierra.c +++ b/plugins/sierra/mm-broadband-modem-sierra.c @@ -267,6 +267,7 @@ load_allowed_modes (MMIfaceModem *self, "!SELRAT?", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)selrat_query_ready, result); @@ -381,6 +382,7 @@ set_allowed_modes (MMIfaceModem *self, command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)selrat_set_ready, result); diff --git a/src/mm-base-modem-at.c b/src/mm-base-modem-at.c index 00dea480..70fbdc46 100644 --- a/src/mm-base-modem-at.c +++ b/src/mm-base-modem-at.c @@ -451,8 +451,8 @@ at_command_context_free (AtCommandContext *ctx) const gchar * mm_base_modem_at_command_full_finish (MMBaseModem *self, - GAsyncResult *res, - GError **error) + GAsyncResult *res, + GError **error) { if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return NULL; @@ -497,6 +497,7 @@ mm_base_modem_at_command_full (MMBaseModem *self, const gchar *command, guint timeout, gboolean allow_cached, + gboolean is_raw, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -531,14 +532,13 @@ mm_base_modem_at_command_full (MMBaseModem *self, NULL); } - /* Go on with the command */ if (allow_cached) mm_at_serial_port_queue_command_cached ( port, command, timeout, - FALSE, + is_raw, ctx->cancellable, (MMAtSerialResponseFn)at_command_parse_response, ctx); @@ -547,7 +547,7 @@ mm_base_modem_at_command_full (MMBaseModem *self, port, command, timeout, - FALSE, + is_raw, ctx->cancellable, (MMAtSerialResponseFn)at_command_parse_response, ctx); @@ -588,6 +588,7 @@ mm_base_modem_at_command (MMBaseModem *self, command, timeout, allow_cached, + FALSE, NULL, callback, user_data); diff --git a/src/mm-base-modem-at.h b/src/mm-base-modem-at.h index a5d83bb3..3e43c4f7 100644 --- a/src/mm-base-modem-at.h +++ b/src/mm-base-modem-at.h @@ -149,6 +149,7 @@ void mm_base_modem_at_command_full (MMBaseModem *self, const gchar *command, guint timeout, gboolean allow_cached, + gboolean is_raw, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c index 36e7b31b..6a9da3f2 100644 --- a/src/mm-broadband-bearer.c +++ b/src/mm-broadband-bearer.c @@ -306,6 +306,7 @@ cdma_connect_context_dial (DetailedConnectContext *ctx) command, 90, FALSE, + FALSE, NULL, (GAsyncReadyCallback)dial_cdma_ready, ctx); @@ -392,6 +393,7 @@ current_rm_protocol_ready (MMBaseModem *self, command, 3, FALSE, + FALSE, NULL, (GAsyncReadyCallback)set_rm_protocol_ready, ctx); @@ -444,6 +446,7 @@ connect_cdma (MMBroadbandBearer *self, "+CRM?", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)current_rm_protocol_ready, ctx); @@ -584,6 +587,7 @@ atd_ready (MMBaseModem *modem, "+CEER", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)extended_error_ready, ctx); @@ -623,6 +627,7 @@ dial_3gpp (MMBroadbandBearer *self, command, 60, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)atd_ready, ctx); @@ -805,6 +810,7 @@ find_cid_ready (MMBaseModem *modem, command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)initialize_pdp_context_ready, ctx); @@ -1511,6 +1517,7 @@ primary_flash_3gpp_ready (MMSerialPort *port, ctx->cgact_command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)cgact_primary_ready, ctx); @@ -1577,6 +1584,7 @@ disconnect_3gpp (MMBroadbandBearer *self, ctx->cgact_command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)cgact_secondary_ready, ctx); @@ -1990,6 +1998,7 @@ interface_initialization_step (InitAsyncContext *ctx) "+CRM=?", 3, TRUE, /* getting range, so reply can be cached */ + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)crm_range_ready, ctx); diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 889ed32f..4d11562c 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -1364,6 +1364,7 @@ signal_quality_cind (SignalQualityContext *ctx) "+CIND?", 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)signal_quality_cind_ready, ctx); @@ -1772,6 +1773,7 @@ run_unsolicited_events_setup (UnsolicitedEventsContext *ctx) ctx->command, 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)unsolicited_events_setup_ready, ctx); @@ -2881,6 +2883,7 @@ modem_3gpp_register_in_network (MMIfaceModem3gpp *self, command, 120, FALSE, + FALSE, /* raw */ ctx->cancellable, (GAsyncReadyCallback)register_in_3gpp_network_ready, ctx); @@ -3317,6 +3320,7 @@ unsolicited_registration_events_sequence_ready (MMBroadbandModem *self, g_variant_get_string (command, NULL), 3, FALSE, + FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)unsolicited_registration_events_sequence_ready, ctx); @@ -6366,12 +6370,12 @@ open_ports_initialization (MMBroadbandModem *self, mm_base_modem_at_command_full (MM_BASE_MODEM (self), ctx->primary, "E0", 3, - FALSE, NULL, NULL, NULL); + FALSE, FALSE, NULL, NULL, NULL); /* Try to get extended errors */ mm_base_modem_at_command_full (MM_BASE_MODEM (self), ctx->primary, "+CMEE=1", 3, - FALSE, NULL, NULL, NULL); + FALSE, FALSE, NULL, NULL, NULL); return TRUE; } |