projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
w1
/
w1_netlink.h
diff --git
a/drivers/w1/w1_netlink.h
b/drivers/w1/w1_netlink.h
index 56122b9e9294b865f30da01730c16ac0a4728dc3..27e950f935b18040437ae3e64019dde69fc4e273 100644
(file)
--- a/
drivers/w1/w1_netlink.h
+++ b/
drivers/w1/w1_netlink.h
@@
-34,12
+34,13
@@
enum w1_netlink_message_types {
W1_MASTER_REMOVE,
W1_MASTER_CMD,
W1_SLAVE_CMD,
W1_MASTER_REMOVE,
W1_MASTER_CMD,
W1_SLAVE_CMD,
+ W1_LIST_MASTERS,
};
struct w1_netlink_msg
{
__u8 type;
};
struct w1_netlink_msg
{
__u8 type;
- __u8
reserved
;
+ __u8
status
;
__u16 len;
union {
__u8 id[8];
__u16 len;
union {
__u8 id[8];
@@
-51,10
+52,15
@@
struct w1_netlink_msg
__u8 data[0];
};
__u8 data[0];
};
-#define W1_CMD_READ 0x0
-#define W1_CMD_WRITE 0x1
-#define W1_CMD_SEARCH 0x2
-#define W1_CMD_ALARM_SEARCH 0x3
+enum w1_commands {
+ W1_CMD_READ = 0,
+ W1_CMD_WRITE,
+ W1_CMD_SEARCH,
+ W1_CMD_ALARM_SEARCH,
+ W1_CMD_TOUCH,
+ W1_CMD_RESET,
+ W1_CMD_MAX,
+};
struct w1_netlink_cmd
{
struct w1_netlink_cmd
{