summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Xu <martin.xu@intel.com>2009-11-23 16:11:43 +0800
committerMarcel Holtmann <marcel@holtmann.org>2009-11-23 09:17:25 +0100
commit81f3ed3963cc2edab503afaca4f611f370125181 (patch)
tree6e6cb99e143bb0743b3815b6f4212c61f5c84910
parent4384b4c1fc51071f3a4b6c653f05f4e3357d0c2c (diff)
downloadconnman-81f3ed3963cc2edab503afaca4f611f370125181.tar.gz
connman-81f3ed3963cc2edab503afaca4f611f370125181.tar.bz2
connman-81f3ed3963cc2edab503afaca4f611f370125181.zip
Add network type CONNMAN_NETWORK_TYPE_CELLULAR
-rw-r--r--include/network.h1
-rw-r--r--src/network.c5
-rw-r--r--src/service.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/include/network.h b/include/network.h
index 3558d5a3..ab3784fb 100644
--- a/include/network.h
+++ b/include/network.h
@@ -41,6 +41,7 @@ enum connman_network_type {
CONNMAN_NETWORK_TYPE_WIMAX = 2,
CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN = 8,
CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9,
+ CONNMAN_NETWORK_TYPE_CELLULAR = 10,
CONNMAN_NETWORK_TYPE_MBM = 22,
CONNMAN_NETWORK_TYPE_HSO = 23,
CONNMAN_NETWORK_TYPE_VENDOR = 10000,
diff --git a/src/network.c b/src/network.c
index 7e842f8f..ea347be6 100644
--- a/src/network.c
+++ b/src/network.c
@@ -82,6 +82,7 @@ static const char *type2string(enum connman_network_type type)
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
return "bluetooth";
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
return "cellular";
@@ -555,6 +556,7 @@ void connman_network_set_group(struct connman_network *network,
return;
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
case CONNMAN_NETWORK_TYPE_WIFI:
@@ -609,6 +611,7 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network)
case CONNMAN_NETWORK_TYPE_VENDOR:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
case CONNMAN_NETWORK_TYPE_WIMAX:
@@ -1306,6 +1309,7 @@ static int network_probe(struct connman_element *element)
break;
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
case CONNMAN_NETWORK_TYPE_WIFI:
@@ -1336,6 +1340,7 @@ static void network_remove(struct connman_element *element)
break;
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
case CONNMAN_NETWORK_TYPE_WIFI:
diff --git a/src/service.c b/src/service.c
index b2dc68df..59352b1b 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1536,6 +1536,7 @@ static connman_bool_t prepare_network(struct connman_service *service)
case CONNMAN_NETWORK_TYPE_WIMAX:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
break;
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
@@ -2151,6 +2152,7 @@ static enum connman_service_type convert_network_type(struct connman_network *ne
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
+ case CONNMAN_NETWORK_TYPE_CELLULAR:
case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
return CONNMAN_SERVICE_TYPE_CELLULAR;