X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=include%2Fdevice.h;h=c9f6d767a76f0602c5be46c7f6464251588cab3f;hb=4167a753ea847d3733a736fc3f5c029662f3131a;hp=172d959000ae4c2885c91e379b94bbaf3142c39e;hpb=7e090d498e11ae435d973bea44e393a6e42beb3d;p=connman

diff --git a/include/device.h b/include/device.h
index 172d959..c9f6d76 100644
--- a/include/device.h
+++ b/include/device.h
@@ -22,13 +22,13 @@
 #ifndef __CONNMAN_DEVICE_H
 #define __CONNMAN_DEVICE_H
 
+#include <connman/types.h>
+#include <connman/network.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <connman/network.h>
-#include <connman/element.h>
-
 /**
  * SECTION:device
  * @title: Device premitives
@@ -36,15 +36,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 {
@@ -56,8 +54,9 @@ enum connman_device_mode {
 enum connman_device_policy {
 	CONNMAN_DEVICE_POLICY_UNKNOWN = 0,
 	CONNMAN_DEVICE_POLICY_IGNORE  = 1,
-	CONNMAN_DEVICE_POLICY_AUTO    = 2,
-	CONNMAN_DEVICE_POLICY_OFF     = 3,
+	CONNMAN_DEVICE_POLICY_OFF     = 2,
+	CONNMAN_DEVICE_POLICY_AUTO    = 3,
+	CONNMAN_DEVICE_POLICY_MANUAL  = 4,
 };
 
 struct connman_device;
@@ -77,15 +76,17 @@ extern void connman_device_set_interface(struct connman_device *device,
 							const char *interface);
 extern const char *connman_device_get_interface(struct connman_device *device);
 
+extern void connman_device_set_policy(struct connman_device *device,
+					enum connman_device_policy policy);
 extern void connman_device_set_mode(struct connman_device *device,
 						enum connman_device_mode mode);
 
 extern int connman_device_set_powered(struct connman_device *device,
-							gboolean powered);
+						connman_bool_t powered);
 extern int connman_device_set_carrier(struct connman_device *device,
-							gboolean carrier);
+						connman_bool_t carrier);
 extern int connman_device_set_scanning(struct connman_device *device,
-							gboolean scanning);
+						connman_bool_t scanning);
 
 extern int connman_device_add_network(struct connman_device *device,
 					struct connman_network *network);