aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/w1/w1.h')
-rw-r--r--drivers/w1/w1.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 34ee01e008ad..00b84ab22808 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -142,6 +142,12 @@ struct w1_bus_master
142 */ 142 */
143 u8 (*reset_bus)(void *); 143 u8 (*reset_bus)(void *);
144 144
145 /**
146 * Put out a strong pull-up pulse of the specified duration.
147 * @return -1=Error, 0=completed
148 */
149 u8 (*set_pullup)(void *, int);
150
145 /** Really nice hardware can handles the different types of ROM search 151 /** Really nice hardware can handles the different types of ROM search
146 * w1_master* is passed to the slave found callback. 152 * w1_master* is passed to the slave found callback.
147 */ 153 */
@@ -167,6 +173,11 @@ struct w1_master
167 void *priv; 173 void *priv;
168 int priv_size; 174 int priv_size;
169 175
176 /** 5V strong pullup enabled flag, 1 enabled, zero disabled. */
177 int enable_pullup;
178 /** 5V strong pullup duration in milliseconds, zero disabled. */
179 int pullup_duration;
180
170 struct task_struct *thread; 181 struct task_struct *thread;
171 struct mutex mutex; 182 struct mutex mutex;
172 183
@@ -201,6 +212,7 @@ u8 w1_calc_crc8(u8 *, int);
201void w1_write_block(struct w1_master *, const u8 *, int); 212void w1_write_block(struct w1_master *, const u8 *, int);
202u8 w1_read_block(struct w1_master *, u8 *, int); 213u8 w1_read_block(struct w1_master *, u8 *, int);
203int w1_reset_select_slave(struct w1_slave *sl); 214int w1_reset_select_slave(struct w1_slave *sl);
215void w1_next_pullup(struct w1_master *, int);
204 216
205static inline struct w1_slave* dev_to_w1_slave(struct device *dev) 217static inline struct w1_slave* dev_to_w1_slave(struct device *dev)
206{ 218{