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

samsung: drop PORT_TYPE_ECM

Browse Source 
Isn't really needed since it's just the same as any other net
device port type.
This commit is contained in:
Dan Williams
2011-03-27 15:23:44 -05:00
parent b76889c358
commit 35b3e348e6
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/mm-modem-samsung-gsm.c
View File

@@ -973,12 +973,12 @@ grab_port (MMModem *modem,
MMPort *port = NULL; MMPort *port = NULL;
if (suggested_type == MM_PORT_TYPE_UNKNOWN) { if (suggested_type == MM_PORT_TYPE_UNKNOWN) {
if(g_str_has_prefix(name, "usb")) if (!strcmp (subsys, "tty")) {
ptype = MM_PORT_TYPE_ECM; if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY))
else if (!mm_generic_gsm_get_at_port (gsm, MM_PORT_TYPE_PRIMARY))
ptype = 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; ptype = MM_PORT_TYPE_SECONDARY;
}
} else } else
ptype = suggested_type; ptype = suggested_type;

2
src/mm-port.c
View File

@@ -68,8 +68,6 @@ mm_port_type_to_name (MMPortType ptype)
return "primary"; return "primary";
case MM_PORT_TYPE_SECONDARY: case MM_PORT_TYPE_SECONDARY:
return "secondary"; return "secondary";
case MM_PORT_TYPE_ECM:
return "ECM";
case MM_PORT_TYPE_IGNORED: case MM_PORT_TYPE_IGNORED:
return "ignored"; return "ignored";
case MM_PORT_TYPE_QCDM: case MM_PORT_TYPE_QCDM:

1
src/mm-port.h
View File

@@ -32,7 +32,6 @@ typedef enum {
MM_PORT_TYPE_UNKNOWN = 0x0, MM_PORT_TYPE_UNKNOWN = 0x0,
MM_PORT_TYPE_PRIMARY, MM_PORT_TYPE_PRIMARY,
MM_PORT_TYPE_SECONDARY, MM_PORT_TYPE_SECONDARY,
MM_PORT_TYPE_ECM,
MM_PORT_TYPE_IGNORED, MM_PORT_TYPE_IGNORED,
MM_PORT_TYPE_QCDM, MM_PORT_TYPE_QCDM,