X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fw1%2Fw1.h;h=0abbcfdffed86072d9aa8a7d87c61f6e554c6301;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=54a3437a8bbe5dc9e2b3ae5445152e4bdbc459a4;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 54a3437a8..0abbcfdff 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -63,6 +63,7 @@ struct w1_slave
 	atomic_t		refcnt;
 	u8			rom[9];
 	u32			flags;
+	int			ttl;
 
 	struct w1_master	*master;
 	struct w1_family 	*family;
@@ -73,6 +74,8 @@ struct w1_slave
 	struct device_attribute	attr_name, attr_val;
 };
 
+typedef void (* w1_slave_found_callback)(unsigned long, u64);
+
 struct w1_bus_master
 {
 	unsigned long		data;
@@ -89,6 +92,8 @@ struct w1_bus_master
   	u8			(*touch_bit)(unsigned long, u8);
   
   	u8			(*reset_bus)(unsigned long);
+
+	void			(*search)(unsigned long, w1_slave_found_callback);
 };
 
 struct w1_master
@@ -99,6 +104,7 @@ struct w1_master
 	struct list_head	slist;
 	int			max_slave_count, slave_count;
 	unsigned long		attempts;
+	int			slave_ttl;
 	int			initialized;
 	u32			id;
 
@@ -125,6 +131,7 @@ struct w1_master
 
 int w1_create_master_attributes(struct w1_master *);
 void w1_destroy_master_attributes(struct w1_master *);
+void w1_search(struct w1_master *dev);
 
 #endif /* __KERNEL__ */