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

mbm: use new disconnect handling helper

Browse Source
This commit is contained in:
Dan Williams
2010-03-10 14:42:34 -08:00
parent 59b75b5194
commit 461de7ea0e
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/mm-modem-mbm.c
View File

@@ -494,23 +494,18 @@ do_connect (MMModem *modem,
} }
static void static void
disconnect (MMModem *modem, do_disconnect (MMGenericGsm *gsm,
MMModemFn callback, gint cid,
gpointer user_data) MMModemFn callback,
gpointer user_data)
{ {
MMCallbackInfo *info;
MMSerialPort *primary; MMSerialPort *primary;
mm_modem_set_state (modem, MM_MODEM_STATE_DISCONNECTING, MM_MODEM_STATE_REASON_NONE); primary = mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_PRIMARY);
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary); g_assert (primary);
mm_serial_port_queue_command (primary, "*ENAP=0", 3, NULL, NULL); mm_serial_port_queue_command (primary, "*ENAP=0", 3, NULL, NULL);
mm_generic_gsm_update_enabled_state (MM_GENERIC_GSM (modem), FALSE, MM_MODEM_STATE_REASON_NONE); MM_GENERIC_GSM_CLASS (mm_modem_mbm_parent_class)->do_disconnect (gsm, cid, callback, user_data);
info = mm_callback_info_new (modem, callback, user_data);
mm_callback_info_schedule (info);
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -837,7 +832,6 @@ modem_init (MMModem *modem_class)
modem_class->grab_port = grab_port; modem_class->grab_port = grab_port;
modem_class->disable = disable; modem_class->disable = disable;
modem_class->connect = do_connect; modem_class->connect = do_connect;
modem_class->disconnect = disconnect;
} }
static void static void
@@ -871,6 +865,7 @@ mm_modem_mbm_class_init (MMModemMbmClass *klass)
object_class->finalize = finalize; object_class->finalize = finalize;
gsm_class->do_enable = do_enable; gsm_class->do_enable = do_enable;
gsm_class->do_disconnect = do_disconnect;
gsm_class->get_allowed_mode = get_allowed_mode; gsm_class->get_allowed_mode = get_allowed_mode;
gsm_class->set_allowed_mode = set_allowed_mode; gsm_class->set_allowed_mode = set_allowed_mode;
} }