Allow pre-processor pasting of plugin name

[connman] / include / element.h

diff --git a/include/element.h b/include/element.h
index 55f9593..85b9b06 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -44,18 +44,27 @@ enum connman_element_state {
        CONNMAN_ELEMENT_STATE_CLOSED    = 3,
 };
 
+enum connman_element_policy {
+       CONNMAN_ELEMENT_POLICY_UNKNOWN = 0,
+       CONNMAN_ELEMENT_POLICY_OFF     = 1,
+       CONNMAN_ELEMENT_POLICY_AUTO    = 2,
+       CONNMAN_ELEMENT_POLICY_IGNORE  = 3,
+       CONNMAN_ELEMENT_POLICY_ASK     = 4,
+};
+
 enum connman_element_type {
        CONNMAN_ELEMENT_TYPE_UNKNOWN    = 0,
        CONNMAN_ELEMENT_TYPE_ROOT       = 1,
        CONNMAN_ELEMENT_TYPE_PROFILE    = 2,
        CONNMAN_ELEMENT_TYPE_DEVICE     = 3,
        CONNMAN_ELEMENT_TYPE_NETWORK    = 4,
-       CONNMAN_ELEMENT_TYPE_IPV4       = 5,
-       CONNMAN_ELEMENT_TYPE_IPV6       = 6,
-       CONNMAN_ELEMENT_TYPE_DHCP       = 7,
-       CONNMAN_ELEMENT_TYPE_BOOTP      = 8,
-       CONNMAN_ELEMENT_TYPE_ZEROCONF   = 9,
-       CONNMAN_ELEMENT_TYPE_RESOLVER   = 10,
+       CONNMAN_ELEMENT_TYPE_SERVICE    = 5,
+       CONNMAN_ELEMENT_TYPE_IPV4       = 6,
+       CONNMAN_ELEMENT_TYPE_IPV6       = 7,
+       CONNMAN_ELEMENT_TYPE_DHCP       = 8,
+       CONNMAN_ELEMENT_TYPE_BOOTP      = 9,
+       CONNMAN_ELEMENT_TYPE_ZEROCONF   = 10,
+       CONNMAN_ELEMENT_TYPE_RESOLVER   = 11,
 
        CONNMAN_ELEMENT_TYPE_CONNECTION = 42,
 };
@@ -75,13 +84,13 @@ struct connman_driver;
 
 struct connman_element {
        gint refcount;
-       GStaticMutex mutex;
        gint index;
        gchar *name;
        gchar *path;
        enum connman_element_type type;
        enum connman_element_subtype subtype;
        enum connman_element_state state;
+       enum connman_element_policy policy;
        gboolean enabled;
        guint16 priority;
 
@@ -107,9 +116,6 @@ struct connman_element {
        } wifi;
 };
 
-#define connman_element_lock(element)    g_static_mutex_lock(&(element)->mutex)
-#define connman_element_unlock(element)  g_static_mutex_unlock(&(element)->mutex)
-
 extern struct connman_element *connman_element_create(const char *name);
 extern struct connman_element *connman_element_ref(struct connman_element *element);
 extern void connman_element_unref(struct connman_element *element);