Fix wrong usage of device types instead of service types

diff --git a/src/connman.h b/src/connman.h
index 93d508f..0d56436 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -172,10 +172,10 @@ struct connman_device *__connman_element_get_device(struct connman_element *elem
 const char *__connman_element_get_device_path(struct connman_element *element);
 const char *__connman_element_get_network_path(struct connman_element *element);
 
-struct connman_device *__connman_element_find_device(enum connman_device_type type);
-int __connman_element_request_scan(enum connman_device_type type);
-int __connman_element_enable_technology(enum connman_device_type type);
-int __connman_element_disable_technology(enum connman_device_type type);
+struct connman_device *__connman_element_find_device(enum connman_service_type type);
+int __connman_element_request_scan(enum connman_service_type type);
+int __connman_element_enable_technology(enum connman_service_type type);
+int __connman_element_disable_technology(enum connman_service_type type);
 
 const char *__connman_element_type2string(enum connman_element_type type);
 

diff --git a/src/element.c b/src/element.c
index 60fbca1..7a45627 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -331,7 +331,7 @@ const char *__connman_element_get_network_path(struct connman_element *element)
 }
 
 struct find_data {
-       enum connman_device_type type;
+       enum connman_service_type type;
        struct connman_device *device;
 };
 
@@ -354,7 +354,7 @@ static gboolean find_device(GNode *node, gpointer user_data)
        return TRUE;
 }
 
-struct connman_device *__connman_element_find_device(enum connman_device_type type)
+struct connman_device *__connman_element_find_device(enum connman_service_type type)
 {
        struct find_data data = { .type = type, .device = NULL };
 
@@ -368,7 +368,7 @@ static gboolean request_scan(GNode *node, gpointer user_data)
 {
        struct connman_element *element = node->data;
        struct find_data *data = user_data;
-       enum connman_device_type type;
+       enum connman_service_type type;
 
        if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
                return FALSE;
@@ -376,23 +376,17 @@ static gboolean request_scan(GNode *node, gpointer user_data)
        if (element->device == NULL)
                return FALSE;
 
-       type = connman_device_get_type(element->device);
+       type = __connman_device_get_service_type(element->device);
 
        switch (type) {
-       case CONNMAN_DEVICE_TYPE_UNKNOWN:
-       case CONNMAN_DEVICE_TYPE_VENDOR:
-       case CONNMAN_DEVICE_TYPE_ETHERNET:
-       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-       case CONNMAN_DEVICE_TYPE_GPS:
-       case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
-       case CONNMAN_DEVICE_TYPE_NOZOMI:
-       case CONNMAN_DEVICE_TYPE_HUAWEI:
-       case CONNMAN_DEVICE_TYPE_NOVATEL:
+       case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+       case CONNMAN_SERVICE_TYPE_CELLULAR:
                return FALSE;
-       case CONNMAN_DEVICE_TYPE_WIFI:
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-               if (data->type != CONNMAN_DEVICE_TYPE_UNKNOWN &&
+       case CONNMAN_SERVICE_TYPE_WIFI:
+       case CONNMAN_SERVICE_TYPE_WIMAX:
+               if (data->type != CONNMAN_SERVICE_TYPE_UNKNOWN &&
                                                        data->type != type)
                        return FALSE;
                break;
@@ -403,7 +397,7 @@ static gboolean request_scan(GNode *node, gpointer user_data)
        return FALSE;
 }
 
-int __connman_element_request_scan(enum connman_device_type type)
+int __connman_element_request_scan(enum connman_service_type type)
 {
        struct find_data data = { .type = type, .device = NULL };
 
@@ -417,7 +411,7 @@ static gboolean enable_technology(GNode *node, gpointer user_data)
 {
        struct connman_element *element = node->data;
        struct find_data *data = user_data;
-       enum connman_device_type type;
+       enum connman_service_type type;
 
        if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
                return FALSE;
@@ -425,23 +419,17 @@ static gboolean enable_technology(GNode *node, gpointer user_data)
        if (element->device == NULL)
                return FALSE;
 
-       type = connman_device_get_type(element->device);
+       type = __connman_device_get_service_type(element->device);
 
        switch (type) {
-       case CONNMAN_DEVICE_TYPE_UNKNOWN:
-       case CONNMAN_DEVICE_TYPE_VENDOR:
-       case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
-       case CONNMAN_DEVICE_TYPE_NOZOMI:
-       case CONNMAN_DEVICE_TYPE_HUAWEI:
-       case CONNMAN_DEVICE_TYPE_NOVATEL:
+       case CONNMAN_SERVICE_TYPE_UNKNOWN:
                return FALSE;
-       case CONNMAN_DEVICE_TYPE_ETHERNET:
-       case CONNMAN_DEVICE_TYPE_WIFI:
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-       case CONNMAN_DEVICE_TYPE_GPS:
-               if (data->type != CONNMAN_DEVICE_TYPE_UNKNOWN &&
+       case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_WIFI:
+       case CONNMAN_SERVICE_TYPE_WIMAX:
+       case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+       case CONNMAN_SERVICE_TYPE_CELLULAR:
+               if (data->type != CONNMAN_SERVICE_TYPE_UNKNOWN &&
                                                        data->type != type)
                        return FALSE;
                break;
@@ -452,7 +440,7 @@ static gboolean enable_technology(GNode *node, gpointer user_data)
        return FALSE;
 }
 
-int __connman_element_enable_technology(enum connman_device_type type)
+int __connman_element_enable_technology(enum connman_service_type type)
 {
        struct find_data data = { .type = type, .device = NULL };
 
@@ -466,7 +454,7 @@ static gboolean disable_technology(GNode *node, gpointer user_data)
 {
        struct connman_element *element = node->data;
        struct find_data *data = user_data;
-       enum connman_device_type type;
+       enum connman_service_type type;
 
        if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
                return FALSE;
@@ -474,23 +462,17 @@ static gboolean disable_technology(GNode *node, gpointer user_data)
        if (element->device == NULL)
                return FALSE;
 
-       type = connman_device_get_type(element->device);
+       type = __connman_device_get_service_type(element->device);
 
        switch (type) {
-       case CONNMAN_DEVICE_TYPE_UNKNOWN:
-       case CONNMAN_DEVICE_TYPE_VENDOR:
-       case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
-       case CONNMAN_DEVICE_TYPE_NOZOMI:
-       case CONNMAN_DEVICE_TYPE_HUAWEI:
-       case CONNMAN_DEVICE_TYPE_NOVATEL:
+       case CONNMAN_SERVICE_TYPE_UNKNOWN:
                return FALSE;
-       case CONNMAN_DEVICE_TYPE_ETHERNET:
-       case CONNMAN_DEVICE_TYPE_WIFI:
-       case CONNMAN_DEVICE_TYPE_WIMAX:
-       case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-       case CONNMAN_DEVICE_TYPE_GPS:
-               if (data->type != CONNMAN_DEVICE_TYPE_UNKNOWN &&
+       case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_WIFI:
+       case CONNMAN_SERVICE_TYPE_WIMAX:
+       case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+       case CONNMAN_SERVICE_TYPE_CELLULAR:
+               if (data->type != CONNMAN_SERVICE_TYPE_UNKNOWN &&
                                                        data->type != type)
                        return FALSE;
                break;
@@ -501,7 +483,7 @@ static gboolean disable_technology(GNode *node, gpointer user_data)
        return FALSE;
 }
 
-int __connman_element_disable_technology(enum connman_device_type type)
+int __connman_element_disable_technology(enum connman_service_type type)
 {
        struct find_data data = { .type = type, .device = NULL };
 

diff --git a/src/manager.c b/src/manager.c
index 113a907..12c9cb9 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -355,7 +355,7 @@ static DBusMessage *remove_profile(DBusConnection *conn,
 static DBusMessage *request_scan(DBusConnection *conn,
                                        DBusMessage *msg, void *data)
 {
-       enum connman_device_type type;
+       enum connman_service_type type;
        const char *str;
        int err;
 
@@ -365,11 +365,11 @@ static DBusMessage *request_scan(DBusConnection *conn,
                                                        DBUS_TYPE_INVALID);
 
        if (g_strcmp0(str, "") == 0)
-               type = CONNMAN_DEVICE_TYPE_UNKNOWN;
+               type = CONNMAN_SERVICE_TYPE_UNKNOWN;
        else if (g_strcmp0(str, "wifi") == 0)
-               type = CONNMAN_DEVICE_TYPE_WIFI;
+               type = CONNMAN_SERVICE_TYPE_WIFI;
        else if (g_strcmp0(str, "wimax") == 0)
-               type = CONNMAN_DEVICE_TYPE_WIMAX;
+               type = CONNMAN_SERVICE_TYPE_WIMAX;
        else
                return __connman_error_invalid_arguments(msg);
 
@@ -389,7 +389,7 @@ static DBusMessage *request_scan(DBusConnection *conn,
 static DBusMessage *enable_technology(DBusConnection *conn,
                                        DBusMessage *msg, void *data)
 {
-       enum connman_device_type type;
+       enum connman_service_type type;
        const char *str;
        int err;
 
@@ -399,15 +399,15 @@ static DBusMessage *enable_technology(DBusConnection *conn,
                                                        DBUS_TYPE_INVALID);
 
        if (g_strcmp0(str, "ethernet") == 0)
-               type = CONNMAN_DEVICE_TYPE_ETHERNET;
+               type = CONNMAN_SERVICE_TYPE_ETHERNET;
        else if (g_strcmp0(str, "wifi") == 0)
-               type = CONNMAN_DEVICE_TYPE_WIFI;
+               type = CONNMAN_SERVICE_TYPE_WIFI;
        else if (g_strcmp0(str, "wimax") == 0)
-               type = CONNMAN_DEVICE_TYPE_WIMAX;
+               type = CONNMAN_SERVICE_TYPE_WIMAX;
        else if (g_strcmp0(str, "bluetooth") == 0)
-               type = CONNMAN_DEVICE_TYPE_BLUETOOTH;
-       else if (g_strcmp0(str, "gps") == 0)
-               type = CONNMAN_DEVICE_TYPE_GPS;
+               type = CONNMAN_SERVICE_TYPE_BLUETOOTH;
+       else if (g_strcmp0(str, "cellular") == 0)
+               type = CONNMAN_SERVICE_TYPE_CELLULAR;
        else
                return __connman_error_invalid_arguments(msg);
 
@@ -427,7 +427,7 @@ static DBusMessage *enable_technology(DBusConnection *conn,
 static DBusMessage *disable_technology(DBusConnection *conn,
                                        DBusMessage *msg, void *data)
 {
-       enum connman_device_type type;
+       enum connman_service_type type;
        const char *str;
        int err;
 
@@ -437,15 +437,15 @@ static DBusMessage *disable_technology(DBusConnection *conn,
                                                        DBUS_TYPE_INVALID);
 
        if (g_strcmp0(str, "ethernet") == 0)
-               type = CONNMAN_DEVICE_TYPE_ETHERNET;
+               type = CONNMAN_SERVICE_TYPE_ETHERNET;
        else if (g_strcmp0(str, "wifi") == 0)
-               type = CONNMAN_DEVICE_TYPE_WIFI;
+               type = CONNMAN_SERVICE_TYPE_WIFI;
        else if (g_strcmp0(str, "wimax") == 0)
-               type = CONNMAN_DEVICE_TYPE_WIMAX;
+               type = CONNMAN_SERVICE_TYPE_WIMAX;
        else if (g_strcmp0(str, "bluetooth") == 0)
-               type = CONNMAN_DEVICE_TYPE_BLUETOOTH;
-       else if (g_strcmp0(str, "gps") == 0)
-               type = CONNMAN_DEVICE_TYPE_GPS;
+               type = CONNMAN_SERVICE_TYPE_BLUETOOTH;
+       else if (g_strcmp0(str, "cellular") == 0)
+               type = CONNMAN_SERVICE_TYPE_CELLULAR;
        else
                return __connman_error_invalid_arguments(msg);
 

diff --git a/src/service.c b/src/service.c
index 3b4ae87..7c9fdce 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1301,7 +1301,7 @@ int __connman_service_create_and_connect(DBusMessage *msg)
        if (ssid_len < 1)
                return -EINVAL;
 
-       device = __connman_element_find_device(CONNMAN_DEVICE_TYPE_WIFI);
+       device = __connman_element_find_device(CONNMAN_SERVICE_TYPE_WIFI);
        if (device == NULL)
                return -EOPNOTSUPP;