From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 28 Dec 2008 06:32:21 +0000 (+0100)
Subject: Fix list of device types
X-Git-Tag: 0.6~101
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=94b1272c0d8f0c33d56765a0c51a0c49802853bd;p=connman

Fix list of device types
---

diff --git a/include/device.h b/include/device.h
index 6d172e8..7d26cc9 100644
--- a/include/device.h
+++ b/include/device.h
@@ -27,7 +27,6 @@ extern "C" {
 #endif
 
 #include <connman/network.h>
-#include <connman/element.h>
 
 /**
  * SECTION:device
@@ -36,15 +35,13 @@ extern "C" {
  */
 
 enum connman_device_type {
-	CONNMAN_DEVICE_TYPE_UNKNOWN   = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN,
-	CONNMAN_DEVICE_TYPE_FAKE      = CONNMAN_ELEMENT_SUBTYPE_FAKE,
-	CONNMAN_DEVICE_TYPE_ETHERNET  = CONNMAN_ELEMENT_SUBTYPE_ETHERNET,
-	CONNMAN_DEVICE_TYPE_WIFI      = CONNMAN_ELEMENT_SUBTYPE_WIFI,
-	CONNMAN_DEVICE_TYPE_WIMAX     = CONNMAN_ELEMENT_SUBTYPE_WIMAX,
-	CONNMAN_DEVICE_TYPE_MODEM     = CONNMAN_ELEMENT_SUBTYPE_MODEM,
-	CONNMAN_DEVICE_TYPE_BLUETOOTH = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH,
+	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_HSO       = 11,
 	CONNMAN_DEVICE_TYPE_VENDOR    = 42,
-	CONNMAN_DEVICE_TYPE_HSO,
 };
 
 enum connman_device_mode {
diff --git a/src/device.c b/src/device.c
index ef89933..ec453e9 100644
--- a/src/device.c
+++ b/src/device.c
@@ -72,8 +72,6 @@ static const char *type2string(enum connman_device_type type)
 		return "wifi";
 	case CONNMAN_DEVICE_TYPE_WIMAX:
 		return "wimax";
-	case CONNMAN_DEVICE_TYPE_MODEM:
-		return "modem";
 	case CONNMAN_DEVICE_TYPE_BLUETOOTH:
 		return "bluetooth";
 	case CONNMAN_DEVICE_TYPE_HSO: