Skip to content

Commit

Permalink
w1: added w1 reset command
Browse files Browse the repository at this point in the history
Command which allows to reset the bus.

Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Paul Alfille <paul.alfille@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Evgeniy Polyakov authored and Linus Torvalds committed Jan 8, 2009
1 parent 325a06f commit f89735c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Documentation/w1/w1.netlink
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ cn_msg->len = sizeof(struct w1_netlink_msg) +
sizeof(struct w1_netlink_cmd) +
N*8;

W1 reset command.
[cn_msg]
[w1_netlink_msg type = W1_MASTER_CMD
id is equal to the bus master id to use for searching]
[w1_netlink_cmd cmd = W1_CMD_RESET]

Operation steps in w1 core when new command is received.
=======================================================

Expand Down
3 changes: 3 additions & 0 deletions drivers/w1/w1_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ static int w1_process_command_master(struct w1_master *dev, struct cn_msg *req_m
case W1_CMD_TOUCH:
err = w1_process_command_io(dev, msg, hdr, cmd);
break;
case W1_CMD_RESET:
err = w1_reset_bus(dev);
break;
default:
cmd->res = EINVAL;
cn_netlink_send(msg, 0, GFP_KERNEL);
Expand Down
1 change: 1 addition & 0 deletions drivers/w1/w1_netlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ enum w1_commands {
W1_CMD_SEARCH,
W1_CMD_ALARM_SEARCH,
W1_CMD_TOUCH,
W1_CMD_RESET,
W1_CMD_MAX,
};

Expand Down

0 comments on commit f89735c

Please sign in to comment.