summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Polyakov <zbr@ioremap.net>2009-01-07 18:09:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-08 08:31:14 -0800
commitf89735c4e281e8642907b38640c076ae5048f3a6 (patch)
tree24539b43a7f74d083d747edf5b4eec8e533baebe
parent325a06fb13614fd4e5ea36996c0ce043752a93a0 (diff)
downloadop-kernel-dev-f89735c4e281e8642907b38640c076ae5048f3a6.zip
op-kernel-dev-f89735c4e281e8642907b38640c076ae5048f3a6.tar.gz
w1: added w1 reset command
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>
-rw-r--r--Documentation/w1/w1.netlink6
-rw-r--r--drivers/w1/w1_netlink.c3
-rw-r--r--drivers/w1/w1_netlink.h1
3 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/w1/w1.netlink b/Documentation/w1/w1.netlink
index d596d40..2756681 100644
--- a/Documentation/w1/w1.netlink
+++ b/Documentation/w1/w1.netlink
@@ -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.
=======================================================
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index a94336b..f978c75 100644
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -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);
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index 01d86a7..68a4ff4 100644
--- a/drivers/w1/w1_netlink.h
+++ b/drivers/w1/w1_netlink.h
@@ -58,6 +58,7 @@ enum w1_commands {
W1_CMD_SEARCH,
W1_CMD_ALARM_SEARCH,
W1_CMD_TOUCH,
+ W1_CMD_RESET,
W1_CMD_MAX,
};
OpenPOWER on IntegriCloud