summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/device.h3
-rw-r--r--src/device.c20
-rw-r--r--src/element.c5
-rw-r--r--src/inet.c10
-rw-r--r--src/udev-compat.c4
-rw-r--r--src/udev.c5
6 files changed, 9 insertions, 38 deletions
diff --git a/include/device.h b/include/device.h
index 9f126859..44744486 100644
--- a/include/device.h
+++ b/include/device.h
@@ -45,9 +45,6 @@ enum connman_device_type {
CONNMAN_DEVICE_TYPE_GPS = 6,
CONNMAN_DEVICE_TYPE_MBM = 14,
CONNMAN_DEVICE_TYPE_HSO = 15,
- CONNMAN_DEVICE_TYPE_NOZOMI = 16,
- CONNMAN_DEVICE_TYPE_HUAWEI = 17,
- CONNMAN_DEVICE_TYPE_NOVATEL = 18,
CONNMAN_DEVICE_TYPE_VENDOR = 10000,
};
diff --git a/src/device.c b/src/device.c
index 8d0f00ad..3959ac98 100644
--- a/src/device.c
+++ b/src/device.c
@@ -134,12 +134,9 @@ static const char *type2description(enum connman_device_type type)
return "Bluetooth";
case CONNMAN_DEVICE_TYPE_GPS:
return "GPS";
- case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_CELLULAR:
+ 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:
return "Cellular";
}
@@ -162,12 +159,9 @@ static const char *type2string(enum connman_device_type type)
return "bluetooth";
case CONNMAN_DEVICE_TYPE_GPS:
return "gps";
- case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
return "cellular";
}
@@ -182,9 +176,6 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
case CONNMAN_DEVICE_TYPE_UNKNOWN:
case CONNMAN_DEVICE_TYPE_VENDOR:
case CONNMAN_DEVICE_TYPE_GPS:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
break;
case CONNMAN_DEVICE_TYPE_ETHERNET:
return CONNMAN_SERVICE_TYPE_ETHERNET;
@@ -194,8 +185,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
return CONNMAN_SERVICE_TYPE_WIMAX;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
- case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
return CONNMAN_SERVICE_TYPE_CELLULAR;
}
@@ -847,12 +838,9 @@ struct connman_device *connman_device_create(const char *node,
case CONNMAN_DEVICE_TYPE_GPS:
device->scan_interval = 0;
break;
- case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_CELLULAR:
+ 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:
device->scan_interval = 0;
break;
}
diff --git a/src/element.c b/src/element.c
index d2e87016..9c921665 100644
--- a/src/element.c
+++ b/src/element.c
@@ -253,16 +253,13 @@ struct connman_service *__connman_element_get_service(struct connman_element *el
case CONNMAN_DEVICE_TYPE_UNKNOWN:
case CONNMAN_DEVICE_TYPE_VENDOR:
case CONNMAN_DEVICE_TYPE_GPS:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
break;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_WIFI:
case CONNMAN_DEVICE_TYPE_WIMAX:
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
network = __connman_element_get_network(element);
if (network == NULL)
diff --git a/src/inet.c b/src/inet.c
index ab9cf623..9fcf3d73 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -463,13 +463,10 @@ struct connman_device *connman_inet_create_device(int index)
addr = index2addr(index);
break;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_GPS:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
case CONNMAN_DEVICE_TYPE_VENDOR:
- case CONNMAN_DEVICE_TYPE_CELLULAR:
name = strdup(devname);
break;
case CONNMAN_DEVICE_TYPE_MBM:
@@ -486,9 +483,6 @@ struct connman_device *connman_inet_create_device(int index)
switch (type) {
case CONNMAN_DEVICE_TYPE_UNKNOWN:
case CONNMAN_DEVICE_TYPE_VENDOR:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
case CONNMAN_DEVICE_TYPE_GPS:
mode = CONNMAN_DEVICE_MODE_UNKNOWN;
break;
@@ -502,9 +496,9 @@ struct connman_device *connman_inet_create_device(int index)
ident = index2ident(index, NULL);
break;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_CELLULAR:
mode = CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE;
break;
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
diff --git a/src/udev-compat.c b/src/udev-compat.c
index 62df4c69..f6fd4410 100644
--- a/src/udev-compat.c
+++ b/src/udev-compat.c
@@ -58,10 +58,8 @@ static void detect_newlink(unsigned short type, int index,
case CONNMAN_DEVICE_TYPE_VENDOR:
case CONNMAN_DEVICE_TYPE_WIMAX:
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_GPS:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
return;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_WIFI:
diff --git a/src/udev.c b/src/udev.c
index ebc5887b..02e6e534 100644
--- a/src/udev.c
+++ b/src/udev.c
@@ -91,11 +91,8 @@ static void add_net_device(struct udev_device *udev_device)
case CONNMAN_DEVICE_TYPE_VENDOR:
case CONNMAN_DEVICE_TYPE_WIMAX:
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_GPS:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_GPS:
return;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_WIFI:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 03:22:30 +0000