diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-11-10 13:16:19 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-11-10 13:16:19 -0600 |
| commit | 802a6f3a564d981f06042af0a3f36212805f599f (patch) | |
| tree | 7aae0d5d3dd7d8bb3df35c7fa3ed6830a3e2d947 | |
| parent | bda86f553aefadb18a3dfa5795f1345c40a19738 (diff) | |
gsm: fix up CID signed/unsigned confusion
-1 = no APN set, so use modem default. We'll have to fix a few
more things up for modems like hso/mbm that don't use ATDT and
require CIDs, but this gets us halfway there for other devices.
| -rw-r--r-- | plugins/mm-modem-hso.c | 2 | ||||
| -rw-r--r-- | plugins/mm-modem-mbm.c | 5 | ||||
| -rw-r--r-- | src/mm-generic-gsm.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/plugins/mm-modem-hso.c b/plugins/mm-modem-hso.c index 81fe51a7..ff0264ad 100644 --- a/plugins/mm-modem-hso.c +++ b/plugins/mm-modem-hso.c @@ -431,7 +431,7 @@ unsolicited_disable_done (MMModem *modem, } /* Otherwise, kill any existing connection */ - if (mm_generic_gsm_get_cid (MM_GENERIC_GSM (modem)) >= 0) + if (hso_get_cid (MM_MODEM_HSO (modem)) >= 0) hso_call_control (MM_MODEM_HSO (modem), FALSE, TRUE, disable_done, info); else disable_done (modem, NULL, info); diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c index 3a2cd424..763f61d2 100644 --- a/plugins/mm-modem-mbm.c +++ b/plugins/mm-modem-mbm.c @@ -728,18 +728,15 @@ mbm_auth_done (MMSerialPort *port, MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMGenericGsm *modem = MM_GENERIC_GSM (info->modem); char *command; - guint32 cid; if (error) { mm_generic_gsm_connect_complete (modem, error, info); return; } - cid = mm_generic_gsm_get_cid (modem); - mm_at_serial_port_queue_command (MM_AT_SERIAL_PORT (port), "AT*E2NAP=1", 3, NULL, NULL); - command = g_strdup_printf ("AT*ENAP=1,%d", cid); + command = g_strdup_printf ("AT*ENAP=1,%d", mm_generic_gsm_get_cid (modem)); mm_at_serial_port_queue_command (MM_AT_SERIAL_PORT (port), command, 3, enap_done, user_data); g_free (command); } diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c index 557c62ca..faf71e56 100644 --- a/src/mm-generic-gsm.c +++ b/src/mm-generic-gsm.c @@ -2695,7 +2695,7 @@ connect (MMModem *modem, MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem); MMCallbackInfo *info; char *command; - guint32 cid = mm_generic_gsm_get_cid (MM_GENERIC_GSM (modem)); + gint cid = mm_generic_gsm_get_cid (MM_GENERIC_GSM (modem)); info = mm_callback_info_new (modem, callback, user_data); |