diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/alpha/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/armish/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/cats/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/hppa/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/hppa64/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/macppc/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/dev/onewire/files.onewire | 7 | ||||
-rw-r--r-- | sys/dev/onewire/owsbm.c | 263 |
12 files changed, 289 insertions, 11 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index d04c26c1de1..85d5675777a 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.188 2007/02/18 14:18:28 krw Exp $ +# $OpenBSD: GENERIC,v 1.189 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -419,6 +419,7 @@ safe* at pci? # SafeNet SafeXcel 1141/1741 # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature #pseudo-device raid 4 # RAIDframe disk driver diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index dc81291b193..b4ebe931a41 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.173 2007/02/19 17:17:54 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.174 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -507,6 +507,7 @@ scsibus* at iopsp? # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature pseudo-device sequencer 1 diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 89c97acd639..88a36bd25a2 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.13 2006/11/29 14:26:40 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.14 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -176,6 +176,7 @@ ukphy* at mii? # generic unknown PHYs # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature # mouse & keyboard multiplexor pseudo-devices diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index e0d49db6b27..9a5b376ea3b 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 2006/09/27 08:54:44 grange Exp $ +# $OpenBSD: GENERIC,v 1.36 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -309,6 +309,7 @@ hifn* at pci? # Hi/fn 7751 crypto card # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature # Pseudo-Devices diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 5b08fbe30ad..47d31ba31fd 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.90 2006/12/18 18:59:25 miod Exp $ +# $OpenBSD: GENERIC,v 1.91 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -320,6 +320,7 @@ uk* at scsibus? # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature pseudo-device hotplug 1 # devices hot plugging diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index dbb2a28c592..8706abbf9d9 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.12 2006/09/27 08:54:44 grange Exp $ +# $OpenBSD: GENERIC,v 1.13 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -195,6 +195,7 @@ ukphy* at mii? # generic unknown PHYs # 1-Wire devices #option ONEWIREVERBOSE #owid* at onewire? # ID +#owsbm* at onewire? # Smart Battery Monitor #owtemp* at onewire? # Temperature #pseudo-device wsmux 2 # mouse and keyboard multiplexor diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 700f2590c46..a6c7e8b35d0 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.546 2007/01/22 19:54:24 mk Exp $ +# $OpenBSD: GENERIC,v 1.547 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -702,6 +702,7 @@ scsibus* at iopsp? # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature pseudo-device pctr 1 diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 8a533760ec9..7b8d5b2f626 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.160 2007/02/16 22:59:44 claudio Exp $g +# $OpenBSD: GENERIC,v 1.161 2007/02/28 21:54:43 grange Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -343,6 +343,7 @@ uk* at scsibus? # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature pseudo-device hotplug 1 # devices hot plugging diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 5050c71b9fe..89825323606 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.167 2007/02/28 18:48:35 miod Exp $ +# $OpenBSD: GENERIC,v 1.168 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -409,6 +409,7 @@ fd* at fdc? # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature pseudo-device hotplug 1 # devices hot plugging diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 1b454b50aec..8d601f24f7b 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.60 2006/12/09 11:26:33 mbalmer Exp $ +# $OpenBSD: GENERIC,v 1.61 2007/02/28 21:54:43 grange Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -205,6 +205,7 @@ flash0 at pxaip? # NAND flash memory # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID +owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature # Pseudo-Devices diff --git a/sys/dev/onewire/files.onewire b/sys/dev/onewire/files.onewire index 682dcc4be73..dae25b7a87a 100644 --- a/sys/dev/onewire/files.onewire +++ b/sys/dev/onewire/files.onewire @@ -1,4 +1,4 @@ -# $OpenBSD: files.onewire,v 1.1 2006/03/04 16:27:03 grange Exp $ +# $OpenBSD: files.onewire,v 1.2 2007/02/28 21:54:43 grange Exp $ define onewire {} @@ -14,6 +14,11 @@ device owid attach owid at onewire file dev/onewire/owid.c owid +# Smart Battery Monitor type device +device owsbm +attach owsbm at onewire +file dev/onewire/owsbm.c owsbm + # Temperature family type device device owtemp attach owtemp at onewire diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c new file mode 100644 index 00000000000..663ddc185f0 --- /dev/null +++ b/sys/dev/onewire/owsbm.c @@ -0,0 +1,263 @@ +/* $OpenBSD: owsbm.c,v 1.1 2007/02/28 21:54:43 grange Exp $ */ + +/* + * Copyright (c) 2007 Aaron Linville <aaron@linville.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * 1-Wire Smart Battery Monitor family type device driver. + * Provides on-board temperature, an A/D converter for voltage/current, + * current accumulator, elapsed time metter, and 40 bytes of nonvolatile + * memory. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/device.h> +#include <sys/kernel.h> +#include <sys/proc.h> +#include <sys/rwlock.h> +#include <sys/sensors.h> + +#include <dev/onewire/onewiredevs.h> +#include <dev/onewire/onewirereg.h> +#include <dev/onewire/onewirevar.h> + +/* Commands */ +#define DSSBM_CMD_READ_SCRATCHPAD 0xbe +#define DSSBM_CMD_WRITE_SCRATCHPAD 0x4e +#define DSSBM_CMD_COPY_SCRATCHPAD 0x48 + +#define DSSBM_CMD_RECALL_MEMORY 0xb8 + +#define DSSBM_CMD_CONVERT_T 0x44 +#define DSSBM_CMD_CONVERT_V 0xb4 + +/* Scratchpad layout */ +#define DS2438_SP_STATUS 0 +#define DS2438_SP_TEMP_LSB 1 +#define DS2438_SP_TEMP_MSB 2 +#define DS2438_SP_VOLT_LSB 3 +#define DS2438_SP_VOLT_MSB 4 +#define DS2438_SP_CURRENT_LSB 5 +#define DS2438_SP_CURRENT_MSB 6 +#define DS2438_SP_THRESHOLD 7 +#define DS2438_SP_CRC 8 + +struct owsbm_softc { + struct device sc_dev; + + void * sc_onewire; + u_int64_t sc_rom; + + struct sensordev sc_sensordev; + + struct sensor sc_temp; + struct sensor sc_voltage_vdd; /* Battery, AD = 1*/ + struct sensor sc_voltage_vad; /* General purpose, AD = 0 */ + struct sensor sc_voltage_cr; /* Current Register */ + + struct rwlock sc_lock; +}; + +int owsbm_match(struct device *, void *, void *); +void owsbm_attach(struct device *, struct device *, void *); +int owsbm_detach(struct device *, int); +int owsbm_activate(struct device *, enum devact); + +void owsbm_update(void *); + +struct cfattach owsbm_ca = { + sizeof(struct owsbm_softc), + owsbm_match, + owsbm_attach, + owsbm_detach, + owsbm_activate +}; + +struct cfdriver owsbm_cd = { + NULL, "owsbm", DV_DULL +}; + +static const struct onewire_matchfam owsbm_fams[] = { + { ONEWIRE_FAMILY_DS2438 } +}; + +int +owsbm_match(struct device *parent, void *match, void *aux) +{ + return (onewire_matchbyfam(aux, owsbm_fams, + sizeof(owsbm_fams) /sizeof(owsbm_fams[0]))); +} + +void +owsbm_attach(struct device *parent, struct device *self, void *aux) +{ + struct owsbm_softc *sc = (struct owsbm_softc *)self; + struct onewire_attach_args *oa = aux; + + sc->sc_onewire = oa->oa_onewire; + sc->sc_rom = oa->oa_rom; + + /* Initialize temp sensor */ + strlcpy(sc->sc_sensordev.xname, sc->sc_dev.dv_xname, + sizeof(sc->sc_sensordev.xname)); + sc->sc_temp.type = SENSOR_TEMP; + strlcpy(sc->sc_temp.desc, "Temp", sizeof(sc->sc_temp.desc)); + sensor_attach(&sc->sc_sensordev, &sc->sc_temp); + + /* Initialize voltage sensor */ + sc->sc_voltage_vdd.type = SENSOR_VOLTS_DC; + strlcpy(sc->sc_voltage_vdd.desc, "VDD", sizeof(sc->sc_voltage_vdd.desc)); + sensor_attach(&sc->sc_sensordev, &sc->sc_voltage_vdd); + + /* Initialize voltage sensor */ + sc->sc_voltage_vad.type = SENSOR_VOLTS_DC; + strlcpy(sc->sc_voltage_vad.desc, "VAD", sizeof(sc->sc_voltage_vad.desc)); + sensor_attach(&sc->sc_sensordev, &sc->sc_voltage_vad); + + /* Initialize the current sensor */ + sc->sc_voltage_cr.type = SENSOR_VOLTS_DC; + strlcpy(sc->sc_voltage_cr.desc, "CR", sizeof(sc->sc_voltage_cr.desc)); + sensor_attach(&sc->sc_sensordev, &sc->sc_voltage_cr); + + if (sensor_task_register(sc, owsbm_update, 10)) { + printf(": unable to register owsbm update task\n"); + return; + } + + sensordev_install(&sc->sc_sensordev); + + rw_init(&sc->sc_lock, sc->sc_dev.dv_xname); + printf("\n"); +} + +int +owsbm_detach(struct device *self, int flags) +{ + struct owsbm_softc *sc = (struct owsbm_softc *)self; + + rw_enter_write(&sc->sc_lock); + sensordev_deinstall(&sc->sc_sensordev); + sensor_task_unregister(sc); + rw_exit_write(&sc->sc_lock); + + return (0); +} + +int +owsbm_activate(struct device *self, enum devact act) +{ + return (0); +} + +void +owsbm_update(void *arg) +{ + struct owsbm_softc *sc = arg; + u_int8_t data[9]; + + rw_enter_write(&sc->sc_lock); + onewire_lock(sc->sc_onewire, 0); + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_CONVERT_T); + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_CONVERT_V); + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + /* Issue Recall Memory page 00h cmd */ + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_RECALL_MEMORY); + onewire_write_byte(sc->sc_onewire, 0); + + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + /* Read page 0 of Memory Map from Scratchpad */ + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_READ_SCRATCHPAD); + onewire_write_byte(sc->sc_onewire, 0); + onewire_read_block(sc->sc_onewire, data, 9); + if (onewire_crc(data, 8) == data[DS2438_SP_CRC]) { + sc->sc_temp.value = 273150000 + + (int)(((u_int16_t)data[DS2438_SP_TEMP_MSB] << 5) | + ((u_int16_t)data[DS2438_SP_TEMP_LSB] >> 3)) * 31250; + sc->sc_voltage_vdd.value = + (int)(((u_int16_t)data[DS2438_SP_VOLT_MSB] << 8) | + data[DS2438_SP_VOLT_LSB]) * 10000; + + sc->sc_voltage_cr.value = + (int)(((u_int16_t)data[DS2438_SP_CURRENT_MSB] << 8) | + data[DS2438_SP_CURRENT_LSB]) * 244; + } + + /* Reconfigure DS2438 to measure VAD */ + + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_WRITE_SCRATCHPAD); + onewire_write_byte(sc->sc_onewire, 0); + onewire_write_byte(sc->sc_onewire, 0x7); /* AD = 0 */ + + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_CONVERT_V); + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + /* Issue Recall Memory page 00h cmd */ + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_RECALL_MEMORY); + onewire_write_byte(sc->sc_onewire, 0); + + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_READ_SCRATCHPAD); + onewire_write_byte(sc->sc_onewire, 0); + onewire_read_block(sc->sc_onewire, data, 9); + if (onewire_crc(data, 8) == data[8]) { + sc->sc_voltage_vad.value = + (int)(((u_int16_t)data[DS2438_SP_VOLT_MSB] << 8) | + data[DS2438_SP_VOLT_LSB]) * 10000; + } + + /* Reconfigure back DS2438 to measure VDD (default) */ + + if (onewire_reset(sc->sc_onewire) != 0) + goto done; + + onewire_matchrom(sc->sc_onewire, sc->sc_rom); + onewire_write_byte(sc->sc_onewire, DSSBM_CMD_WRITE_SCRATCHPAD); + onewire_write_byte(sc->sc_onewire, 0); + onewire_write_byte(sc->sc_onewire, 0xf); /* AD = 1 */ + onewire_reset(sc->sc_onewire); + +done: + onewire_unlock(sc->sc_onewire); + rw_exit_write(&sc->sc_lock); +} |