diff options
author | David Fries <David@Fries.net> | 2014-01-15 23:29:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-07 18:40:17 -0500 |
commit | 3c6955e5aa2a7ebf18a44486be6a7f047811650b (patch) | |
tree | b9365215e9e5421e24e111a6b3e792af1ade73d9 /drivers/w1/w1.h | |
parent | a16130569af7e92b0a68a8c96170d84756f91c47 (diff) |
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.h | 3 |
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 | |||
150 | 150 | ||
151 | /** Really nice hardware can handles the different types of ROM search | 151 | /** Really nice hardware can handles the different types of ROM search |
152 | * w1_master* is passed to the slave found callback. | 152 | * w1_master* is passed to the slave found callback. |
153 | * u8 is search_type, W1_SEARCH or W1_ALARM_SEARCH | ||
153 | */ | 154 | */ |
154 | void (*search)(void *, struct w1_master *, | 155 | void (*search)(void *, struct w1_master *, |
155 | u8, w1_slave_found_callback); | 156 | u8, w1_slave_found_callback); |
@@ -177,6 +178,8 @@ struct w1_master | |||
177 | int initialized; | 178 | int initialized; |
178 | u32 id; | 179 | u32 id; |
179 | int search_count; | 180 | int search_count; |
181 | /* id to start searching on, to continue a search or 0 to restart */ | ||
182 | u64 search_id; | ||
180 | 183 | ||
181 | atomic_t refcnt; | 184 | atomic_t refcnt; |
182 | 185 | ||