From johnpol@2ka.mipt.ru Mon Apr 3 01:01:38 2006 Date: Mon, 3 Apr 2006 12:01:12 +0400 From: Evgeniy Polyakov To: GregKH Cc: Evgeniy Polyakov Subject: [1/2] w1: Make w1 connector notifications depend on connector. Message-ID: <20060403080112.GA14969@2ka.mipt.ru> Content-Disposition: inline Make w1 connector notifications depend on connector. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman --- drivers/w1/Kconfig | 14 +++++++++++++- drivers/w1/Makefile | 4 ---- drivers/w1/w1_netlink.c | 4 +--- 3 files changed, 14 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/drivers/w1/Kconfig +++ gregkh-2.6/drivers/w1/Kconfig @@ -3,7 +3,7 @@ menu "Dallas's 1-wire bus" config W1 tristate "Dallas's 1-wire support" ---help--- - Dallas's 1-wire bus is useful to connect slow 1-pin devices + Dallas' 1-wire bus is useful to connect slow 1-pin devices such as iButtons and thermal sensors. If you want W1 support, you should say Y here. @@ -11,6 +11,18 @@ config W1 This W1 support can also be built as a module. If so, the module will be called wire.ko. +config W1_CON + depends on CONNECTOR + bool "Userspace communication over connector" + default y + --- help --- + This allows to communicate with userspace using connector [Documentation/connector]. + There are three types of messages between w1 core and userspace: + 1. Events. They are generated each time new master or slave device found + either due to automatic or requested search. + 2. Userspace commands. Includes read/write and search/alarm search comamnds. + 3. Replies to userspace commands. + source drivers/w1/masters/Kconfig source drivers/w1/slaves/Kconfig --- gregkh-2.6.orig/drivers/w1/Makefile +++ gregkh-2.6/drivers/w1/Makefile @@ -2,10 +2,6 @@ # Makefile for the Dallas's 1-wire bus. # -ifeq ($(CONFIG_CONNECTOR), n) -EXTRA_CFLAGS += -DNETLINK_DISABLED -endif - ifeq ($(CONFIG_W1_DS2433_CRC), y) EXTRA_CFLAGS += -DCONFIG_W1_F23_CRC endif --- gregkh-2.6.orig/drivers/w1/w1_netlink.c +++ gregkh-2.6/drivers/w1/w1_netlink.c @@ -27,7 +27,7 @@ #include "w1_log.h" #include "w1_netlink.h" -#ifndef NETLINK_DISABLED +#if defined(CONFIG_W1_CON) && (defined(CONFIG_CONNECTOR) || (defined(CONFIG_CONNECTOR_MODULE) && defined(CONFIG_W1_MODULE))) void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg) { char buf[sizeof(struct cn_msg) + sizeof(struct w1_netlink_msg)]; @@ -230,8 +230,6 @@ void w1_fini_netlink(void) cn_del_callback(&w1_id); } #else -#warning Netlink support is disabled. Please compile with NET support enabled. - void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg) { }