 @@ -1,14 +1,14 @@
-/*	$NetBSD: smbiosvar.h,v 1.4 2017/03/11 07:21:10 nonaka Exp $ */
+/*	$NetBSD: smbiosvar.h,v 1.5 2018/12/25 16:45:02 mlelstv Exp $ */
 /*
  * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
  * Copyright (c) 2005 Jordan Hargrave
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -175,35 +175,88 @@ struct smbios_sys {
 	uint8_t	sku;		/* string */
 	uint8_t	family;		/* string */
 } __packed;
 /*
  * SMBIOS Structure Type 2 "Base Board (Module) Information"
  * DMTF Specification DSP0134 Section 3.3.3 p.g. 37
  */
 struct smbios_board {
 	uint8_t	vendor;		/* string */
 	uint8_t	product;	/* string */
 	uint8_t	version;	/* string */
 	uint8_t	serial;		/* string */
-	uint8_t	asset;		/* stirng */
+	uint8_t	asset;		/* string */
 	uint8_t	feature;	/* feature flags */
 	uint8_t	location;	/* location in chassis */
 	uint16_t	handle;		/* chassis handle */
 	uint8_t	type;		/* board type */
 	uint8_t	noc;		/* number of contained objects */
 } __packed;
 /*
  * SMBIOS Structure Type 3 "System Enclosure or Chassis"
  * DMTF Specification DSP0134 Section 3.1.1 p.g. 37
  */
 struct smbios_chassis {
 	uint8_t	vendor;		/* string */
 	uint8_t	shape;
 	uint8_t	version;	/* string */
 	uint8_t	serial;		/* string */
 	uint8_t	asset;		/* string */
 	uint8_t	bustate;
 	uint8_t	psstate;
 	uint8_t	thstate;
 	uint8_t	security;
 	uint32_t	oemdata;
 	uint8_t	height;
 	uint8_t	powercords;
 	uint8_t	noc;		/* number of contained objects */
 } __packed;
 /*
  * SMBIOS Structure Type 4 "Processor Information"
  * DMTF Specification DSP0134 Section 3.1.1 p.g. 42
  */
 struct smbios_processor {
 	uint8_t socket;		/* string */
 	uint8_t	type;
 	uint8_t	family;
 	uint8_t	vendor;		/* string */
 	uint64_t	cpuid;
 	uint8_t	version;	/* string */
 	uint8_t	voltage;
 	uint16_t	clkspeed;
 	uint16_t	maxspeed;
 	uint16_t	curspeed;
 	uint8_t	status;
 	uint8_t	upgrade;
 	uint8_t	l1cache;
 	uint8_t	l2cache;
 	uint8_t	l3cache;
 	uint8_t	serial;		/* string */
 	uint8_t	asset;		/* string */
 	uint8_t	part;		/* string */
 	uint8_t	cores;		/* cores per socket */
 	uint8_t	enabled;	/* enabled cores per socket */
 	uint8_t	threads;	/* threads per socket */
 	uint16_t	characteristics;
 	uint16_t	family2;	/* for values >= 255 */
 	uint16_t	cores2;		/* for values >= 255 */
 	uint16_t	enabled2;	/* for values >= 255 */
 	uint16_t	threads2;	/* for values >= 255 */
 } __packed;
 /*
  * SMBIOS Structure Type 9 "Expansion slot"
  */
 struct smbios_slot {
 	uint8_t		designation;
 	uint8_t		type;
 	uint8_t		width;
 	uint8_t		usage;
 	uint8_t		length;
 	uint8_t		slotid[2];
 	uint8_t		characteristics[2];
 } __packed;
 #define	SMBIOS_SLOT_ISA		0x03

 @@ -1,14 +1,14 @@
-/* $NetBSD: platform.c,v 1.15 2014/03/26 08:04:19 christos Exp $ */
+/* $NetBSD: platform.c,v 1.16 2018/12/25 16:45:02 mlelstv Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,66 +19,71 @@
  * 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 "isa.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.15 2014/03/26 08:04:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.16 2018/12/25 16:45:02 mlelstv Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/uuid.h>
 #include <sys/pmf.h>
 #if NISA > 0
 #include <dev/isa/isavar.h>
 #endif
 #include <arch/x86/include/smbiosvar.h>
 static int platform_dminode = CTL_EOL;
 void		platform_init(void);	/* XXX */
 static void	platform_add(struct smbtable *, const char *, int);
 static void	platform_add_word(struct smbtable *, const char *, uint16_t,
 				const char *);
 static void	platform_add_date(struct smbtable *, const char *, int);
 static void	platform_add_uuid(struct smbtable *, const char *,
 				  const uint8_t *);
 static int	platform_dmi_sysctl(SYSCTLFN_PROTO);
 static void	platform_print(void);
 /* list of private DMI sysctl nodes */
 static const char *platform_private_nodes[] = {
 	"chassis-serial",
 	"board-serial",
 	"system-serial",
 	"system-uuid",
 	NULL
 };
 void
 platform_init(void)
+{
 	struct smbtable smbios;
 	struct smbios_sys *psys;
 	struct smbios_struct_bios *pbios;
 	struct smbios_board *pboard;
 	struct smbios_chassis *pchassis;
 	struct smbios_processor *pproc;
 	struct smbios_slot *pslot;
 	int nisa, nother;
 	smbios.cookie = 0;
 	if (smbios_find_table(SMBIOS_TYPE_SYSTEM, &smbios)) {
 		psys = smbios.tblhdr;
 		platform_add(&smbios, "system-vendor", psys->vendor);
 		platform_add(&smbios, "system-product", psys->product);
 		platform_add(&smbios, "system-version", psys->version);
 		platform_add(&smbios, "system-serial", psys->serial);
 		platform_add_uuid(&smbios, "system-uuid", psys->uuid);
+	}
 @@ -94,26 +99,47 @@ platform_init(void)
 	smbios.cookie = 0;
 	if (smbios_find_table(SMBIOS_TYPE_BASEBOARD, &smbios)) {
 		pboard = smbios.tblhdr;
 		platform_add(&smbios, "board-vendor", pboard->vendor);
 		platform_add(&smbios, "board-product", pboard->product);
 		platform_add(&smbios, "board-version", pboard->version);
 		platform_add(&smbios, "board-serial", pboard->serial);
 		platform_add(&smbios, "board-asset-tag", pboard->asset);
+	}
 	smbios.cookie = 0;
 	if (smbios_find_table(SMBIOS_TYPE_ENCLOSURE, &smbios)) {
 		pchassis = smbios.tblhdr;
 		platform_add(&smbios, "chassis-vendor", pchassis->vendor);
 		platform_add(&smbios, "chassis-type", pchassis->shape);
 		platform_add(&smbios, "chassis-version", pchassis->version);
 		platform_add(&smbios, "chassis-serial", pchassis->serial);
 		platform_add(&smbios, "chassis-asset-tag", pchassis->asset);
+	}
 	smbios.cookie = 0;
 	if (smbios_find_table(SMBIOS_TYPE_PROCESSOR, &smbios)) {
 		pproc = smbios.tblhdr;
 		platform_add(&smbios, "processor-vendor", pproc->vendor);
 		platform_add(&smbios, "processor-version", pproc->version);
 		platform_add_word(&smbios, "processor-frequency",
 			pproc->curspeed, " MHz");
+	}
 	smbios.cookie = 0;
 	nisa = 0;
 	nother = 0;
 	while (smbios_find_table(SMBIOS_TYPE_SLOTS, &smbios)) {
 		pslot = smbios.tblhdr;
 		switch (pslot->type) {
 		case SMBIOS_SLOT_ISA:
 		case SMBIOS_SLOT_EISA:
 			nisa++;
 			break;
 		default:
 			nother++;
 			break;
+		}
 @@ -191,26 +217,41 @@ static void
 platform_add(struct smbtable *tbl, const char *key, int idx)
+{
 	char tmpbuf[128]; /* XXX is this long enough? */
 	if (smbios_get_string(tbl, idx, tmpbuf, 128) != NULL) {
 		/* add to platform dictionary */
 		pmf_set_platform(key, tmpbuf);
 		/* create sysctl node */
 		platform_create_sysctl(key);
+	}
+}
 static void
 platform_add_word(struct smbtable *tbl, const char *key, uint16_t val,
 	const char *suf)
+{
 	char tmpbuf[128]; /* XXX is this long enough? */
 	if (snprintf(tmpbuf, sizeof(tmpbuf), "%u%s", val, suf)) {
 		/* add to platform dictionary */
 		pmf_set_platform(key, tmpbuf);
 		/* create sysctl node */
 		platform_create_sysctl(key);
+	}
+}
 static int
 platform_scan_date(char *buf, unsigned int *month, unsigned int *day,
     unsigned int *year)
+{
 	char *p, *s;
 	s = buf;
 	p = strchr(s, '/');
 	if (p) *p = '\0';
 	*month = strtoul(s, NULL, 10);
 	if (!p) return 1;
 	s = p + 1;