diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-07-06 11:40:22 -0400 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-07-06 11:40:22 -0400 |
| commit | 736aa0d2d63cf62e7e2fe3c6e25ddf6b57f6ff05 (patch) | |
| tree | b82239e25796040e71c97dff9d8b7f7fa0b337c5 /plugins | |
| parent | 869c69e223208564302ba3be074dafbdf1b02cc2 (diff) | |
serial: rework 'connected' logic
So many modems just don't implement carrier detect that it makes
the previous 'connected' logic useless, so base it off connect/disconnect
and fix up a few places that didn't check connect status before
trying to send commands. Also ensure the serial port is unlocked
for PPP to use when connected.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mm-modem-mbm.c | 2 | ||||
| -rw-r--r-- | plugins/mm-modem-novatel-gsm.c | 2 | ||||
| -rw-r--r-- | plugins/mm-modem-sierra.c | 2 | ||||
| -rw-r--r-- | plugins/mm-modem-zte.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c index 1867829d..d12b5cab 100644 --- a/plugins/mm-modem-mbm.c +++ b/plugins/mm-modem-mbm.c @@ -455,7 +455,7 @@ enable (MMModem *modem, } else { mm_serial_port_queue_command (primary, "+CREG=0", 100, NULL, NULL); mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem)); - if (mm_serial_port_is_connected (primary)) + if (mm_port_get_connected (MM_PORT (primary))) mm_serial_port_flash (primary, 1000, disable_flash_done, info); else disable_flash_done (primary, info); diff --git a/plugins/mm-modem-novatel-gsm.c b/plugins/mm-modem-novatel-gsm.c index 2d2a96eb..1e3392ec 100644 --- a/plugins/mm-modem-novatel-gsm.c +++ b/plugins/mm-modem-novatel-gsm.c @@ -133,7 +133,7 @@ enable (MMModem *modem, g_assert (primary); if (!do_enable) { - if (mm_serial_port_is_connected (primary)) + if (mm_port_get_connected (MM_PORT (primary))) mm_serial_port_flash (primary, 1000, disable_flash_done, info); else disable_flash_done (primary, info); diff --git a/plugins/mm-modem-sierra.c b/plugins/mm-modem-sierra.c index e567a5da..79b7ec30 100644 --- a/plugins/mm-modem-sierra.c +++ b/plugins/mm-modem-sierra.c @@ -115,7 +115,7 @@ enable (MMModem *modem, g_assert (primary); if (!do_enable) { - if (mm_serial_port_is_connected (primary)) + if (mm_port_get_connected (MM_PORT (primary))) mm_serial_port_flash (primary, 1000, disable_flash_done, info); else disable_flash_done (primary, info); diff --git a/plugins/mm-modem-zte.c b/plugins/mm-modem-zte.c index 087da567..0bec7f60 100644 --- a/plugins/mm-modem-zte.c +++ b/plugins/mm-modem-zte.c @@ -134,7 +134,7 @@ enable (MMModem *modem, g_assert (primary); if (!do_enable) { - if (mm_serial_port_is_connected (primary)) + if (mm_port_get_connected (MM_PORT (primary))) mm_serial_port_flash (primary, 1000, disable_flash_done, info); else disable_flash_done (primary, info); |