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

sierra: prefer primary port for status

Browse Source
This commit is contained in:
Dan Williams
2010-01-19 11:53:45 -08:00
parent 28eca600f7
commit 82eecfca92
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/mm-modem-sierra-cdma.c
View File

@@ -294,22 +294,26 @@ query_registration_state (MMGenericCdma *cdma,
{
MMCallbackInfo *info;
MMSerialPort *primary, *secondary;
MMSerialPort *port;
primary = mm_generic_cdma_get_port (cdma, MM_PORT_TYPE_PRIMARY);
port = primary = mm_generic_cdma_get_port (cdma, MM_PORT_TYPE_PRIMARY);
secondary = mm_generic_cdma_get_port (cdma, MM_PORT_TYPE_SECONDARY);
info = mm_generic_cdma_query_reg_state_callback_info_new (cdma, callback, user_data);
if (mm_port_get_connected (MM_PORT (primary)) && !secondary) {
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_CONNECTED,
"Cannot get query registration state while connected");
mm_callback_info_schedule (info);
return;
if (mm_port_get_connected (MM_PORT (primary))) {
if (!secondary) {
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_CONNECTED,
"Cannot get query registration state while connected");
mm_callback_info_schedule (info);
return;
}
/* Use secondary port if primary is connected */
port = secondary;
}
mm_serial_port_queue_command (secondary ? secondary : primary,
"!STATUS", 3,
status_done, info);
mm_serial_port_queue_command (port, "!STATUS", 3, status_done, info);
}
static void