From d06989ffa0140c75f664b0ec74c6b4c74fe7eaad Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 29 Jun 2009 19:49:25 +0200 Subject: [PATCH] Add types for Bluetooth and cellular services --- include/service.h | 10 ++++++---- src/service.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/service.h b/include/service.h index eddd546..49b6c01 100644 --- a/include/service.h +++ b/include/service.h @@ -33,10 +33,12 @@ extern "C" { */ enum connman_service_type { - CONNMAN_SERVICE_TYPE_UNKNOWN = 0, - CONNMAN_SERVICE_TYPE_ETHERNET = 1, - CONNMAN_SERVICE_TYPE_WIFI = 2, - CONNMAN_SERVICE_TYPE_WIMAX = 3, + CONNMAN_SERVICE_TYPE_UNKNOWN = 0, + CONNMAN_SERVICE_TYPE_ETHERNET = 1, + CONNMAN_SERVICE_TYPE_WIFI = 2, + CONNMAN_SERVICE_TYPE_WIMAX = 3, + CONNMAN_SERVICE_TYPE_BLUETOOTH = 4, + CONNMAN_SERVICE_TYPE_CELLULAR = 5, }; enum connman_service_mode { diff --git a/src/service.c b/src/service.c index 75a313f..a2895a8 100644 --- a/src/service.c +++ b/src/service.c @@ -112,6 +112,10 @@ static const char *type2string(enum connman_service_type type) return "wifi"; case CONNMAN_SERVICE_TYPE_WIMAX: return "wimax"; + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + return "bluetooth"; + case CONNMAN_SERVICE_TYPE_CELLULAR: + return "cellular"; } return NULL; @@ -761,6 +765,8 @@ int __connman_service_set_carrier(struct connman_service *service, case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_WIMAX: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: break; @@ -1271,6 +1277,8 @@ static int service_load(struct connman_service *service) break; case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_WIMAX: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: service->favorite = g_key_file_get_boolean(keyfile, service->identifier, "Favorite", NULL); break; @@ -1335,6 +1343,8 @@ update: break; case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_WIMAX: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: g_key_file_set_boolean(keyfile, service->identifier, "Favorite", service->favorite); break; -- 2.7.4