diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 18:06:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:06:06 -0400 |
| commit | aef7b83c92dd0b7e994805440655d1d64147287b (patch) | |
| tree | 981f373358c1988e061625e8f272013065cb086f /drivers/w1/w1_io.h | |
| parent | b1fc5505e0dbcc3fd7c75bfe6bee39ec50080963 (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/w1/w1_io.h')
| -rw-r--r-- | drivers/w1/w1_io.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/w1/w1_io.h b/drivers/w1/w1_io.h index 6c573005a71..af5829778aa 100644 --- a/drivers/w1/w1_io.h +++ b/drivers/w1/w1_io.h @@ -1,8 +1,8 @@ /* - * w1_io.h + * w1_io.h * * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> - * + * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,13 +26,12 @@ void w1_delay(unsigned long); u8 w1_touch_bit(struct w1_master *, int); -void w1_write_bit(struct w1_master *, int); +u8 w1_triplet(struct w1_master *dev, int bdir); void w1_write_8(struct w1_master *, u8); -u8 w1_read_bit(struct w1_master *); u8 w1_read_8(struct w1_master *); int w1_reset_bus(struct w1_master *); u8 w1_calc_crc8(u8 *, int); -void w1_write_block(struct w1_master *, u8 *, int); +void w1_write_block(struct w1_master *, const u8 *, int); u8 w1_read_block(struct w1_master *, u8 *, int); void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb); |