diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-03-27 15:23:44 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-03-27 15:23:44 -0500 |
| commit | 35b3e348e66842f02e065b0ccb9c8ef1fd1abb99 (patch) | |
| tree | 08d32135e4cf81449094bfcff036bf569afb8bb0 | |
| parent | b76889c3585f43868e6de6f71bf6761543105a3f (diff) | |
samsung: drop PORT_TYPE_ECM
Isn't really needed since it's just the same as any other net
device port type.
| -rwxr-xr-x | plugins/mm-modem-samsung-gsm.c | 8 | ||||
| -rw-r--r-- | src/mm-port.c | 2 | ||||
| -rw-r--r-- | src/mm-port.h | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/plugins/mm-modem-samsung-gsm.c b/plugins/mm-modem-samsung-gsm.c index b9b80317..0cec1fda 100755 --- a/plugins/mm-modem-samsung-gsm.c +++ b/plugins/mm-modem-samsung-gsm.c @@ -973,12 +973,12 @@ grab_port (MMModem *modem, MMPort *port = NULL; if (suggested_type == MM_PORT_TYPE_UNKNOWN) { - if(g_str_has_prefix(name, "usb")) - ptype = MM_PORT_TYPE_ECM; - else if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY)) + if (!strcmp (subsys, "tty")) { + if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY)) ptype = MM_PORT_TYPE_PRIMARY; - else if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_SECONDARY)) + else if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_SECONDARY)) ptype = MM_PORT_TYPE_SECONDARY; + } } else ptype = suggested_type; diff --git a/src/mm-port.c b/src/mm-port.c index 54a4fa21..a1291d0b 100644 --- a/src/mm-port.c +++ b/src/mm-port.c @@ -68,8 +68,6 @@ mm_port_type_to_name (MMPortType ptype) return "primary"; case MM_PORT_TYPE_SECONDARY: return "secondary"; - case MM_PORT_TYPE_ECM: - return "ECM"; case MM_PORT_TYPE_IGNORED: return "ignored"; case MM_PORT_TYPE_QCDM: diff --git a/src/mm-port.h b/src/mm-port.h index e249affc..4bcffd49 100644 --- a/src/mm-port.h +++ b/src/mm-port.h @@ -32,7 +32,6 @@ typedef enum { MM_PORT_TYPE_UNKNOWN = 0x0, MM_PORT_TYPE_PRIMARY, MM_PORT_TYPE_SECONDARY, - MM_PORT_TYPE_ECM, MM_PORT_TYPE_IGNORED, MM_PORT_TYPE_QCDM, |