diff options
author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-12-11 16:36:26 +0200 |
---|---|---|
committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2013-01-04 13:00:31 +0200 |
commit | 35f61b1f8f53033a7333b56be18328d426dc24a1 (patch) | |
tree | 85d223d1a1711b622bedfddb0874c136f72d36ec | |
parent | bb4ade7dc5d9c734a81b50313c9ff54b9f4ca7dc (diff) | |
download | connman-35f61b1f8f53033a7333b56be18328d426dc24a1.tar.gz connman-35f61b1f8f53033a7333b56be18328d426dc24a1.tar.bz2 connman-35f61b1f8f53033a7333b56be18328d426dc24a1.zip |
core: Remove WiMAX definitions from code
-rw-r--r-- | include/device.h | 9 | ||||
-rw-r--r-- | include/network.h | 1 | ||||
-rw-r--r-- | include/service.h | 11 | ||||
-rw-r--r-- | plugins/iospm.c | 1 | ||||
-rw-r--r-- | src/detect.c | 1 | ||||
-rw-r--r-- | src/device.c | 9 | ||||
-rw-r--r-- | src/network.c | 11 | ||||
-rw-r--r-- | src/notifier.c | 2 | ||||
-rw-r--r-- | src/rfkill.c | 5 | ||||
-rw-r--r-- | src/rtnl.c | 3 | ||||
-rw-r--r-- | src/service.c | 13 | ||||
-rw-r--r-- | src/session.c | 7 | ||||
-rw-r--r-- | src/storage.c | 15 | ||||
-rw-r--r-- | src/technology.c | 4 | ||||
-rw-r--r-- | src/wispr.c | 1 |
15 files changed, 10 insertions, 83 deletions
diff --git a/include/device.h b/include/device.h index d3746551..b372821f 100644 --- a/include/device.h +++ b/include/device.h @@ -39,11 +39,10 @@ enum connman_device_type { CONNMAN_DEVICE_TYPE_UNKNOWN = 0, CONNMAN_DEVICE_TYPE_ETHERNET = 1, CONNMAN_DEVICE_TYPE_WIFI = 2, - CONNMAN_DEVICE_TYPE_WIMAX = 3, - CONNMAN_DEVICE_TYPE_BLUETOOTH = 4, - CONNMAN_DEVICE_TYPE_CELLULAR = 5, - CONNMAN_DEVICE_TYPE_GPS = 6, - CONNMAN_DEVICE_TYPE_GADGET = 7, + CONNMAN_DEVICE_TYPE_BLUETOOTH = 3, + CONNMAN_DEVICE_TYPE_CELLULAR = 4, + CONNMAN_DEVICE_TYPE_GPS = 5, + CONNMAN_DEVICE_TYPE_GADGET = 6, CONNMAN_DEVICE_TYPE_VENDOR = 10000, }; diff --git a/include/network.h b/include/network.h index 3945a541..b8eba08c 100644 --- a/include/network.h +++ b/include/network.h @@ -41,7 +41,6 @@ enum connman_network_type { CONNMAN_NETWORK_TYPE_UNKNOWN = 0, CONNMAN_NETWORK_TYPE_ETHERNET = 1, CONNMAN_NETWORK_TYPE_WIFI = 2, - CONNMAN_NETWORK_TYPE_WIMAX = 3, CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN = 8, CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9, CONNMAN_NETWORK_TYPE_CELLULAR = 10, diff --git a/include/service.h b/include/service.h index c182bc37..5e646a08 100644 --- a/include/service.h +++ b/include/service.h @@ -39,12 +39,11 @@ enum connman_service_type { CONNMAN_SERVICE_TYPE_SYSTEM = 1, CONNMAN_SERVICE_TYPE_ETHERNET = 2, CONNMAN_SERVICE_TYPE_WIFI = 3, - CONNMAN_SERVICE_TYPE_WIMAX = 4, - CONNMAN_SERVICE_TYPE_BLUETOOTH = 5, - CONNMAN_SERVICE_TYPE_CELLULAR = 6, - CONNMAN_SERVICE_TYPE_GPS = 7, - CONNMAN_SERVICE_TYPE_VPN = 8, - CONNMAN_SERVICE_TYPE_GADGET = 9, + CONNMAN_SERVICE_TYPE_BLUETOOTH = 4, + CONNMAN_SERVICE_TYPE_CELLULAR = 5, + CONNMAN_SERVICE_TYPE_GPS = 6, + CONNMAN_SERVICE_TYPE_VPN = 7, + CONNMAN_SERVICE_TYPE_GADGET = 8, }; enum connman_service_security { diff --git a/plugins/iospm.c b/plugins/iospm.c index 1ea56a9d..3b014d31 100644 --- a/plugins/iospm.c +++ b/plugins/iospm.c @@ -69,7 +69,6 @@ static void iospm_service_enabled(enum connman_service_type type, case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_ETHERNET: case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_CELLULAR: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: diff --git a/src/detect.c b/src/detect.c index 44d17fd3..5bf44af1 100644 --- a/src/detect.c +++ b/src/detect.c @@ -56,7 +56,6 @@ static void detect_newlink(unsigned short type, int index, switch (devtype) { case CONNMAN_DEVICE_TYPE_UNKNOWN: 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: diff --git a/src/device.c b/src/device.c index d0c2e7e6..fbfb2b58 100644 --- a/src/device.c +++ b/src/device.c @@ -89,8 +89,6 @@ static const char *type2description(enum connman_device_type type) return "Ethernet"; case CONNMAN_DEVICE_TYPE_WIFI: return "Wireless"; - case CONNMAN_DEVICE_TYPE_WIMAX: - return "WiMAX"; case CONNMAN_DEVICE_TYPE_BLUETOOTH: return "Bluetooth"; case CONNMAN_DEVICE_TYPE_GPS: @@ -115,8 +113,6 @@ static const char *type2string(enum connman_device_type type) return "ethernet"; case CONNMAN_DEVICE_TYPE_WIFI: return "wifi"; - case CONNMAN_DEVICE_TYPE_WIMAX: - return "wimax"; case CONNMAN_DEVICE_TYPE_BLUETOOTH: return "bluetooth"; case CONNMAN_DEVICE_TYPE_GPS: @@ -144,8 +140,6 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic return CONNMAN_SERVICE_TYPE_ETHERNET; case CONNMAN_DEVICE_TYPE_WIFI: return CONNMAN_SERVICE_TYPE_WIFI; - case CONNMAN_DEVICE_TYPE_WIMAX: - return CONNMAN_SERVICE_TYPE_WIMAX; case CONNMAN_DEVICE_TYPE_BLUETOOTH: return CONNMAN_SERVICE_TYPE_BLUETOOTH; case CONNMAN_DEVICE_TYPE_CELLULAR: @@ -1091,7 +1085,6 @@ int __connman_device_request_scan(enum connman_service_type type) case CONNMAN_SERVICE_TYPE_GADGET: return -EOPNOTSUPP; case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: break; } @@ -1257,7 +1250,6 @@ struct connman_device *connman_device_create_from_index(int index) case CONNMAN_DEVICE_TYPE_ETHERNET: case CONNMAN_DEVICE_TYPE_GADGET: case CONNMAN_DEVICE_TYPE_WIFI: - case CONNMAN_DEVICE_TYPE_WIMAX: name = index2ident(index, ""); addr = index2addr(index); break; @@ -1283,7 +1275,6 @@ struct connman_device *connman_device_create_from_index(int index) ident = index2ident(index, NULL); break; case CONNMAN_DEVICE_TYPE_WIFI: - case CONNMAN_DEVICE_TYPE_WIMAX: ident = index2ident(index, NULL); break; case CONNMAN_DEVICE_TYPE_BLUETOOTH: diff --git a/src/network.c b/src/network.c index 5c66bbde..0e64c35d 100644 --- a/src/network.c +++ b/src/network.c @@ -90,10 +90,6 @@ struct connman_network { char *pin_wps; } wifi; - struct { - char *nsp_name; - int nsp_name_len; - } wimax; }; static const char *type2string(enum connman_network_type type) @@ -106,8 +102,6 @@ static const char *type2string(enum connman_network_type type) return "ethernet"; case CONNMAN_NETWORK_TYPE_WIFI: return "wifi"; - case CONNMAN_NETWORK_TYPE_WIMAX: - return "wimax"; case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: return "bluetooth"; @@ -167,7 +161,6 @@ static int network_probe(struct connman_network *network) case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: case CONNMAN_NETWORK_TYPE_WIFI: - case CONNMAN_NETWORK_TYPE_WIMAX: network->driver = driver; if (__connman_service_create_from_network(network) == NULL) { network->driver = NULL; @@ -196,7 +189,6 @@ static void network_remove(struct connman_network *network) case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: case CONNMAN_NETWORK_TYPE_WIFI: - case CONNMAN_NETWORK_TYPE_WIMAX: if (network->group != NULL) { __connman_service_remove_from_network(network); @@ -511,7 +503,6 @@ void connman_network_set_group(struct connman_network *network, case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: case CONNMAN_NETWORK_TYPE_WIFI: - case CONNMAN_NETWORK_TYPE_WIMAX: break; } @@ -561,7 +552,6 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network) case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: - case CONNMAN_NETWORK_TYPE_WIMAX: break; case CONNMAN_NETWORK_TYPE_WIFI: if (g_strcmp0(network->wifi.mode, "adhoc") == 0) @@ -2100,7 +2090,6 @@ void connman_network_update(struct connman_network *network) case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: case CONNMAN_NETWORK_TYPE_WIFI: - case CONNMAN_NETWORK_TYPE_WIMAX: break; } diff --git a/src/notifier.c b/src/notifier.c index ebde689b..623b970b 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -152,7 +152,6 @@ void __connman_notifier_connect(enum connman_service_type type) return; 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: break; @@ -199,7 +198,6 @@ void __connman_notifier_disconnect(enum connman_service_type type) return; 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: break; diff --git a/src/rfkill.c b/src/rfkill.c index 8d4c90d0..e21b2a15 100644 --- a/src/rfkill.c +++ b/src/rfkill.c @@ -38,7 +38,6 @@ enum rfkill_type { RFKILL_TYPE_WLAN, RFKILL_TYPE_BLUETOOTH, RFKILL_TYPE_UWB, - RFKILL_TYPE_WIMAX, RFKILL_TYPE_WWAN, RFKILL_TYPE_GPS, RFKILL_TYPE_FM, @@ -67,8 +66,6 @@ static enum connman_service_type convert_type(uint8_t type) return CONNMAN_SERVICE_TYPE_WIFI; case RFKILL_TYPE_BLUETOOTH: return CONNMAN_SERVICE_TYPE_BLUETOOTH; - case RFKILL_TYPE_WIMAX: - return CONNMAN_SERVICE_TYPE_WIMAX; case RFKILL_TYPE_WWAN: return CONNMAN_SERVICE_TYPE_CELLULAR; } @@ -83,8 +80,6 @@ static enum rfkill_type convert_service_type(enum connman_service_type type) return RFKILL_TYPE_WLAN; case CONNMAN_SERVICE_TYPE_BLUETOOTH: return RFKILL_TYPE_BLUETOOTH; - case CONNMAN_SERVICE_TYPE_WIMAX: - return RFKILL_TYPE_WIMAX; case CONNMAN_SERVICE_TYPE_CELLULAR: return RFKILL_TYPE_WWAN; case CONNMAN_SERVICE_TYPE_GPS: @@ -165,9 +165,6 @@ static void read_uevent(struct interface_data *interface) } else if (strcmp(line + 8, "bluetooth") == 0) { interface->service_type = CONNMAN_SERVICE_TYPE_BLUETOOTH; interface->device_type = CONNMAN_DEVICE_TYPE_BLUETOOTH; - } else if (strcmp(line + 8, "wimax") == 0) { - interface->service_type = CONNMAN_SERVICE_TYPE_WIMAX; - interface->device_type = CONNMAN_DEVICE_TYPE_WIMAX; } else if (strcmp(line + 8, "gadget") == 0) { interface->service_type = CONNMAN_SERVICE_TYPE_GADGET; interface->device_type = CONNMAN_DEVICE_TYPE_GADGET; diff --git a/src/service.c b/src/service.c index 67889de3..58454537 100644 --- a/src/service.c +++ b/src/service.c @@ -166,8 +166,6 @@ const char *__connman_service_type2string(enum connman_service_type type) return "ethernet"; case CONNMAN_SERVICE_TYPE_WIFI: return "wifi"; - case CONNMAN_SERVICE_TYPE_WIMAX: - return "wimax"; case CONNMAN_SERVICE_TYPE_BLUETOOTH: return "bluetooth"; case CONNMAN_SERVICE_TYPE_CELLULAR: @@ -198,8 +196,6 @@ enum connman_service_type __connman_service_string2type(const char *str) return CONNMAN_SERVICE_TYPE_CELLULAR; if (strcmp(str, "bluetooth") == 0) return CONNMAN_SERVICE_TYPE_BLUETOOTH; - if (strcmp(str, "wimax") == 0) - return CONNMAN_SERVICE_TYPE_WIMAX; if (strcmp(str, "vpn") == 0) return CONNMAN_SERVICE_TYPE_VPN; if (strcmp(str, "gps") == 0) @@ -397,7 +393,6 @@ static int service_load(struct connman_service *service) } /* fall through */ - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: service->favorite = g_key_file_get_boolean(keyfile, @@ -569,7 +564,6 @@ static int service_save(struct connman_service *service) } /* fall through */ - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: g_key_file_set_boolean(keyfile, service->identifier, @@ -2233,7 +2227,6 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, break; case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: connman_dbus_dict_append_dict(dict, "Ethernet", append_ethernet, service); @@ -4457,7 +4450,6 @@ static gint service_compare(gconstpointer a, gconstpointer b, break; case CONNMAN_SERVICE_TYPE_WIFI: return 1; - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: return -1; @@ -5484,7 +5476,6 @@ static connman_bool_t prepare_network(struct connman_service *service) "WiFi.Passphrase", service->passphrase); break; case CONNMAN_NETWORK_TYPE_ETHERNET: - case CONNMAN_NETWORK_TYPE_WIMAX: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: @@ -5542,7 +5533,6 @@ static int service_connect(struct connman_service *service) case CONNMAN_SERVICE_TYPE_GADGET: return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: case CONNMAN_SERVICE_TYPE_VPN: @@ -6257,8 +6247,6 @@ static enum connman_service_type convert_network_type(struct connman_network *ne return CONNMAN_SERVICE_TYPE_ETHERNET; case CONNMAN_NETWORK_TYPE_WIFI: return CONNMAN_SERVICE_TYPE_WIFI; - case CONNMAN_NETWORK_TYPE_WIMAX: - return CONNMAN_SERVICE_TYPE_WIMAX; case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: return CONNMAN_SERVICE_TYPE_BLUETOOTH; @@ -6409,7 +6397,6 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: diff --git a/src/session.c b/src/session.c index 9d1d273c..69164580 100644 --- a/src/session.c +++ b/src/session.c @@ -195,8 +195,6 @@ static int bearer2service(const char *bearer, enum connman_service_type *type) *type = CONNMAN_SERVICE_TYPE_ETHERNET; else if (g_strcmp0(bearer, "wifi") == 0) *type = CONNMAN_SERVICE_TYPE_WIFI; - else if (g_strcmp0(bearer, "wimax") == 0) - *type = CONNMAN_SERVICE_TYPE_WIMAX; else if (g_strcmp0(bearer, "bluetooth") == 0) *type = CONNMAN_SERVICE_TYPE_BLUETOOTH; else if (g_strcmp0(bearer, "cellular") == 0) @@ -218,8 +216,6 @@ static char *service2bearer(enum connman_service_type type) return "ethernet"; case CONNMAN_SERVICE_TYPE_WIFI: return "wifi"; - case CONNMAN_SERVICE_TYPE_WIMAX: - return "wimax"; case CONNMAN_SERVICE_TYPE_BLUETOOTH: return "bluetooth"; case CONNMAN_SERVICE_TYPE_CELLULAR: @@ -839,7 +835,7 @@ static int service_type_weight(enum connman_service_type type) * * 1. Ethernet * 2. Bluetooth - * 3. WiFi/WiMAX + * 3. WiFi * 4. Cellular */ @@ -849,7 +845,6 @@ static int service_type_weight(enum connman_service_type type) case CONNMAN_SERVICE_TYPE_BLUETOOTH: return 3; case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: return 2; case CONNMAN_SERVICE_TYPE_CELLULAR: return 1; diff --git a/src/storage.c b/src/storage.c index 3c3ce41f..3c99795c 100644 --- a/src/storage.c +++ b/src/storage.c @@ -500,7 +500,6 @@ void __connman_storage_migrate(void) strncmp(services[i], "ethernet_", 9) != 0 && strncmp(services[i], "cellular_", 9) != 0 && strncmp(services[i], "bluetooth_", 10) != 0 && - strncmp(services[i], "wimax_", 6) != 0 && strncmp(services[i], "vpn_", 4) != 0) continue; @@ -620,20 +619,6 @@ void __connman_storage_migrate(void) g_key_file_set_boolean(keyfile, "Cellular", "Enable", val); - val = g_key_file_get_boolean(keyfile_def, "WiMAX", - "Enable", &error); - if (error != NULL) { - g_clear_error(&error); - val = g_key_file_get_boolean(keyfile_def, "device_WiMAX", "Powered", &error); - if (error != NULL) { - g_clear_error(&error); - val = FALSE; - } - } - - g_key_file_set_boolean(keyfile, "WiMAX", - "Enable", val); - if (__connman_storage_save_global(keyfile) < 0) { connman_warn("Migrating global config failed"); delete_old_config = FALSE; diff --git a/src/technology.c b/src/technology.c index b0346a82..8166d17c 100644 --- a/src/technology.c +++ b/src/technology.c @@ -308,8 +308,6 @@ static const char *get_name(enum connman_service_type type) return "Wired"; case CONNMAN_SERVICE_TYPE_WIFI: return "WiFi"; - case CONNMAN_SERVICE_TYPE_WIMAX: - return "WiMAX"; case CONNMAN_SERVICE_TYPE_BLUETOOTH: return "Bluetooth"; case CONNMAN_SERVICE_TYPE_CELLULAR: @@ -1065,7 +1063,6 @@ void __connman_technology_add_interface(enum connman_service_type type, return; 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: case CONNMAN_SERVICE_TYPE_GPS: @@ -1098,7 +1095,6 @@ void __connman_technology_remove_interface(enum connman_service_type type, return; 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: case CONNMAN_SERVICE_TYPE_GPS: diff --git a/src/wispr.c b/src/wispr.c index 6807297e..cf5f7c43 100644 --- a/src/wispr.c +++ b/src/wispr.c @@ -817,7 +817,6 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) switch (service_type) { 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: break; |