ugold(4) is a driver for PCsensor's USB gold TEMPer temperature

measurement device (idVendor:idProduct=0x0c45:0x7401).

newly added.

ok by mpi@ and sthen@

5 files changed, 273 insertions, 5 deletions

diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index adf90c085e2..8dfa8474a05 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.usb,v 1.108 2013/08/20 14:27:33 ajacoutot Exp $
+#	$OpenBSD: files.usb,v 1.109 2013/09/05 19:42:08 sasano Exp $
 #	$NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
 #
 # Config file and device description for machine-independent USB code.
@@ -129,6 +129,11 @@ device	uthum: hid
 attach	uthum at uhidbus
 file	dev/usb/uthum.c			uthum
 
+# gold TEMPer
+device	ugold: hid
+attach	ugold at uhidbus
+file	dev/usb/ugold.c			ugold
+
 # Strawberry Linux USBRH
 device	utrh: hid
 attach	utrh at uhidbus
diff --git a/sys/dev/usb/ugold.c b/sys/dev/usb/ugold.c
new file mode 100644
index 00000000000..b5d441d9c3d
--- /dev/null
+++ b/sys/dev/usb/ugold.c
@@ -0,0 +1,257 @@
+/*	$OpenBSD: ugold.c,v 1.1 2013/09/05 19:42:08 sasano Exp $   */
+
+/*
+ * Copyright (c) 2013 Takayoshi SASANO <sasano@openbsd.org>
+ * Copyright (c) 2013 Martin Pieuchot <mpi@openbsd.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 DISCAIMS 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.
+ */
+
+/* Driver for Microdia's HID base TEMPer Temperature sensor */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/sensors.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbhid.h>
+
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdevs.h>
+#include <dev/usb/uhidev.h>
+#include <dev/usb/hid.h>
+
+#define UGOLD_INNER		0
+#define UGOLD_OUTER		1
+#define UGOLD_MAX_SENSORS	2
+
+#define UGOLD_CMD_DATA		0x80
+#define UGOLD_CMD_INIT		0x82
+
+/*
+ * This driver only uses two of the three known commands for the
+ * TEMPerV1.2 device.
+ *
+ * The first byte of the answer corresponds to the command and the
+ * second one seems to be the size (in bytes) of the answer.
+ *
+ * The device always sends 8 bytes and if the length of the answer
+ * is less than that, it just leaves the last bytes untouched.  That
+ * is why most of the time the last n bytes of the answers are the
+ * same.
+ *
+ * The third command below seems to generate two answers with a
+ * string corresponding to the device, for example:
+ *	'TEMPer1F' and '1.1Per1F' (here Per1F is repeated).
+ */
+static uint8_t cmd_data[8] = { 0x01, 0x80, 0x33, 0x01, 0x00, 0x00, 0x00, 0x00 };
+static uint8_t cmd_init[8] = { 0x01, 0x82, 0x77, 0x01, 0x00, 0x00, 0x00, 0x00 };
+#if 0
+static uint8_t cmd_type[8] = { 0x01, 0x86, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00 };
+#endif
+
+struct ugold_softc {
+	struct uhidev		 sc_hdev;
+	struct usbd_device	*sc_udev;
+
+	int			 sc_num_sensors;
+
+	struct ksensor		 sc_sensor[UGOLD_MAX_SENSORS];
+	struct ksensordev	 sc_sensordev;
+	struct sensor_task	*sc_sensortask;
+};
+
+const struct usb_devno ugold_devs[] = {
+	{ USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TEMPER },
+};
+
+int 	ugold_match(struct device *, void *, void *);
+void	ugold_attach(struct device *, struct device *, void *);
+int 	ugold_detach(struct device *, int);
+
+void	ugold_intr(struct uhidev *, void *, u_int);
+void	ugold_refresh(void *);
+
+int	ugold_issue_cmd(struct ugold_softc *, uint8_t *, int);
+
+struct cfdriver ugold_cd = {
+	NULL, "ugold", DV_DULL
+};
+
+const struct cfattach ugold_ca = {
+	sizeof(struct ugold_softc), ugold_match, ugold_attach, ugold_detach,
+};
+
+int
+ugold_match(struct device *parent, void *match, void *aux)
+{
+	struct uhidev_attach_arg *uha = aux;
+	int size;
+	void *desc;
+
+	if (usb_lookup(ugold_devs, uha->uaa->vendor, uha->uaa->product) == NULL)
+		return (UMATCH_NONE);
+
+	/*
+	 * XXX Only match the sensor interface.
+	 *
+	 * Does it makes sense to attach various uhidev(4) to these
+	 * non-standard HID devices?
+	 */
+	uhidev_get_report_desc(uha->parent, &desc, &size);
+	if (hid_is_collection(desc, size, uha->reportid,
+	    HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_KEYBOARD)))
+		return (UMATCH_NONE);
+
+	return (UMATCH_VENDOR_PRODUCT);
+
+}
+
+void
+ugold_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct ugold_softc *sc = (struct ugold_softc *)self;
+	struct uhidev_attach_arg *uha = aux;
+	int size, repid;
+	void *desc;
+
+	sc->sc_udev = uha->parent->sc_udev;
+	sc->sc_hdev.sc_intr = ugold_intr;
+	sc->sc_hdev.sc_parent = uha->parent;
+	sc->sc_hdev.sc_report_id = uha->reportid;
+
+	uhidev_get_report_desc(uha->parent, &desc, &size);
+	repid = uha->reportid;
+	sc->sc_hdev.sc_isize = hid_report_size(desc, size, hid_input, repid);
+	sc->sc_hdev.sc_osize = hid_report_size(desc, size, hid_output, repid);
+	sc->sc_hdev.sc_fsize = hid_report_size(desc, size, hid_feature, repid);
+
+	if (uhidev_open(&sc->sc_hdev)) {
+		printf(", unable to open interrupt pipe\n");
+		return;
+	}
+
+	strlcpy(sc->sc_sensordev.xname, sc->sc_hdev.sc_dev.dv_xname,
+	    sizeof(sc->sc_sensordev.xname));
+
+	sc->sc_sensor[UGOLD_OUTER].type = SENSOR_TEMP;
+	strlcpy(sc->sc_sensor[UGOLD_OUTER].desc, "outer",
+	    sizeof(sc->sc_sensor[UGOLD_OUTER].desc));
+
+	sc->sc_sensor[UGOLD_INNER].type = SENSOR_TEMP;
+	strlcpy(sc->sc_sensor[UGOLD_INNER].desc, "inner",
+	    sizeof(sc->sc_sensor[UGOLD_INNER].desc));
+
+	/* 0.1Hz */
+	sc->sc_sensortask = sensor_task_register(sc, ugold_refresh, 6);
+	if (sc->sc_sensortask == NULL) {
+		printf(", unable to register update task\n");
+		return;
+	}
+	printf("\n");
+
+	sensordev_install(&sc->sc_sensordev);
+}
+
+int
+ugold_detach(struct device *self, int flags)
+{
+	struct ugold_softc *sc = (struct ugold_softc *)self;
+	int i;
+
+	if (sc->sc_sensortask != NULL) {
+		sensor_task_unregister(sc->sc_sensortask);
+		sensordev_deinstall(&sc->sc_sensordev);
+	}
+
+	for (i = 0; i < sc->sc_num_sensors; i++)
+		sensor_detach(&sc->sc_sensordev, &sc->sc_sensor[i]);
+
+	return (0);
+}
+
+static int
+ugold_ds75_temp(uint8_t msb, uint8_t lsb)
+{
+	/* DS75: 12bit precision mode : 0.0625 degrees Celsius ticks */
+	return (((msb * 100) + ((lsb >> 4) * 25 / 4)) * 10000) + 273150000;
+}
+
+void
+ugold_intr(struct uhidev *addr, void *ibuf, u_int len)
+{
+	struct ugold_softc *sc = (struct ugold_softc *)addr;
+	uint8_t *buf = ibuf;
+	int i, temp;
+
+	switch (buf[0]) {
+	case UGOLD_CMD_INIT:
+		if (sc->sc_num_sensors)
+			break;
+
+		sc->sc_num_sensors = min(buf[1], UGOLD_MAX_SENSORS) /* XXX */;
+
+		for (i = 0; i < sc->sc_num_sensors; i++) {
+			sc->sc_sensor[i].flags |= SENSOR_FINVALID;
+			sensor_attach(&sc->sc_sensordev, &sc->sc_sensor[i]);
+		}
+
+		printf("%s: %d sensor%s type ds75/12bit (temperature)\n",
+		    sc->sc_hdev.sc_dev.dv_xname, sc->sc_num_sensors,
+		    (sc->sc_num_sensors == 1) ? "" : "s");
+		break;
+	case UGOLD_CMD_DATA:
+		switch (buf[1]) {
+		case 4:
+			temp = ugold_ds75_temp(buf[4], buf[5]);
+			sc->sc_sensor[UGOLD_OUTER].value = temp;
+			sc->sc_sensor[UGOLD_OUTER].flags &= ~SENSOR_FINVALID;
+			/* FALLTHROUGH */
+		case 2:
+			temp = ugold_ds75_temp(buf[2], buf[3]);
+			sc->sc_sensor[UGOLD_INNER].value = temp;
+			sc->sc_sensor[UGOLD_INNER].flags &= ~SENSOR_FINVALID;
+			break;
+		default:
+			printf("%s: invalid data length (%d bytes)\n",
+				sc->sc_hdev.sc_dev.dv_xname, buf[1]);
+		}
+		break;
+	default:
+		printf("%s: unknown command 0x%02x\n",
+		    sc->sc_hdev.sc_dev.dv_xname, buf[0]);
+	}
+}
+
+void
+ugold_refresh(void *arg)
+{
+	struct ugold_softc *sc = arg;
+	int i;
+
+	if (sc->sc_num_sensors == 0)
+		ugold_issue_cmd(sc, cmd_init, sizeof(cmd_init));
+
+	if (ugold_issue_cmd(sc, cmd_data, sizeof(cmd_data))) {
+		for (i = 0; i < sc->sc_num_sensors; i++)
+			sc->sc_sensor[i].flags |= SENSOR_FINVALID;
+	}
+}
+
+int
+ugold_issue_cmd(struct ugold_softc *sc, uint8_t *cmd, int len)
+{
+	return (uhidev_set_report(&sc->sc_hdev, UHID_OUTPUT_REPORT , cmd, len));
+}
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 950bd7a6975..6fcb8ca43a3 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.604 2013/08/20 04:49:44 jsg Exp $
+$OpenBSD: usbdevs,v 1.605 2013/09/05 19:42:09 sasano Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -2832,7 +2832,8 @@ product MSI BLUETOOTH_3		0xa97a	Bluetooth
 
 /* Microdia / Sonix Techonology Co., Ltd. products */
 product MICRODIA YUREX		0x1010	YUREX
-product	MICRODIA CAM_1		0x62c0	CAM_1
+product MICRODIA CAM_1		0x62c0	CAM_1
+product MICRODIA TEMPER		0x7401	TEMPer sensor
 
 /* Micronet Communications products */
 product MICRONET SP128AR	0x0003	SP128AR EtherFast
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 58787aa6c3f..f5c7913ce0c 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs.h,v 1.614 2013/08/20 04:50:35 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.615 2013/09/05 19:42:09 sasano Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -2840,6 +2840,7 @@
 /* Microdia / Sonix Techonology Co., Ltd. products */
 #define	USB_PRODUCT_MICRODIA_YUREX	0x1010		/* YUREX */
 #define	USB_PRODUCT_MICRODIA_CAM_1	0x62c0		/* CAM_1 */
+#define	USB_PRODUCT_MICRODIA_TEMPER	0x7401		/* TEMPer sensor */
 
 /* Micronet Communications products */
 #define	USB_PRODUCT_MICRONET_SP128AR	0x0003		/* SP128AR EtherFast */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 14f9bfa5ae9..d2dd031c40b 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.608 2013/08/20 04:50:36 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.609 2013/09/05 19:42:09 sasano Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -6762,6 +6762,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CAM_1",
 	},
 	{
+	    USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TEMPER,
+	    "TEMPer sensor",
+	},
+	{
 	    USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
 	    "SP128AR EtherFast",
 	},