projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[powerpc.git]
/
drivers
/
w1
/
w1_family.h
diff --git
a/drivers/w1/w1_family.h
b/drivers/w1/w1_family.h
index
b26da01
..
1e2ac40
100644
(file)
--- a/
drivers/w1/w1_family.h
+++ b/
drivers/w1/w1_family.h
@@
-31,14
+31,17
@@
#define W1_FAMILY_SMEM_81 0x81
#define W1_THERM_DS18S20 0x10
#define W1_THERM_DS1822 0x22
#define W1_FAMILY_SMEM_81 0x81
#define W1_THERM_DS18S20 0x10
#define W1_THERM_DS1822 0x22
+#define W1_EEPROM_DS2433 0x23
#define W1_THERM_DS18B20 0x28
#define MAXNAMELEN 32
#define W1_THERM_DS18B20 0x28
#define MAXNAMELEN 32
+struct w1_slave;
+
struct w1_family_ops
{
struct w1_family_ops
{
-
ssize_t (* rname)(struct device *, struct device_attribute *, char
*);
-
ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t
);
+
int (* add_slave)(struct w1_slave
*);
+
void (* remove_slave)(struct w1_slave *
);
};
struct w1_family
};
struct w1_family
@@
-54,12
+57,11
@@
struct w1_family
extern spinlock_t w1_flock;
extern spinlock_t w1_flock;
-void w1_family_get(struct w1_family *);
void w1_family_put(struct w1_family *);
void __w1_family_get(struct w1_family *);
void w1_family_put(struct w1_family *);
void __w1_family_get(struct w1_family *);
-void __w1_family_put(struct w1_family *);
struct w1_family * w1_family_registered(u8);
void w1_unregister_family(struct w1_family *);
int w1_register_family(struct w1_family *);
struct w1_family * w1_family_registered(u8);
void w1_unregister_family(struct w1_family *);
int w1_register_family(struct w1_family *);
+void w1_reconnect_slaves(struct w1_family *f);
#endif /* __W1_FAMILY_H */
#endif /* __W1_FAMILY_H */