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

port-serial-qcdm: commands are never cached

Browse Source 
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.
This commit is contained in:
Aleksander Morgado
2013-11-18 12:07:25 +01:00
parent 5792bcc876
commit a2f4fbe373
6 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,7 +519,6 @@ nw_snapshot_new_cb (MMPortSerialQcdm *port,
mm_port_serial_qcdm_command (port, mm_port_serial_qcdm_command (port,
nwsnap, nwsnap,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)nw_snapshot_old_cb, (GAsyncReadyCallback)nw_snapshot_old_cb,
ctx); ctx);
@@ -555,7 +554,6 @@ get_nw_modem_snapshot (MMBaseModem *self,
mm_port_serial_qcdm_command (port, mm_port_serial_qcdm_command (port,
nwsnap, nwsnap,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)nw_snapshot_new_cb, (GAsyncReadyCallback)nw_snapshot_new_cb,
ctx); ctx);
@@ -1046,7 +1044,6 @@ reg_eri_6800_cb (MMPortSerialQcdm *port,
mm_port_serial_qcdm_command (port, mm_port_serial_qcdm_command (port,
nweri, nweri,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)reg_eri_6500_cb, (GAsyncReadyCallback)reg_eri_6500_cb,
ctx); ctx);
@@ -1090,7 +1087,6 @@ modem_cdma_get_detailed_registration_state (MMIfaceModemCdma *self,
mm_port_serial_qcdm_command (port, mm_port_serial_qcdm_command (port,
nweri, nweri,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)reg_eri_6800_cb, (GAsyncReadyCallback)reg_eri_6800_cb,
ctx); ctx);

10
src/mm-broadband-modem.c
View File

@@ -686,7 +686,6 @@ load_current_capabilities_qcdm (LoadCapabilitiesContext *ctx)
mm_port_serial_qcdm_command (ctx->qcdm_port, mm_port_serial_qcdm_command (ctx->qcdm_port,
cmd, cmd,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)mode_pref_qcdm_ready, (GAsyncReadyCallback)mode_pref_qcdm_ready,
ctx); ctx);
@@ -1125,7 +1124,6 @@ modem_load_own_numbers_done (MMIfaceModem *self,
mm_port_serial_qcdm_command (ctx->qcdm, mm_port_serial_qcdm_command (ctx->qcdm,
mdn, mdn,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)mdn_qcdm_ready, (GAsyncReadyCallback)mdn_qcdm_ready,
ctx); ctx);
@@ -1979,7 +1977,6 @@ signal_quality_qcdm (SignalQualityContext *ctx)
mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (ctx->port), mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (ctx->port),
pilot_sets, pilot_sets,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)signal_quality_qcdm_ready, (GAsyncReadyCallback)signal_quality_qcdm_ready,
ctx); ctx);
@@ -2234,7 +2231,6 @@ access_tech_qcdm_gsm_ready (MMPortSerialQcdm *port,
mm_port_serial_qcdm_command (port, mm_port_serial_qcdm_command (port,
cmd, cmd,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)access_tech_qcdm_wcdma_ready, (GAsyncReadyCallback)access_tech_qcdm_wcdma_ready,
ctx); ctx);
@@ -2325,7 +2321,6 @@ access_tech_qcdm_cdma_ready (MMPortSerialQcdm *port,
mm_port_serial_qcdm_command (port, mm_port_serial_qcdm_command (port,
cmd, cmd,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)access_tech_qcdm_hdr_ready, (GAsyncReadyCallback)access_tech_qcdm_hdr_ready,
ctx); ctx);
@@ -2409,7 +2404,6 @@ modem_load_access_technologies (MMIfaceModem *self,
mm_port_serial_qcdm_command (ctx->port, mm_port_serial_qcdm_command (ctx->port,
cmd, cmd,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)access_tech_qcdm_gsm_ready, (GAsyncReadyCallback)access_tech_qcdm_gsm_ready,
ctx); ctx);
@@ -2425,7 +2419,6 @@ modem_load_access_technologies (MMIfaceModem *self,
mm_port_serial_qcdm_command (ctx->port, mm_port_serial_qcdm_command (ctx->port,
cmd, cmd,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)access_tech_qcdm_cdma_ready, (GAsyncReadyCallback)access_tech_qcdm_cdma_ready,
ctx); ctx);
@@ -6412,7 +6405,6 @@ modem_cdma_get_hdr_state (MMIfaceModemCdma *self,
mm_port_serial_qcdm_command (ctx->qcdm, mm_port_serial_qcdm_command (ctx->qcdm,
hdrstate, hdrstate,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)hdr_subsys_state_info_ready, (GAsyncReadyCallback)hdr_subsys_state_info_ready,
ctx); ctx);
@@ -6541,7 +6533,6 @@ modem_cdma_get_call_manager_state (MMIfaceModemCdma *self,
mm_port_serial_qcdm_command (ctx->qcdm, mm_port_serial_qcdm_command (ctx->qcdm,
cmstate, cmstate,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)cm_subsys_state_info_ready, (GAsyncReadyCallback)cm_subsys_state_info_ready,
ctx); ctx);
@@ -6824,7 +6815,6 @@ modem_cdma_get_cdma1x_serving_system (MMIfaceModemCdma *self,
mm_port_serial_qcdm_command (ctx->qcdm, mm_port_serial_qcdm_command (ctx->qcdm,
cdma_status, cdma_status,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)qcdm_cdma_status_ready, (GAsyncReadyCallback)qcdm_cdma_status_ready,
ctx); ctx);

2
src/mm-port-probe.c
View File

@@ -624,7 +624,6 @@ serial_probe_qcdm_parse_response (MMPortSerialQcdm *port,
mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (task->serial), mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (task->serial),
cmd2, cmd2,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)serial_probe_qcdm_parse_response, (GAsyncReadyCallback)serial_probe_qcdm_parse_response,
self); self);
@@ -738,7 +737,6 @@ serial_probe_qcdm (MMPortProbe *self)
mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (task->serial), mm_port_serial_qcdm_command (MM_PORT_SERIAL_QCDM (task->serial),
verinfo, verinfo,
3, 3,
FALSE,
NULL, NULL,
(GAsyncReadyCallback)serial_probe_qcdm_parse_response, (GAsyncReadyCallback)serial_probe_qcdm_parse_response,
self); self);

3
src/mm-port-serial-qcdm.c
View File

@@ -160,7 +160,6 @@ void
mm_port_serial_qcdm_command (MMPortSerialQcdm *self, mm_port_serial_qcdm_command (MMPortSerialQcdm *self,
GByteArray *command, GByteArray *command,
guint32 timeout_seconds, guint32 timeout_seconds,
gboolean allow_cached,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
@@ -179,7 +178,7 @@ mm_port_serial_qcdm_command (MMPortSerialQcdm *self,
mm_port_serial_command (MM_PORT_SERIAL (self), mm_port_serial_command (MM_PORT_SERIAL (self),
command, command,
timeout_seconds, timeout_seconds,
allow_cached, FALSE, /* never cached */
cancellable, cancellable,
(GAsyncReadyCallback)serial_command_ready, (GAsyncReadyCallback)serial_command_ready,
simple); simple);

1
src/mm-port-serial-qcdm.h
View File

@@ -48,7 +48,6 @@ MMPortSerialQcdm *mm_port_serial_qcdm_new_fd (int fd);
void mm_port_serial_qcdm_command (MMPortSerialQcdm *self, void mm_port_serial_qcdm_command (MMPortSerialQcdm *self,
GByteArray *command, GByteArray *command,
guint32 timeout_seconds, guint32 timeout_seconds,
gboolean allow_cached,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);

2
src/tests/test-qcdm-serial-port.c
View File

@@ -201,7 +201,7 @@ qcdm_request_verinfo (MMPortSerialQcdm *port,
g_byte_array_free (verinfo, TRUE); g_byte_array_free (verinfo, TRUE);
verinfo->len = len; 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); g_byte_array_unref (verinfo);
} }