X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fdevice.h;h=f787cf484b3713889286b559bc9a7ddb547af1ec;hb=3dabff35b045357620740e0497b7c0445174057c;hp=3ef80425fa89105142974a59c5f9357be82cdccf;hpb=ed1eda8841c98f34cbbf89e2dd85db2441e7dfe6;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/include/device.h b/include/device.h
index 3ef8042..f787cf4 100644
--- a/include/device.h
+++ b/include/device.h
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -41,59 +41,53 @@ enum connman_device_type {
 	CONNMAN_DEVICE_TYPE_WIFI      = 2,
 	CONNMAN_DEVICE_TYPE_WIMAX     = 3,
 	CONNMAN_DEVICE_TYPE_BLUETOOTH = 4,
-	CONNMAN_DEVICE_TYPE_GPS       = 5,
-	CONNMAN_DEVICE_TYPE_MBM       = 14,
-	CONNMAN_DEVICE_TYPE_HSO       = 15,
-	CONNMAN_DEVICE_TYPE_NOZOMI    = 16,
-	CONNMAN_DEVICE_TYPE_HUAWEI    = 17,
-	CONNMAN_DEVICE_TYPE_NOVATEL   = 18,
+	CONNMAN_DEVICE_TYPE_CELLULAR  = 5,
+	CONNMAN_DEVICE_TYPE_GPS       = 6,
+	CONNMAN_DEVICE_TYPE_GADGET    = 7,
 	CONNMAN_DEVICE_TYPE_VENDOR    = 10000,
 };
 
-enum connman_device_mode {
-	CONNMAN_DEVICE_MODE_UNKNOWN          = 0,
-	CONNMAN_DEVICE_MODE_NETWORK_SINGLE   = 1,
-	CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE = 2,
-	CONNMAN_DEVICE_MODE_TRANSPORT_IP     = 3,
-};
+#define CONNMAN_DEVICE_PRIORITY_LOW      -100
+#define CONNMAN_DEVICE_PRIORITY_DEFAULT     0
+#define CONNMAN_DEVICE_PRIORITY_HIGH      100
 
 struct connman_device;
 
 struct connman_device *connman_device_create(const char *node,
 						enum connman_device_type type);
-struct connman_device *connman_device_ref(struct connman_device *device);
-void connman_device_unref(struct connman_device *device);
+
+#define connman_device_ref(device) \
+	connman_device_ref_debug(device, __FILE__, __LINE__, __func__)
+
+#define connman_device_unref(device) \
+	connman_device_unref_debug(device, __FILE__, __LINE__, __func__)
+
+struct connman_device *
+connman_device_ref_debug(struct connman_device *device,
+			const char *file, int line, const char *caller);
+void connman_device_unref_debug(struct connman_device *device,
+			const char *file, int line, const char *caller);
 
 enum connman_device_type connman_device_get_type(struct connman_device *device);
-const char *connman_device_get_name(struct connman_device *device);
-const char *connman_device_get_path(struct connman_device *device);
 void connman_device_set_index(struct connman_device *device, int index);
 int connman_device_get_index(struct connman_device *device);
 void connman_device_set_interface(struct connman_device *device,
-							const char *interface);
-const char *connman_device_get_interface(struct connman_device *device);
+						const char *interface);
 
 void connman_device_set_ident(struct connman_device *device,
 						const char *ident);
-
-void connman_device_set_mode(struct connman_device *device,
-					enum connman_device_mode mode);
-enum connman_device_mode connman_device_get_mode(struct connman_device *device);
-void connman_device_set_secondary(struct connman_device *device,
-						connman_bool_t secondary);
-connman_bool_t connman_device_get_secondary(struct connman_device *device);
+const char *connman_device_get_ident(struct connman_device *device);
 
 int connman_device_set_powered(struct connman_device *device,
 						connman_bool_t powered);
-int connman_device_set_carrier(struct connman_device *device,
-						connman_bool_t carrier);
 int connman_device_set_scanning(struct connman_device *device,
 						connman_bool_t scanning);
+connman_bool_t connman_device_get_scanning(struct connman_device *device);
+void connman_device_reset_scanning(struct connman_device *device);
+
 int connman_device_set_disconnected(struct connman_device *device,
 						connman_bool_t disconnected);
 connman_bool_t connman_device_get_disconnected(struct connman_device *device);
-int connman_device_set_connected(struct connman_device *device,
-						connman_bool_t connected);
 
 int connman_device_set_string(struct connman_device *device,
 					const char *key, const char *value);
@@ -105,7 +99,8 @@ int connman_device_add_network(struct connman_device *device,
 struct connman_network *connman_device_get_network(struct connman_device *device,
 							const char *identifier);
 int connman_device_remove_network(struct connman_device *device,
-							const char *identifier);
+					struct connman_network *network);
+void connman_device_remove_all_networks(struct connman_device *device);
 
 int connman_device_register(struct connman_device *device);
 void connman_device_unregister(struct connman_device *device);
@@ -121,11 +116,12 @@ struct connman_device_driver {
 	void (*remove) (struct connman_device *device);
 	int (*enable) (struct connman_device *device);
 	int (*disable) (struct connman_device *device);
-	int (*connect) (struct connman_device *device);
-	int (*disconnect) (struct connman_device *device);
 	int (*scan) (struct connman_device *device);
-	int (*join) (struct connman_device *device,
-					struct connman_network *network);
+	int (*scan_fast) (struct connman_device *device);
+	int (*scan_hidden)(struct connman_device *device,
+			const char *ssid, unsigned int ssid_len,
+			const char *identity, const char* passphrase,
+			void *user_data);
 };
 
 int connman_device_driver_register(struct connman_device_driver *driver);