diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2018-09-13 11:47:10 +0200 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2018-09-25 17:55:53 +0000 |
| commit | 2a1a0b88fbaafbe3862e1b9130a9a484e84d752f (patch) | |
| tree | 0619d8f967e7dd3ea03a729a682679fe28e8fef3 /src/mm-base-modem.c | |
| parent | a2705abb247f0f141d41ad8f34d99ce6133073af (diff) | |
udev: define all generic tags as symbols
This prevents errors due to nasty typos in the strings.
We define all symbols in a single header file that is NOT considered
part of the API, as there is no need for MM clients to know about
these tags code-wise. These tags are only meaningful when associated
to devices in udev.
Information of each tag is included in the general API documentation.
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/88
Diffstat (limited to 'src/mm-base-modem.c')
| -rw-r--r-- | src/mm-base-modem.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index c0ebb7f1..d748b374 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -23,6 +23,8 @@ #include <string.h> #include <ModemManager.h> +#include <ModemManager-tags.h> + #include <mm-errors-types.h> #include <mm-gdbus-modem.h> @@ -215,13 +217,13 @@ mm_base_modem_grab_port (MMBaseModem *self, mm_serial_parser_v1_destroy); /* Prefer plugin-provided flags to the generic ones */ if (at_pflags == MM_PORT_SERIAL_AT_FLAG_NONE) { - if (mm_kernel_device_get_property_as_boolean (kernel_device, "ID_MM_PORT_TYPE_AT_PRIMARY")) { + if (mm_kernel_device_get_property_as_boolean (kernel_device, ID_MM_PORT_TYPE_AT_PRIMARY)) { mm_dbg ("AT port '%s/%s' flagged as primary", subsys, name); at_pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY; - } else if (mm_kernel_device_get_property_as_boolean (kernel_device, "ID_MM_PORT_TYPE_AT_SECONDARY")) { + } else if (mm_kernel_device_get_property_as_boolean (kernel_device, ID_MM_PORT_TYPE_AT_SECONDARY)) { mm_dbg ("AT port '%s/%s' flagged as secondary", subsys, name); at_pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY; - } else if (mm_kernel_device_get_property_as_boolean (kernel_device, "ID_MM_PORT_TYPE_AT_PPP")) { + } else if (mm_kernel_device_get_property_as_boolean (kernel_device, ID_MM_PORT_TYPE_AT_PPP)) { mm_dbg ("AT port '%s/%s' flagged as PPP", subsys, name); at_pflags = MM_PORT_SERIAL_AT_FLAG_PPP; } @@ -249,12 +251,12 @@ mm_base_modem_grab_port (MMBaseModem *self, self); /* For serial ports, optionally use a specific baudrate and flow control */ - if (mm_kernel_device_has_property (kernel_device, "ID_MM_TTY_BAUDRATE")) + if (mm_kernel_device_has_property (kernel_device, ID_MM_TTY_BAUDRATE)) g_object_set (port, - MM_PORT_SERIAL_BAUD, mm_kernel_device_get_property_as_int (kernel_device, "ID_MM_TTY_BAUDRATE"), + MM_PORT_SERIAL_BAUD, mm_kernel_device_get_property_as_int (kernel_device, ID_MM_TTY_BAUDRATE), NULL); - flow_control_tag = mm_kernel_device_get_property (kernel_device, "ID_MM_TTY_FLOW_CONTROL"); + flow_control_tag = mm_kernel_device_get_property (kernel_device, ID_MM_TTY_FLOW_CONTROL); if (flow_control_tag) { MMFlowControl flow_control; GError *inner_error = NULL; |