From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 4 Nov 2010 21:47:30 +0000 (+0100)
Subject: Remove unneeded enum connman_device_mode
X-Git-Tag: 2.0_alpha~2195
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f4949b4f2b2319497cdf445985cb1d870394fb9;p=framework%2Fconnectivity%2Fconnman.git

Remove unneeded enum connman_device_mode
---

diff --git a/include/device.h b/include/device.h
index f80969b..4fdc7ed 100644
--- a/include/device.h
+++ b/include/device.h
@@ -46,12 +46,6 @@ enum connman_device_type {
 	CONNMAN_DEVICE_TYPE_VENDOR    = 10000,
 };
 
-enum connman_device_mode {
-	CONNMAN_DEVICE_MODE_UNKNOWN          = 0,
-	CONNMAN_DEVICE_MODE_NETWORK_SINGLE   = 1,
-	CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE = 2,
-};
-
 #define CONNMAN_DEVICE_PRIORITY_LOW      -100
 #define CONNMAN_DEVICE_PRIORITY_DEFAULT     0
 #define CONNMAN_DEVICE_PRIORITY_HIGH      100
@@ -76,10 +70,6 @@ void connman_device_set_ident(struct connman_device *device,
 						const char *ident);
 const char *connman_device_get_ident(struct connman_device *device);
 
-void connman_device_set_mode(struct connman_device *device,
-					enum connman_device_mode mode);
-enum connman_device_mode connman_device_get_mode(struct connman_device *device);
-
 int connman_device_set_powered(struct connman_device *device,
 						connman_bool_t powered);
 int connman_device_set_scanning(struct connman_device *device,
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 5b818f6..37f0a6c 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -639,8 +639,6 @@ static void adapter_properties_reply(DBusPendingCall *call, void *user_data)
 
 	connman_device_set_ident(device, ident);
 
-	connman_device_set_mode(device, CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE);
-
 	connman_device_set_string(device, "Path", path);
 
 	if (connman_device_register(device) < 0) {
diff --git a/plugins/ofono.c b/plugins/ofono.c
index 50ed370..a58f2ce 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -872,8 +872,6 @@ static void add_device(const char *path, const char *imsi)
 
 	connman_device_set_ident(device, imsi);
 
-	connman_device_set_mode(device, CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE);
-
 	connman_device_set_string(device, "Path", path);
 
 	connman_device_set_data(device, modem);
diff --git a/src/device.c b/src/device.c
index f79e991..96dca02 100644
--- a/src/device.c
+++ b/src/device.c
@@ -35,7 +35,6 @@ static DBusConnection *connection = NULL;
 struct connman_device {
 	struct connman_element element;
 	enum connman_device_type type;
-	enum connman_device_mode mode;
 	connman_bool_t offlinemode;
 	connman_bool_t blocked;
 	connman_bool_t powered;
@@ -350,19 +349,12 @@ static DBusMessage *get_properties(DBusConnection *conn,
 		connman_dbus_dict_append_basic(&dict, "Scanning",
 					DBUS_TYPE_BOOLEAN, &device->scanning);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-		break;
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		if (device->scan_interval > 0)
-			connman_dbus_dict_append_basic(&dict, "ScanInterval",
+	if (device->scan_interval > 0)
+		connman_dbus_dict_append_basic(&dict, "ScanInterval",
 				DBUS_TYPE_UINT16, &device->scan_interval);
 
-		connman_dbus_dict_append_array(&dict, "Networks",
+	connman_dbus_dict_append_array(&dict, "Networks",
 				DBUS_TYPE_OBJECT_PATH, append_networks, device);
-		break;
-	}
 
 	connman_dbus_dict_close(&array, &dict);
 
@@ -444,13 +436,6 @@ static DBusMessage *set_property(DBusConnection *conn,
 	} else if (g_str_equal(name, "ScanInterval") == TRUE) {
 		connman_uint16_t interval;
 
-		switch (device->mode) {
-		case CONNMAN_DEVICE_MODE_UNKNOWN:
-		case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-		case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-			break;
-		}
-
 		if (type != DBUS_TYPE_UINT16)
 			return __connman_error_invalid_arguments(msg);
 
@@ -477,14 +462,6 @@ static DBusMessage *propose_scan(DBusConnection *conn,
 
 	DBG("conn %p", conn);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-		return __connman_error_not_supported(msg);
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		break;
-	}
-
 	err = __connman_device_scan(device);
 	if (err < 0)
 		return __connman_error_failed(msg, -err);
@@ -552,13 +529,6 @@ static int setup_device(struct connman_device *device)
 
 	__connman_technology_add_device(device);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		break;
-	}
-
 	if (device->offlinemode == FALSE &&
 				device->powered_persistent == TRUE)
 		__connman_device_enable(device);
@@ -601,13 +571,6 @@ static void remove_device(struct connman_device *device)
 	if (err < 0 && err == -EINPROGRESS)
 		__connman_technology_disable_device(device);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		break;
-	}
-
 	__connman_technology_remove_device(device);
 
 	unregister_interface(&device->element);
@@ -771,7 +734,6 @@ struct connman_device *connman_device_create(const char *node,
 
 	device->type = type;
 	device->name = g_strdup(type2description(device->type));
-	device->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
 
 	device->powered_persistent = TRUE;
 
@@ -959,30 +921,6 @@ const char *connman_device_get_ident(struct connman_device *device)
 }
 
 /**
- * connman_device_set_mode:
- * @device: device structure
- * @mode: network mode
- *
- * Change network mode of device
- */
-void connman_device_set_mode(struct connman_device *device,
-						enum connman_device_mode mode)
-{
-	device->mode = mode;
-}
-
-/**
- * connman_device_get_mode:
- * @device: device structure
- *
- * Get network mode of device
- */
-enum connman_device_mode connman_device_get_mode(struct connman_device *device)
-{
-	return device->mode;
-}
-
-/**
  * connman_device_set_powered:
  * @device: device structure
  * @powered: powered state
@@ -1252,14 +1190,6 @@ int connman_device_set_disconnected(struct connman_device *device,
 {
 	DBG("device %p disconnected %d", device, disconnected);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-		return -EINVAL;
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		break;
-	}
-
 	if (device->disconnected == disconnected)
 		return -EALREADY;
 
@@ -1406,14 +1336,6 @@ int connman_device_add_network(struct connman_device *device,
 	if (identifier == NULL)
 		return -EINVAL;
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-		return -EINVAL;
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		break;
-	}
-
 	__connman_network_set_device(network, device);
 
 	err = connman_element_register((struct connman_element *) network,
@@ -1649,18 +1571,11 @@ static int device_load(struct connman_device *device)
 		device->powered_persistent = powered;
 	g_clear_error(&error);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-		break;
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		val = g_key_file_get_integer(keyfile, identifier,
+	val = g_key_file_get_integer(keyfile, identifier,
 						"ScanInterval", &error);
-		if (error == NULL)
-			device->scan_interval = val;
-		g_clear_error(&error);
-		break;
-	}
+	if (error == NULL)
+		device->scan_interval = val;
+	g_clear_error(&error);
 
 done:
 	g_free(identifier);
@@ -1689,15 +1604,8 @@ static int device_save(struct connman_device *device)
 	g_key_file_set_boolean(keyfile, identifier,
 					"Powered", device->powered_persistent);
 
-	switch (device->mode) {
-	case CONNMAN_DEVICE_MODE_UNKNOWN:
-		break;
-	case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
-	case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
-		g_key_file_set_integer(keyfile, identifier,
+	g_key_file_set_integer(keyfile, identifier,
 					"ScanInterval", device->scan_interval);
-		break;
-	}
 
 done:
 	g_free(identifier);
diff --git a/src/inet.c b/src/inet.c
index 9f183ea..fde9592 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -444,7 +444,6 @@ done:
 
 struct connman_device *connman_inet_create_device(int index)
 {
-	enum connman_device_mode mode = CONNMAN_DEVICE_MODE_UNKNOWN;
 	enum connman_device_type type;
 	struct connman_device *device;
 	char *devname, *ident = NULL;
@@ -491,28 +490,21 @@ struct connman_device *connman_inet_create_device(int index)
 	case CONNMAN_DEVICE_TYPE_UNKNOWN:
 	case CONNMAN_DEVICE_TYPE_VENDOR:
 	case CONNMAN_DEVICE_TYPE_GPS:
-		mode = CONNMAN_DEVICE_MODE_UNKNOWN;
 		break;
 	case CONNMAN_DEVICE_TYPE_ETHERNET:
-		mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
 		ident = index2ident(index, NULL);
 		break;
 	case CONNMAN_DEVICE_TYPE_WIFI:
 	case CONNMAN_DEVICE_TYPE_WIMAX:
-		mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
 		ident = index2ident(index, NULL);
 		break;
 	case CONNMAN_DEVICE_TYPE_BLUETOOTH:
-		mode = CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE;
 		break;
 	case CONNMAN_DEVICE_TYPE_CELLULAR:
-		mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
 		ident = index2ident(index, NULL);
 		break;
 	}
 
-	connman_device_set_mode(device, mode);
-
 	connman_device_set_index(device, index);
 	connman_device_set_interface(device, devname, node);