aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1.h
diff options
context:
space:
mode:
authorDavid Fries <David@Fries.net>2014-01-15 22:29:16 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-07 15:40:17 -0800
commit3c6955e5aa2a7ebf18a44486be6a7f047811650b (patch)
treeb9365215e9e5421e24e111a6b3e792af1ade73d9 /drivers/w1/w1.h
parentw1: increase w1_max_slave_count, allow write access (diff)
downloadlinux-dev-3c6955e5aa2a7ebf18a44486be6a7f047811650b.tar.xz
linux-dev-3c6955e5aa2a7ebf18a44486be6a7f047811650b.zip
w1: continue slave search where previous left off
Search will detect at most max_slave_count devices per run, if there are more pick up the next search where the previous left off. Signed-off-by: David Fries <David@Fries.net> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/w1.h')
-rw-r--r--drivers/w1/w1.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index bd10b3c2a406..80fbdf908919 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -150,6 +150,7 @@ struct w1_bus_master
/** Really nice hardware can handles the different types of ROM search
* w1_master* is passed to the slave found callback.
+ * u8 is search_type, W1_SEARCH or W1_ALARM_SEARCH
*/
void (*search)(void *, struct w1_master *,
u8, w1_slave_found_callback);
@@ -177,6 +178,8 @@ struct w1_master
int initialized;
u32 id;
int search_count;
+ /* id to start searching on, to continue a search or 0 to restart */
+ u64 search_id;
atomic_t refcnt;