Skip to content

Commit

Permalink
[PATCH] w1_smem: support for new simple rom family [0x81 id].
Browse files Browse the repository at this point in the history
Support for new simple rom family [0x81 id].
It is the same as existing 0x01 family,
which is used in ds9490* w1 adapters.
Patch is on top of new-thermal-sensor-families patch.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Evgeniy Polyakov authored and Greg Kroah-Hartman committed Jun 22, 2005
1 parent 718a538 commit 85e941c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
3 changes: 2 additions & 1 deletion drivers/w1/w1_family.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
#include <asm/atomic.h>

#define W1_FAMILY_DEFAULT 0
#define W1_FAMILY_SMEM 0x01
#define W1_FAMILY_SMEM_01 0x01
#define W1_FAMILY_SMEM_81 0x81
#define W1_THERM_DS18S20 0x10
#define W1_THERM_DS1822 0x22
#define W1_THERM_DS18B20 0x28
Expand Down
26 changes: 22 additions & 4 deletions drivers/w1/w1_smem.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,37 @@ static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, siz
return count;
}

static struct w1_family w1_smem_family = {
.fid = W1_FAMILY_SMEM,
static struct w1_family w1_smem_family_01 = {
.fid = W1_FAMILY_SMEM_01,
.fops = &w1_smem_fops,
};

static struct w1_family w1_smem_family_81 = {
.fid = W1_FAMILY_SMEM_81,
.fops = &w1_smem_fops,
};

static int __init w1_smem_init(void)
{
return w1_register_family(&w1_smem_family);
int err;

err = w1_register_family(&w1_smem_family_01);
if (err)
return err;

err = w1_register_family(&w1_smem_family_81);
if (err) {
w1_unregister_family(&w1_smem_family_01);
return err;
}

return 0;
}

static void __exit w1_smem_fini(void)
{
w1_unregister_family(&w1_smem_family);
w1_unregister_family(&w1_smem_family_01);
w1_unregister_family(&w1_smem_family_81);
}

module_init(w1_smem_init);
Expand Down

0 comments on commit 85e941c

Please sign in to comment.