 @@ -1,14 +1,14 @@
-/*      $NetBSD: sdtemp.c,v 1.22 2013/07/22 13:46:20 soren Exp $        */
+/*      $NetBSD: sdtemp.c,v 1.23 2014/01/09 16:51:05 mlelstv Exp $        */
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.22 2013/07/22 13:46:20 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23 2014/01/09 16:51:05 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/endian.h>
 #include <sys/module.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/sdtemp_reg.h>
 @@ -110,26 +110,32 @@ sdtemp_dev_table[] = {
 	"Microchip Tech MCP98243" },
     { MCP_MANUFACTURER_ID,   MCP_98242_DEVICE_ID,   MCP_98242_MASK, -4,
 	"Microchip Tech MCP98242" },
     { ADT_MANUFACTURER_ID,   ADT_7408_DEVICE_ID,    ADT_7408_MASK,   4,
 	"Analog Devices ADT7408" },
     { NXP_MANUFACTURER_ID,   NXP_SE98_DEVICE_ID,    NXP_SE98_MASK,   3,
 	"NXP Semiconductors SE97B/SE98" },
     { NXP_MANUFACTURER_ID,   NXP_SE97_DEVICE_ID,    NXP_SE97_MASK,   3,
 	"NXP Semiconductors SE97" },
     { STTS_MANUFACTURER_ID,  STTS_424E_DEVICE_ID,   STTS_424E_MASK,  2,
 	"STmicroelectronics STTS424E" },
     { STTS_MANUFACTURER_ID,  STTS_424_DEVICE_ID,    STTS_424_MASK,   2,
 	"STmicroelectronics STTS424" },
     { STTS_MANUFACTURER_ID,  STTS_2002_DEVICE_ID,    STTS_2002_MASK,   2,
 	"STmicroelectronics STTS2002" },
     { STTS_MANUFACTURER_ID,  STTS_2004_DEVICE_ID,    STTS_2004_MASK,   2,
 	"STmicroelectronics STTS2002" },
     { STTS_MANUFACTURER_ID,  STTS_3000_DEVICE_ID,    STTS_3000_MASK,   2,
 	"STmicroelectronics STTS3000" },
     { CAT_MANUFACTURER_ID,   CAT_34TS02_DEVICE_ID,  CAT_34TS02_MASK, 4,
 	"Catalyst CAT34TS02/CAT6095" },
     { IDT_MANUFACTURER_ID,   IDT_TS3000B3_DEVICE_ID, IDT_TS3000B3_MASK, 4,
 	"Integrated Device Technology TS3000B3/TSE2002B3" },
     { 0, 0, 0, 2, "Unknown" }
 };
 static int
 sdtemp_lookup(uint16_t mfg, uint16_t devrev)
+{
 	int i;
 	for (i = 0; sdtemp_dev_table[i].sdtemp_mfg_id; i++) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sdtemp_reg.h,v 1.6 2013/08/07 19:38:45 soren Exp $	*/
+/*	$NetBSD: sdtemp_reg.h,v 1.7 2014/01/09 16:51:05 mlelstv Exp $	*/
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -114,21 +114,27 @@
 #define	ADT_MANUFACTURER_ID		0x11D4
 #define	ADT_7408_DEVICE_ID		0x8001
 #define	ADT_7408_MASK			0xFFFF
 #define	IDT_MANUFACTURER_ID		0x00B3
 #define	IDT_TS3000B3_DEVICE_ID		0x2903	/* Also matches TSE2002B3 */
 #define	IDT_TS3000B3_MASK		0xFFFF
 #define	STTS_MANUFACTURER_ID		0x104A
 #define	STTS_424_DEVICE_ID		0x0101
 #define	STTS_424_MASK			0xFFFF
 #define	STTS_424E_DEVICE_ID		0x0000
 #define	STTS_424E_MASK			0xFFFE
 #define	STTS_3000_DEVICE_ID		0x0200
 #define	STTS_3000_MASK			0xFFFF
 #define	STTS_2002_DEVICE_ID		0x0300
 #define	STTS_2002_MASK			0xFFFF
 #define	STTS_2004_DEVICE_ID		0x2201
 #define	STTS_2004_MASK			0xFFFF
 /* According to datasheets, both the CAT6095 and CAT34TS02 have the same ID */
 #define	CAT_MANUFACTURER_ID		0x1B09
 #define	CAT_34TS02_DEVICE_ID		0x0800
 #define	CAT_34TS02_MASK			0xFFE0
 #endif	/* _DEV_I2C_SDTEMPREG_H */