diff options
| -rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 4 | ||||
| -rw-r--r-- | src/mm-base-modem.c | 2 | ||||
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 2 | ||||
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 2 | ||||
| -rw-r--r-- | src/mm-port-mbim.c | 2 | ||||
| -rw-r--r-- | src/mm-port-probe.c | 2 | ||||
| -rw-r--r-- | src/mm-port-qmi.c | 2 | ||||
| -rw-r--r-- | src/mm-port-serial-at.c | 2 | ||||
| -rw-r--r-- | src/mm-port.h | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index fafd097b..19249a8c 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -176,7 +176,7 @@ mm_broadband_modem_huawei_get_at_port_list (MMBroadbandModemHuawei *self) /* Additional cdc-wdm ports used for dialing */ cdc_wdm_at_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self), - MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS_USBMISC, MM_PORT_TYPE_AT, NULL); @@ -2200,7 +2200,7 @@ peek_port_at_for_data (MMBroadbandModemHuawei *self, /* Find the CDC-WDM port on the same USB interface as the given net port */ cdc_wdm_at_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self), - MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS_USBMISC, MM_PORT_TYPE_AT, NULL); for (l = cdc_wdm_at_ports; l && !found; l = g_list_next (l)) { diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index 93221dae..c350febb 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -314,7 +314,7 @@ mm_base_modem_grab_port (MMBaseModem *self, /* Non-serial AT port */ if (!port && ptype == MM_PORT_TYPE_AT) { - port = MM_PORT (mm_port_serial_at_new (name, MM_PORT_SUBSYS_USB)); + port = MM_PORT (mm_port_serial_at_new (name, MM_PORT_SUBSYS_USBMISC)); /* Set common response parser */ mm_port_serial_at_set_response_parser (MM_PORT_SERIAL_AT (port), diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index a313dfa3..f18189b0 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -291,7 +291,7 @@ peek_port_mbim_for_data (MMBroadbandModemMbim *self, /* Find the CDC-WDM port on the same USB interface as the given net port */ cdc_wdm_mbim_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self), - MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS_USBMISC, MM_PORT_TYPE_MBIM, NULL); diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 34a211f0..8ac469fa 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -262,7 +262,7 @@ peek_port_qmi_for_data (MMBroadbandModemQmi *self, /* Find the CDC-WDM port on the same USB interface as the given net port */ cdc_wdm_qmi_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self), - MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS_USBMISC, MM_PORT_TYPE_QMI, NULL); for (l = cdc_wdm_qmi_ports; l && !found; l = g_list_next (l)) { diff --git a/src/mm-port-mbim.c b/src/mm-port-mbim.c index 8e848e4d..72004da1 100644 --- a/src/mm-port-mbim.c +++ b/src/mm-port-mbim.c @@ -593,7 +593,7 @@ mm_port_mbim_new (const gchar *name) { return MM_PORT_MBIM (g_object_new (MM_TYPE_PORT_MBIM, MM_PORT_DEVICE, name, - MM_PORT_SUBSYS, MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS, MM_PORT_SUBSYS_USBMISC, MM_PORT_TYPE, MM_PORT_TYPE_MBIM, NULL)); } diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index e2b57bda..5ae08296 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -1270,7 +1270,7 @@ serial_open_at (MMPortProbe *self) MMPortSubsys subsys = MM_PORT_SUBSYS_TTY; if (g_str_has_prefix (mm_kernel_device_get_subsystem (self->priv->port), "usb")) - subsys = MM_PORT_SUBSYS_USB; + subsys = MM_PORT_SUBSYS_USBMISC; ctx->serial = MM_PORT_SERIAL (mm_port_serial_at_new (mm_kernel_device_get_name (self->priv->port), subsys)); if (!ctx->serial) { diff --git a/src/mm-port-qmi.c b/src/mm-port-qmi.c index 571bb934..6bc7b901 100644 --- a/src/mm-port-qmi.c +++ b/src/mm-port-qmi.c @@ -792,7 +792,7 @@ mm_port_qmi_new (const gchar *name) { return MM_PORT_QMI (g_object_new (MM_TYPE_PORT_QMI, MM_PORT_DEVICE, name, - MM_PORT_SUBSYS, MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS, MM_PORT_SUBSYS_USBMISC, MM_PORT_TYPE, MM_PORT_TYPE_QMI, NULL)); } diff --git a/src/mm-port-serial-at.c b/src/mm-port-serial-at.c index b767ee3c..c46bdf7f 100644 --- a/src/mm-port-serial-at.c +++ b/src/mm-port-serial-at.c @@ -533,7 +533,7 @@ mm_port_serial_at_new (const char *name, MMPortSubsys subsys) { g_return_val_if_fail (subsys == MM_PORT_SUBSYS_TTY || - subsys == MM_PORT_SUBSYS_USB || + subsys == MM_PORT_SUBSYS_USBMISC || subsys == MM_PORT_SUBSYS_UNIX, NULL); return MM_PORT_SERIAL_AT (g_object_new (MM_TYPE_PORT_SERIAL_AT, diff --git a/src/mm-port.h b/src/mm-port.h index 7bf85fb2..2d8d1ad6 100644 --- a/src/mm-port.h +++ b/src/mm-port.h @@ -26,7 +26,7 @@ typedef enum { /*< underscore_name=mm_port_subsys >*/ MM_PORT_SUBSYS_UNKNOWN = 0x0, MM_PORT_SUBSYS_TTY, MM_PORT_SUBSYS_NET, - MM_PORT_SUBSYS_USB, + MM_PORT_SUBSYS_USBMISC, MM_PORT_SUBSYS_UNIX, MM_PORT_SUBSYS_LAST = MM_PORT_SUBSYS_UNIX /*< skip >*/ |