}
struct find_data {
- enum connman_device_type type;
+ enum connman_service_type type;
struct connman_device *device;
};
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 };
{
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;
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;
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 };
{
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;
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;
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 };
{
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;
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;
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 };
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;
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);
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;
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);
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;
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);