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

gsm/cdma: fix data port assignment (rh #587400)

Browse Source 
QCDM ports should never be the data port; 'net' ports take precedence
over AT ports too.  Clarify that.
This commit is contained in:
Dan Williams
2010-05-04 17:33:04 -07:00
parent 26a3fe3f53
commit 885bc90be9
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mm-generic-cdma.c
View File

@@ -158,7 +158,12 @@ mm_generic_cdma_grab_port (MMGenericCdma *self,
} }
port = mm_modem_base_add_port (MM_MODEM_BASE (self), subsys, name, ptype); port = mm_modem_base_add_port (MM_MODEM_BASE (self), subsys, name, ptype);
if (port && MM_IS_AT_SERIAL_PORT (port)) { if (!port) {
g_warn_if_fail (port != NULL);
return NULL;
}
if (MM_IS_AT_SERIAL_PORT (port)) {
g_object_set (G_OBJECT (port), MM_PORT_CARRIER_DETECT, FALSE, NULL); g_object_set (G_OBJECT (port), MM_PORT_CARRIER_DETECT, FALSE, NULL);
mm_at_serial_port_set_response_parser (MM_AT_SERIAL_PORT (port), mm_at_serial_port_set_response_parser (MM_AT_SERIAL_PORT (port),
mm_serial_parser_v1_e1_parse, mm_serial_parser_v1_e1_parse,
@@ -174,9 +179,10 @@ mm_generic_cdma_grab_port (MMGenericCdma *self,
check_valid (self); check_valid (self);
} else if (ptype == MM_PORT_TYPE_SECONDARY) } else if (ptype == MM_PORT_TYPE_SECONDARY)
priv->secondary = MM_AT_SERIAL_PORT (port); priv->secondary = MM_AT_SERIAL_PORT (port);
} else if (MM_IS_QCDM_SERIAL_PORT (port) && !priv->qcdm) { } else if (MM_IS_QCDM_SERIAL_PORT (port)) {
priv->qcdm = MM_QCDM_SERIAL_PORT (port); if (!priv->qcdm)
} else { priv->qcdm = MM_QCDM_SERIAL_PORT (port);
} else if (!strcmp (subsys, "net")) {
/* Net device (if any) is the preferred data port */ /* Net device (if any) is the preferred data port */
if (!priv->data || MM_IS_AT_SERIAL_PORT (priv->data)) { if (!priv->data || MM_IS_AT_SERIAL_PORT (priv->data)) {
priv->data = port; priv->data = port;

16
src/mm-generic-gsm.c
View File

@@ -401,7 +401,12 @@ mm_generic_gsm_grab_port (MMGenericGsm *self,
g_return_val_if_fail (!strcmp (subsys, "net") || !strcmp (subsys, "tty"), FALSE); g_return_val_if_fail (!strcmp (subsys, "net") || !strcmp (subsys, "tty"), FALSE);
port = mm_modem_base_add_port (MM_MODEM_BASE (self), subsys, name, ptype); port = mm_modem_base_add_port (MM_MODEM_BASE (self), subsys, name, ptype);
if (port && MM_IS_AT_SERIAL_PORT (port)) { if (!port) {
g_warn_if_fail (port != NULL);
return NULL;
}
if (MM_IS_AT_SERIAL_PORT (port)) {
GPtrArray *array; GPtrArray *array;
int i; int i;
@@ -431,11 +436,12 @@ mm_generic_gsm_grab_port (MMGenericGsm *self,
} else if (ptype == MM_PORT_TYPE_SECONDARY) } else if (ptype == MM_PORT_TYPE_SECONDARY)
priv->secondary = MM_AT_SERIAL_PORT (port); priv->secondary = MM_AT_SERIAL_PORT (port);
} else if (MM_IS_QCDM_SERIAL_PORT (port) && !priv->qcdm) { } else if (MM_IS_QCDM_SERIAL_PORT (port)) {
priv->qcdm = MM_QCDM_SERIAL_PORT (port); if (!priv->qcdm)
} else { priv->qcdm = MM_QCDM_SERIAL_PORT (port);
} else if (!strcmp (subsys, "net")) {
/* Net device (if any) is the preferred data port */ /* Net device (if any) is the preferred data port */
if (!priv->data || MM_IS_SERIAL_PORT (priv->data)) { if (!priv->data || MM_IS_AT_SERIAL_PORT (priv->data)) {
priv->data = port; priv->data = port;
g_object_notify (G_OBJECT (self), MM_MODEM_DATA_DEVICE); g_object_notify (G_OBJECT (self), MM_MODEM_DATA_DEVICE);
check_valid (self); check_valid (self);