aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-03-07 10:37:49 +0100
committerAleksander Morgado <aleksander@lanedo.com>2012-03-16 14:53:22 +0100
commit66984e77cdfd7e1292da31a03996696b3f5288d1 (patch)
tree55d903f6c05ff207d2e622f787a9b11ceceabf6b /src
parentb07e13f49d5e343377d086c5a564ae5659b6a40a (diff)
port-probe: convert port probe flags to a private enum
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/mm-port-probe.h11
2 files changed, 11 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 13b353a5..77e58c10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,11 +73,13 @@ libserial_la_SOURCES = \
mm-qcdm-serial-port.h
# Daemon specific enum types
-DAEMON_ENUMS = $(srcdir)/mm-bearer.h
+DAEMON_ENUMS = \
+ $(srcdir)/mm-bearer.h \
+ $(srcdir)/mm-port-probe.h
mm-daemon-enums-types.h: Makefile.am $(DAEMON_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
- --fhead "#include \"mm-bearer.h\"\n#ifndef __MM_DAEMON_ENUMS_TYPES_H__\n#define __MM_DAEMON_ENUMS_TYPES_H__\n" \
+ --fhead "#include \"mm-bearer.h\"\n#include \"mm-port-probe.h\"\n#ifndef __MM_DAEMON_ENUMS_TYPES_H__\n#define __MM_DAEMON_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--ftail "#endif /* __MM_DAEMON_ENUMS_TYPES_H__ */\n" \
$(DAEMON_ENUMS) > $@
diff --git a/src/mm-port-probe.h b/src/mm-port-probe.h
index 8986a829..bfb214e4 100644
--- a/src/mm-port-probe.h
+++ b/src/mm-port-probe.h
@@ -34,10 +34,13 @@
#define MM_PORT_PROBE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PORT_PROBE, MMPortProbeClass))
/* Flags to request port probing */
-#define MM_PORT_PROBE_AT 0x0001
-#define MM_PORT_PROBE_AT_VENDOR 0x0002
-#define MM_PORT_PROBE_AT_PRODUCT 0x0004
-#define MM_PORT_PROBE_QCDM 0x0008
+typedef enum { /*< underscore_name=mm_port_probe_flag >*/
+ MM_PORT_PROBE_NONE = 0,
+ MM_PORT_PROBE_AT = 1 << 0,
+ MM_PORT_PROBE_AT_VENDOR = 1 << 1,
+ MM_PORT_PROBE_AT_PRODUCT = 1 << 2,
+ MM_PORT_PROBE_QCDM = 1 << 3,
+} MMPortProbeFlag;
typedef struct _MMPortProbe MMPortProbe;
typedef struct _MMPortProbeClass MMPortProbeClass;