diff options
author | Jean Delvare <khali@linux-fr.org> | 2006-08-13 17:46:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-26 18:38:51 -0400 |
commit | 7a8d29cec7a53cf1a29dc5055aa9d1fa0f95830f (patch) | |
tree | d7be7f4fe5909b34fb4ca1587bc6a981c7c0b67b /drivers/i2c/busses | |
parent | 6c805d2ce9d910ea915d7dbe4aed0a91f138be07 (diff) |
i2c-stub: Chip address as a module parameter
i2c-stub: Chip address as a module parameter
Add a mandatory chip_addr parameter to i2c-stub. This parameter
defines to which chip address the driver will respond, instead of
reponding to all addresses as before. The idea is to prevent the
users from loading i2c-stub at random and being then confused by
the results of sensors-detect or other user-space tools.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r-- | drivers/i2c/busses/i2c-stub.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c index 73f481e93a36..8cf374ddd989 100644 --- a/drivers/i2c/busses/i2c-stub.c +++ b/drivers/i2c/busses/i2c-stub.c | |||
@@ -27,6 +27,10 @@ | |||
27 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | 29 | ||
30 | static unsigned short chip_addr; | ||
31 | module_param(chip_addr, ushort, S_IRUGO); | ||
32 | MODULE_PARM_DESC(chip_addr, "Chip address (between 0x03 and 0x77)\n"); | ||
33 | |||
30 | static u8 stub_pointer; | 34 | static u8 stub_pointer; |
31 | static u8 stub_bytes[256]; | 35 | static u8 stub_bytes[256]; |
32 | static u16 stub_words[256]; | 36 | static u16 stub_words[256]; |
@@ -37,6 +41,9 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, | |||
37 | { | 41 | { |
38 | s32 ret; | 42 | s32 ret; |
39 | 43 | ||
44 | if (addr != chip_addr) | ||
45 | return -ENODEV; | ||
46 | |||
40 | switch (size) { | 47 | switch (size) { |
41 | 48 | ||
42 | case I2C_SMBUS_QUICK: | 49 | case I2C_SMBUS_QUICK: |
@@ -122,7 +129,17 @@ static struct i2c_adapter stub_adapter = { | |||
122 | 129 | ||
123 | static int __init i2c_stub_init(void) | 130 | static int __init i2c_stub_init(void) |
124 | { | 131 | { |
125 | printk(KERN_INFO "i2c-stub loaded\n"); | 132 | if (!chip_addr) { |
133 | printk(KERN_ERR "i2c-stub: Please specify a chip address\n"); | ||
134 | return -ENODEV; | ||
135 | } | ||
136 | if (chip_addr < 0x03 || chip_addr > 0x77) { | ||
137 | printk(KERN_ERR "i2c-stub: Invalid chip address 0x%02x\n", | ||
138 | chip_addr); | ||
139 | return -EINVAL; | ||
140 | } | ||
141 | |||
142 | printk(KERN_INFO "i2c-stub: Virtual chip at 0x%02x\n", chip_addr); | ||
126 | return i2c_add_adapter(&stub_adapter); | 143 | return i2c_add_adapter(&stub_adapter); |
127 | } | 144 | } |
128 | 145 | ||