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

port: rename subsystem from 'usb' to 'usbmisc'

Browse Source 
Back in Linux < 3.6 days, the cdc-wdm ports exposed by the QMI driver
were flagged as owned by the 'usb' subsystem. That changed in 3.6 when
the subsystem was renamed to 'usbmisc':

  https://mail.gnome.org/archives/networkmanager-list/2012-June/msg00125.html

So, rename the port subsystem type enumn to 'usbmisc'.
This commit is contained in:
Aleksander Morgado
2020-11-06 12:01:53 +01:00
parent c92dc21a18
commit f052e914c8
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -176,7 +176,7 @@ mm_broadband_modem_huawei_get_at_port_list (MMBroadbandModemHuawei *self)
/* Additional cdc-wdm ports used for dialing */ /* Additional cdc-wdm ports used for dialing */
cdc_wdm_at_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self), 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, MM_PORT_TYPE_AT,
NULL); 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 */ /* 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), 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, MM_PORT_TYPE_AT,
NULL); NULL);
for (l = cdc_wdm_at_ports; l && !found; l = g_list_next (l)) { for (l = cdc_wdm_at_ports; l && !found; l = g_list_next (l)) {

2
src/mm-base-modem.c
View File

@@ -314,7 +314,7 @@ mm_base_modem_grab_port (MMBaseModem *self,
/* Non-serial AT port */ /* Non-serial AT port */
if (!port && ptype == MM_PORT_TYPE_AT) { 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 */ /* Set common response parser */
mm_port_serial_at_set_response_parser (MM_PORT_SERIAL_AT (port), mm_port_serial_at_set_response_parser (MM_PORT_SERIAL_AT (port),

2
src/mm-broadband-modem-mbim.c
View File

@@ -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 */ /* 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), 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, MM_PORT_TYPE_MBIM,
NULL); NULL);

2
src/mm-broadband-modem-qmi.c
View File

@@ -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 */ /* 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), 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, MM_PORT_TYPE_QMI,
NULL); NULL);
for (l = cdc_wdm_qmi_ports; l && !found; l = g_list_next (l)) { for (l = cdc_wdm_qmi_ports; l && !found; l = g_list_next (l)) {

2
src/mm-port-mbim.c
View File

@@ -593,7 +593,7 @@ mm_port_mbim_new (const gchar *name)
{ {
return MM_PORT_MBIM (g_object_new (MM_TYPE_PORT_MBIM, return MM_PORT_MBIM (g_object_new (MM_TYPE_PORT_MBIM,
MM_PORT_DEVICE, name, 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, MM_PORT_TYPE, MM_PORT_TYPE_MBIM,
NULL)); NULL));
} }

2
src/mm-port-probe.c
View File

@@ -1270,7 +1270,7 @@ serial_open_at (MMPortProbe *self)
MMPortSubsys subsys = MM_PORT_SUBSYS_TTY; MMPortSubsys subsys = MM_PORT_SUBSYS_TTY;
if (g_str_has_prefix (mm_kernel_device_get_subsystem (self->priv->port), "usb")) 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)); ctx->serial = MM_PORT_SERIAL (mm_port_serial_at_new (mm_kernel_device_get_name (self->priv->port), subsys));
if (!ctx->serial) { if (!ctx->serial) {

2
src/mm-port-qmi.c
View File

@@ -792,7 +792,7 @@ mm_port_qmi_new (const gchar *name)
{ {
return MM_PORT_QMI (g_object_new (MM_TYPE_PORT_QMI, return MM_PORT_QMI (g_object_new (MM_TYPE_PORT_QMI,
MM_PORT_DEVICE, name, 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, MM_PORT_TYPE, MM_PORT_TYPE_QMI,
NULL)); NULL));
} }

2
src/mm-port-serial-at.c
View File

@@ -533,7 +533,7 @@ mm_port_serial_at_new (const char *name,
MMPortSubsys subsys) MMPortSubsys subsys)
{ {
g_return_val_if_fail (subsys == MM_PORT_SUBSYS_TTY || 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); subsys == MM_PORT_SUBSYS_UNIX, NULL);
return MM_PORT_SERIAL_AT (g_object_new (MM_TYPE_PORT_SERIAL_AT, return MM_PORT_SERIAL_AT (g_object_new (MM_TYPE_PORT_SERIAL_AT,

2
src/mm-port.h
View File

@@ -26,7 +26,7 @@ typedef enum { /*< underscore_name=mm_port_subsys >*/
MM_PORT_SUBSYS_UNKNOWN = 0x0, MM_PORT_SUBSYS_UNKNOWN = 0x0,
MM_PORT_SUBSYS_TTY, MM_PORT_SUBSYS_TTY,
MM_PORT_SUBSYS_NET, MM_PORT_SUBSYS_NET,
MM_PORT_SUBSYS_USB, MM_PORT_SUBSYS_USBMISC,
MM_PORT_SUBSYS_UNIX, MM_PORT_SUBSYS_UNIX,
MM_PORT_SUBSYS_LAST = MM_PORT_SUBSYS_UNIX /*< skip >*/ MM_PORT_SUBSYS_LAST = MM_PORT_SUBSYS_UNIX /*< skip >*/