From fa442a16bf0ff6a3beb8a3694f41f49888dbc341 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Thu, 16 Jun 2011 09:44:53 +0200
Subject: [PATCH] network: Use setter/getters for
 connman_network_set/get_uint16()

---
 include/network.h | 10 ++++----
 src/network.c     | 71 +++++++++++++++++++++++--------------------------------
 2 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/include/network.h b/include/network.h
index b2d491c..c9e1767 100644
--- a/include/network.h
+++ b/include/network.h
@@ -113,6 +113,12 @@ int connman_network_set_strength(struct connman_network *network,
 connman_uint8_t connman_network_get_strength(struct connman_network *network);
 int connman_network_set_roaming(struct connman_network *network,
 						connman_bool_t roaming);
+int connman_network_set_frequency(struct connman_network *network,
+					connman_uint16_t frequency);
+connman_uint16_t connman_network_get_frequency(struct connman_network *network);
+int connman_network_set_wifi_channel(struct connman_network *network,
+					connman_uint16_t channel);
+connman_uint16_t connman_network_get_wifi_channel(struct connman_network *network);
 
 int connman_network_set_string(struct connman_network *network,
 					const char *key, const char *value);
@@ -123,10 +129,6 @@ int connman_network_set_bool(struct connman_network *network,
 connman_bool_t connman_network_get_bool(struct connman_network *network,
 							const char *key);
 
-int connman_network_set_uint16(struct connman_network *network,
-					const char *key, connman_uint16_t value);
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
-							const char *key);
 int connman_network_set_blob(struct connman_network *network,
 			const char *key, const void *data, unsigned int size);
 const void *connman_network_get_blob(struct connman_network *network,
diff --git a/src/network.c b/src/network.c
index e6c03f1..3ce505e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1315,6 +1315,36 @@ connman_uint8_t connman_network_get_strength(struct connman_network *network)
 	return network->strength;
 }
 
+int connman_network_set_frequency(struct connman_network *network,
+						connman_uint16_t frequency)
+{
+	DBG("network %p frequency %d", network, frequency);
+
+	network->frequency = frequency;
+
+	return 0;
+}
+
+connman_uint16_t connman_network_get_frequency(struct connman_network *network)
+{
+	return network->frequency;
+}
+
+int connman_network_set_wifi_channel(struct connman_network *network,
+						connman_uint16_t channel)
+{
+	DBG("network %p wifi channel %d", network, channel);
+
+	network->wifi.channel = channel;
+
+	return 0;
+}
+
+connman_uint16_t connman_network_get_wifi_channel(struct connman_network *network)
+{
+	return network->wifi.channel;
+}
+
 /**
  * connman_network_set_roaming:
  * @network: network structure
@@ -1484,47 +1514,6 @@ connman_bool_t connman_network_get_bool(struct connman_network *network,
 }
 
 /**
- * connman_network_set_uint16:
- * @network: network structure
- * @key: unique identifier
- * @value: integer value
- *
- * Set integer value for specific key
- */
-int connman_network_set_uint16(struct connman_network *network,
-				const char *key, connman_uint16_t value)
-{
-	DBG("network %p key %s value %d", network, key, value);
-
-	if (g_str_equal(key, "Frequency") == TRUE)
-		network->frequency = value;
-	else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-		network->wifi.channel = value;
-
-	return -EINVAL;
-}
-
-/**
- * connman_network_get_uint16:
- * @network: network structure
- * @key: unique identifier
- *
- * Get integer value for specific key
- */
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
-							const char *key)
-{
-	DBG("network %p key %s", network, key);
-
-	if (g_str_equal(key, "Frequency") == TRUE)
-		return network->frequency;
-	else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-		return network->wifi.channel;
-
-	return 0;
-}
-
-/**
  * connman_network_set_blob:
  * @network: network structure
  * @key: unique identifier
-- 
2.7.4