diff options
author | Aleksander Morgado <aleksander@aleksander.es> | 2013-11-18 12:07:25 +0100 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2014-02-13 13:40:44 +0100 |
commit | a2f4fbe373de4f0cf094004b954504e510546b6e (patch) | |
tree | 9d41150466d89124d6a52ac09575da1fd297d005 | |
parent | 5792bcc876c9e3152d0444fca938091c112d05af (diff) |
port-serial-qcdm: commands are never cached
The QCDM port commands are never cached, so remove the option from the command()
method. Will also simplify command caching afterwards as it will be an AT-only
thing.
-rw-r--r-- | plugins/novatel/mm-broadband-modem-novatel.c | 4 | ||||
-rw-r--r-- | src/mm-broadband-modem.c | 10 | ||||
-rw-r--r-- | src/mm-port-probe.c | 2 | ||||
-rw-r--r-- | src/mm-port-serial-qcdm.c | 3 | ||||
-rw-r--r-- | src/mm-port-serial-qcdm.h | 1 | ||||
-rw-r--r-- | src/tests/test-qcdm-serial-port.c | 2 |
6 files changed, 2 insertions, 20 deletions
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel.c index 99f2cd39..1cbaa506 100644 --- a/plugins/novatel/mm-broadband-modem-novatel.c +++ b/plugins/novatel/mm-broadband-modem-novatel.c @@ -519,7 +519,6 @@ nw_snapshot_new_cb (MMPortSerialQcdm *port, mm_port_serial_qcdm_command (port, nwsnap, 3, - FALSE, NULL, (GAsyncReadyCallback)nw_snapshot_old_cb, ctx); @@ -555,7 +554,6 @@ get_nw_modem_snapshot (MMBaseModem *self, mm_port_serial_qcdm_command (port, nwsnap, 3, - FALSE, NULL, (GAsyncReadyCallback)nw_snapshot_new_cb, ctx); @@ -1046,7 +1044,6 @@ reg_eri_6800_cb (MMPortSerialQcdm *port, mm_port_serial_qcdm_command (port, nweri, 3, - FALSE, NULL, (GAsyncReadyCallback)reg_eri_6500_cb, ctx); @@ -1090,7 +1087,6 @@ modem_cdma_get_detailed_registration_state (MMIfaceModemCdma *self, mm_port_serial_qcdm_command (port, nweri, 3, - FALSE, NULL, (GAsyncReadyCallback)reg_eri_6800_cb, ctx); diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index eb49f0c0..6a32128c 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -686,7 +686,6 @@ load_current_capabilities_qcdm (LoadCapabilitiesContext *ctx) mm_port_serial_qcdm_command (ctx->qcdm_port, cmd, 3, - FALSE, NULL, (GAsyncReadyCallback)mode_pref_qcdm_ready, ctx); @@ -1125,7 +1124,6 @@ modem_load_own_numbers_done (MMIfaceModem *self, mm_port_serial_qcdm_command (ctx->qcdm, mdn, 3, - FALSE, NULL, (GAsyncReadyCallback)mdn_qcdm_ready, ctx); @@ -1979,7 +1977,6 @@ signal_quality_qcdm (SignalQualityContext *ctx) mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (ctx->port), pilot_sets, 3, - FALSE, NULL, (GAsyncReadyCallback)signal_quality_qcdm_ready, ctx); @@ -2234,7 +2231,6 @@ access_tech_qcdm_gsm_ready (MMPortSerialQcdm *port, mm_port_serial_qcdm_command (port, cmd, 3, - FALSE, NULL, (GAsyncReadyCallback)access_tech_qcdm_wcdma_ready, ctx); @@ -2325,7 +2321,6 @@ access_tech_qcdm_cdma_ready (MMPortSerialQcdm *port, mm_port_serial_qcdm_command (port, cmd, 3, - FALSE, NULL, (GAsyncReadyCallback)access_tech_qcdm_hdr_ready, ctx); @@ -2409,7 +2404,6 @@ modem_load_access_technologies (MMIfaceModem *self, mm_port_serial_qcdm_command (ctx->port, cmd, 3, - FALSE, NULL, (GAsyncReadyCallback)access_tech_qcdm_gsm_ready, ctx); @@ -2425,7 +2419,6 @@ modem_load_access_technologies (MMIfaceModem *self, mm_port_serial_qcdm_command (ctx->port, cmd, 3, - FALSE, NULL, (GAsyncReadyCallback)access_tech_qcdm_cdma_ready, ctx); @@ -6412,7 +6405,6 @@ modem_cdma_get_hdr_state (MMIfaceModemCdma *self, mm_port_serial_qcdm_command (ctx->qcdm, hdrstate, 3, - FALSE, NULL, (GAsyncReadyCallback)hdr_subsys_state_info_ready, ctx); @@ -6541,7 +6533,6 @@ modem_cdma_get_call_manager_state (MMIfaceModemCdma *self, mm_port_serial_qcdm_command (ctx->qcdm, cmstate, 3, - FALSE, NULL, (GAsyncReadyCallback)cm_subsys_state_info_ready, ctx); @@ -6824,7 +6815,6 @@ modem_cdma_get_cdma1x_serving_system (MMIfaceModemCdma *self, mm_port_serial_qcdm_command (ctx->qcdm, cdma_status, 3, - FALSE, NULL, (GAsyncReadyCallback)qcdm_cdma_status_ready, ctx); diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index dd1e18fd..69e68f13 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -624,7 +624,6 @@ serial_probe_qcdm_parse_response (MMPortSerialQcdm *port, mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (task->serial), cmd2, 3, - FALSE, NULL, (GAsyncReadyCallback)serial_probe_qcdm_parse_response, self); @@ -738,7 +737,6 @@ serial_probe_qcdm (MMPortProbe *self) mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (task->serial), verinfo, 3, - FALSE, NULL, (GAsyncReadyCallback)serial_probe_qcdm_parse_response, self); diff --git a/src/mm-port-serial-qcdm.c b/src/mm-port-serial-qcdm.c index 4733f1fc..42d12d7a 100644 --- a/src/mm-port-serial-qcdm.c +++ b/src/mm-port-serial-qcdm.c @@ -160,7 +160,6 @@ void mm_port_serial_qcdm_command (MMPortSerialQcdm *self, GByteArray *command, guint32 timeout_seconds, - gboolean allow_cached, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -179,7 +178,7 @@ mm_port_serial_qcdm_command (MMPortSerialQcdm *self, mm_port_serial_command (MM_PORT_SERIAL (self), command, timeout_seconds, - allow_cached, + FALSE, /* never cached */ cancellable, (GAsyncReadyCallback)serial_command_ready, simple); diff --git a/src/mm-port-serial-qcdm.h b/src/mm-port-serial-qcdm.h index 077f4b19..5e3e38f5 100644 --- a/src/mm-port-serial-qcdm.h +++ b/src/mm-port-serial-qcdm.h @@ -48,7 +48,6 @@ MMPortSerialQcdm *mm_port_serial_qcdm_new_fd (int fd); void mm_port_serial_qcdm_command (MMPortSerialQcdm *self, GByteArray *command, guint32 timeout_seconds, - gboolean allow_cached, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); diff --git a/src/tests/test-qcdm-serial-port.c b/src/tests/test-qcdm-serial-port.c index 739199ce..2f95a056 100644 --- a/src/tests/test-qcdm-serial-port.c +++ b/src/tests/test-qcdm-serial-port.c @@ -201,7 +201,7 @@ qcdm_request_verinfo (MMPortSerialQcdm *port, g_byte_array_free (verinfo, TRUE); verinfo->len = len; - mm_port_serial_qcdm_command (port, verinfo, 3, FALSE, NULL, cb, loop); + mm_port_serial_qcdm_command (port, verinfo, 3, NULL, cb, loop); g_byte_array_unref (verinfo); } |