X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=338138f42803411ea0e884b6c454c9e8f10cf6a0;hp=686b1b105bbfb067d1a4a42f00c9e544b721cab3;hb=a12081aa986c4cc878bf0480a5d0ffb986aed0c5;hpb=ab4a8a357bae08a7bb3d835299fe53098dbdfbf7

diff --git a/device.h b/device.h
index 686b1b1..338138f 100644
--- a/device.h
+++ b/device.h
@@ -5,6 +5,7 @@
 #include <netinet/in.h>
 
 struct device;
+struct device_user;
 struct device_hotplug_ops;
 
 typedef int (*device_state_cb)(struct device *, bool up);
@@ -15,6 +16,7 @@ enum {
 	DEV_ATTR_MTU,
 	DEV_ATTR_MACADDR,
 	DEV_ATTR_TXQUEUELEN,
+	DEV_ATTR_ENABLED,
 	__DEV_ATTR_MAX,
 };
 
@@ -45,6 +47,33 @@ enum {
 	DEV_OPT_TXQUEUELEN	= (1 << 2)
 };
 
+/* events broadcasted to all users of a device */
+enum device_event {
+	DEV_EVENT_ADD,
+	DEV_EVENT_REMOVE,
+
+	DEV_EVENT_SETUP,
+	DEV_EVENT_TEARDOWN,
+	DEV_EVENT_UP,
+	DEV_EVENT_DOWN,
+
+	DEV_EVENT_LINK_UP,
+	DEV_EVENT_LINK_DOWN,
+};
+
+/*
+ * device dependency with callbacks
+ */
+struct device_user {
+	struct list_head list;
+
+	bool claimed;
+	bool hotplug;
+
+	struct device *dev;
+	void (*cb)(struct device_user *, enum device_event);
+};
+
 /* 
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -60,8 +89,11 @@ struct device {
 
 	struct blob_attr *config;
 	bool config_pending;
+	bool sys_present;
 	bool present;
 	int active;
+	bool external;
+	bool disabled;
 
 	bool current_config;
 	bool default_config;
@@ -71,6 +103,8 @@ struct device {
 
 	const struct device_hotplug_ops *hotplug_ops;
 
+	struct device_user parent;
+
 	/* settings */
 	unsigned int flags;
 
@@ -79,32 +113,8 @@ struct device {
 	uint8_t macaddr[6];
 };
 
-/* events broadcasted to all users of a device */
-enum device_event {
-	DEV_EVENT_ADD,
-	DEV_EVENT_REMOVE,
-
-	DEV_EVENT_SETUP,
-	DEV_EVENT_TEARDOWN,
-	DEV_EVENT_UP,
-	DEV_EVENT_DOWN,
-
-	DEV_EVENT_LINK_UP,
-	DEV_EVENT_LINK_DOWN,
-};
-
-/*
- * device dependency with callbacks
- */
-struct device_user {
-	struct list_head list;
-
-	bool claimed;
-	struct device *dev;
-	void (*cb)(struct device_user *, enum device_event);
-};
-
 struct device_hotplug_ops {
+	int (*prepare)(struct device *dev);
 	int (*add)(struct device *main, struct device *member);
 	int (*del)(struct device *main, struct device *member);
 };
@@ -113,33 +123,36 @@ extern const struct config_param_list device_attr_list;
 extern const struct device_type simple_device_type;
 extern const struct device_type bridge_device_type;
 
+void device_lock(void);
+void device_unlock(void);
+
 struct device *device_create(const char *name, const struct device_type *type,
 			     struct blob_attr *config);
 void device_init_settings(struct device *dev, struct blob_attr **tb);
 void device_init_pending(void);
 
+enum dev_change_type
+device_set_config(struct device *dev, const struct device_type *type,
+		  struct blob_attr *attr);
+
 void device_reset_config(void);
 void device_reset_old(void);
 
 void device_init_virtual(struct device *dev, const struct device_type *type, const char *name);
 int device_init(struct device *iface, const struct device_type *type, const char *ifname);
 void device_cleanup(struct device *iface);
-struct device *device_get(const char *name, bool create);
+struct device *device_get(const char *name, int create);
 void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
 
 void device_set_present(struct device *dev, bool state);
+void device_set_disabled(struct device *dev, bool value);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
 void device_dump_status(struct blob_buf *b, struct device *dev);
 
-static inline void
-device_free(struct device *dev)
-{
-	dev->type->free(dev);
-}
-
+void device_free(struct device *dev);
 void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);