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

plugins: log about all port type hints received from udev

Browse Source
This commit is contained in:
Aleksander Morgado
2013-02-26 20:57:37 +01:00
parent 8d74b11bd3
commit 3f3950bd12
5 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/longcheer/mm-plugin-longcheer.c
View File

@@ -213,11 +213,17 @@ grab_port (MMPlugin *self,
* be the data/primary port on these devices. We have to tag them based on * be the data/primary port on these devices. We have to tag them based on
* what the Windows .INF files say the port layout should be. * what the Windows .INF files say the port layout should be.
*/ */
if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_PORT_TYPE_MODEM")) if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_PORT_TYPE_MODEM")) {
mm_dbg ("longcheer: AT port '%s/%s' flagged as primary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PRIMARY; pflags = MM_AT_PORT_FLAG_PRIMARY;
else if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_PORT_TYPE_AUX")) } else if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_PORT_TYPE_AUX")) {
mm_dbg ("longcheer: AT port '%s/%s' flagged as secondary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_SECONDARY; pflags = MM_AT_PORT_FLAG_SECONDARY;
else { } else {
/* If the port was tagged by the udev rules but isn't a primary or secondary, /* If the port was tagged by the udev rules but isn't a primary or secondary,
* then ignore it to guard against race conditions if a device just happens * then ignore it to guard against race conditions if a device just happens
* to show up with more than two AT-capable ports. * to show up with more than two AT-capable ports.

11
plugins/nokia/mm-plugin-nokia-icera.c
View File

@@ -70,11 +70,18 @@ grab_port (MMPlugin *self,
/* Look for port type hints */ /* Look for port type hints */
if (mm_port_probe_is_at (probe)) { if (mm_port_probe_is_at (probe)) {
if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_MODEM")) if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_MODEM")) {
mm_dbg ("Nokia: AT port '%s/%s' flagged as primary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PRIMARY; pflags = MM_AT_PORT_FLAG_PRIMARY;
else if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_AUX")) } else if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_AUX")) {
mm_dbg ("Nokia: AT port '%s/%s' flagged as secondary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_SECONDARY; pflags = MM_AT_PORT_FLAG_SECONDARY;
} }
}
return mm_base_modem_grab_port (modem, return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe), mm_port_probe_get_port_subsys (probe),

12
plugins/simtech/mm-plugin-simtech.c
View File

@@ -21,6 +21,7 @@
#define _LIBMM_INSIDE_MM #define _LIBMM_INSIDE_MM
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-log.h"
#include "mm-plugin-simtech.h" #include "mm-plugin-simtech.h"
#include "mm-broadband-modem-simtech.h" #include "mm-broadband-modem-simtech.h"
@@ -73,10 +74,17 @@ grab_port (MMPlugin *self,
* be the data/primary port on these devices. We have to tag them based on * be the data/primary port on these devices. We have to tag them based on
* what the Windows .INF files say the port layout should be. * what the Windows .INF files say the port layout should be.
*/ */
if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_MODEM")) if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_MODEM")) {
mm_dbg ("Simtech: AT port '%s/%s' flagged as primary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PRIMARY; pflags = MM_AT_PORT_FLAG_PRIMARY;
else if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_AUX")) } else if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_AUX")) {
mm_dbg ("Simtech: AT port '%s/%s' flagged as secondary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_SECONDARY; pflags = MM_AT_PORT_FLAG_SECONDARY;
}
/* If the port was tagged by the udev rules but isn't a primary or secondary, /* If the port was tagged by the udev rules but isn't a primary or secondary,
* then ignore it to guard against race conditions if a device just happens * then ignore it to guard against race conditions if a device just happens

12
plugins/x22x/mm-plugin-x22x.c
View File

@@ -212,11 +212,17 @@ grab_port (MMPlugin *self,
* be the data/primary port on these devices. We have to tag them based on * be the data/primary port on these devices. We have to tag them based on
* what the Windows .INF files say the port layout should be. * what the Windows .INF files say the port layout should be.
*/ */
if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_MODEM")) if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_MODEM")) {
mm_dbg ("x22x: AT port '%s/%s' flagged as primary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PRIMARY; pflags = MM_AT_PORT_FLAG_PRIMARY;
else if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_AUX")) } else if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_AUX")) {
mm_dbg ("x22x: AT port '%s/%s' flagged as secondary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_SECONDARY; pflags = MM_AT_PORT_FLAG_SECONDARY;
else { } else {
/* If the port was tagged by the udev rules but isn't a primary or secondary, /* If the port was tagged by the udev rules but isn't a primary or secondary,
* then ignore it to guard against race conditions if a device just happens * then ignore it to guard against race conditions if a device just happens
* to show up with more than two AT-capable ports. * to show up with more than two AT-capable ports.

13
plugins/zte/mm-plugin-zte.c
View File

@@ -98,14 +98,21 @@ grab_port (MMPlugin *self,
if (mm_port_probe_is_at (probe)) { if (mm_port_probe_is_at (probe)) {
/* Look for port type hints */ /* Look for port type hints */
if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_PORT_TYPE_MODEM")) if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_PORT_TYPE_MODEM")) {
mm_dbg ("ZTE: AT port '%s/%s' flagged as primary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PRIMARY; pflags = MM_AT_PORT_FLAG_PRIMARY;
else if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_PORT_TYPE_AUX")) } else if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_PORT_TYPE_AUX")) {
mm_dbg ("ZTE: AT port '%s/%s' flagged as secondary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_SECONDARY; pflags = MM_AT_PORT_FLAG_SECONDARY;
} }
}
if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_ICERA_DHCP")) { if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_ICERA_DHCP")) {
mm_dbg ("Icera-based ZTE modem will use DHCP"); mm_dbg ("ZTE: Icera-based modem will use DHCP");
g_object_set (modem, g_object_set (modem,
MM_BROADBAND_MODEM_ICERA_DEFAULT_IP_METHOD, MM_BEARER_IP_METHOD_DHCP, MM_BROADBAND_MODEM_ICERA_DEFAULT_IP_METHOD, MM_BEARER_IP_METHOD_DHCP,
NULL); NULL);