move vendor HIDs into their drivers, clean up some unused defines

ok kettenis

5 files changed, 16 insertions, 31 deletions

diff --git a/sys/dev/acpi/acpiasus.c b/sys/dev/acpi/acpiasus.c
index c378da4e264..b853aa50a60 100644
--- a/sys/dev/acpi/acpiasus.c
+++ b/sys/dev/acpi/acpiasus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiasus.c,v 1.17 2014/02/21 18:49:06 deraadt Exp $ */
+/* $OpenBSD: acpiasus.c,v 1.18 2017/02/25 20:09:20 jcs Exp $ */
 /* $NetBSD: asus_acpi.c,v 1.2.2.2 2008/04/03 12:42:37 mjf Exp $ */
 /*
  * Copyright (c) 2007, 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -95,7 +95,10 @@ struct cfdriver acpiasus_cd = {
 	NULL, "acpiasus", DV_DULL
 };
 
-const char *acpiasus_hids[] = { ACPI_DEV_ASUS, 0 };
+const char *acpiasus_hids[] = {
+	"ASUS010",
+	0
+};
 
 int
 acpiasus_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/acpi/acpireg.h b/sys/dev/acpi/acpireg.h
index 75d20098fc0..47b203d4bd3 100644
--- a/sys/dev/acpi/acpireg.h
+++ b/sys/dev/acpi/acpireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpireg.h,v 1.37 2017/02/25 19:15:09 jcs Exp $	*/
+/*	$OpenBSD: acpireg.h,v 1.38 2017/02/25 20:09:20 jcs Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
@@ -745,8 +745,6 @@ struct acpi_ivrs {
 #define ACPI_DEV_LD	"PNP0C0D"	/* Lid Device */
 #define ACPI_DEV_SBD	"PNP0C0E"	/* Sleep Button Device */
 #define ACPI_DEV_PILD	"PNP0C0F"	/* PCI Interrupt Link Device */
-#define ACPI_DEV_HIDI2C	"PNP0C50"	/* HID over I2C device */
-#define ACPI_DEV_HIDI2C2 "ACPI0C50"	/* HID over I2C device */
 #define ACPI_DEV_MEMD	"PNP0C80"	/* Memory Device */
 #define ACPI_DEV_MOUSE	"PNP0F13"	/* PS/2 Mouse */
 #define ACPI_DEV_SHC	"ACPI0001"	/* SMBus 1.0 Host Controller */
@@ -762,21 +760,5 @@ struct acpi_ivrs {
 #define ACPI_DEV_IOSA	"ACPI000B"	/* IO SAPIC Device */
 #define ACPI_DEV_THZ	"THERMALZONE"	/* Thermal Zone */
 #define ACPI_DEV_FFB	"FIXEDBUTTON"	/* Fixed Feature Button */
-#define ACPI_DEV_ASUS	"ASUS010"	/* ASUS Hotkeys */
-#define ACPI_DEV_ASUS1	"ATK0100"	/* ASUS Special Device */
-#define ACPI_DEV_IBM	"IBM0068"	/* IBM ThinkPad support */
-#define ACPI_DEV_LENOVO	"LEN0068"	/* Lenovo ThinkPad support */
-#define ACPI_DEV_LENOVO2 "LEN0268"	/* Lenovo ThinkPad support */
-#define ACPI_DEV_ASUSAIBOOSTER	"ATK0110"	/* ASUSTeK AI Booster */
-#define ACPI_DEV_TOSHIBA_LIBRETTO	"TOS6200"	/* Toshiba Libretto support */
-#define ACPI_DEV_TOSHIBA_DYNABOOK	"TOS6207"	/* Toshiba Dynabook support */
-#define ACPI_DEV_TOSHIBA_SPA40	"TOS6208"	/* Toshiba SPA40 support */
-
-/* Synopsys DesignWare I2C controllers */
-#define ACPI_DEV_DWIIC1	"INT33C2"
-#define ACPI_DEV_DWIIC2	"INT33C3"
-#define ACPI_DEV_DWIIC3	"INT3432"
-#define ACPI_DEV_DWIIC4	"INT3433"
-#define ACPI_DEV_DWIIC5	"80860F41"
 
 #endif	/* !_DEV_ACPI_ACPIREG_H_ */
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index b663dee9815..fecf33d2618 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpithinkpad.c,v 1.55 2017/02/25 19:15:09 jcs Exp $	*/
+/*	$OpenBSD: acpithinkpad.c,v 1.56 2017/02/25 20:09:20 jcs Exp $	*/
 /*
  * Copyright (c) 2008 joshua stein <jcs@openbsd.org>
  *
@@ -181,9 +181,9 @@ struct cfdriver acpithinkpad_cd = {
 };
 
 const char *acpithinkpad_hids[] = {
-	ACPI_DEV_IBM,
-	ACPI_DEV_LENOVO,
-	ACPI_DEV_LENOVO2,
+	"IBM0068",
+	"LEN0068",
+	"LEN0268",
 	0
 };
 
diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c
index 4f325afb802..2eee9afc328 100644
--- a/sys/dev/acpi/acpitoshiba.c
+++ b/sys/dev/acpi/acpitoshiba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitoshiba.c,v 1.6 2016/06/16 10:39:36 giovanni Exp $ */
+/* $OpenBSD: acpitoshiba.c,v 1.7 2017/02/25 20:09:20 jcs Exp $ */
 /*-
  * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org>
  * All rights reserved.
@@ -121,9 +121,9 @@ struct cfdriver acpitoshiba_cd = {
 };
 
 const char *acpitoshiba_hids[] = {
-	ACPI_DEV_TOSHIBA_LIBRETTO,
-	ACPI_DEV_TOSHIBA_DYNABOOK,
-	ACPI_DEV_TOSHIBA_SPA40,
+	"TOS6200",	/* Libretto */
+	"TOS6207",	/* Dynabook */
+	"TOS6208",	/* SPA40 */
 	0
 };
 
diff --git a/sys/dev/acpi/atk0110.c b/sys/dev/acpi/atk0110.c
index 62784fa8097..873dcaa3c08 100644
--- a/sys/dev/acpi/atk0110.c
+++ b/sys/dev/acpi/atk0110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atk0110.c,v 1.13 2015/08/25 07:00:11 deraadt Exp $	*/
+/*	$OpenBSD: atk0110.c,v 1.14 2017/02/25 20:09:20 jcs Exp $	*/
 
 /*
  * Copyright (c) 2009 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -122,7 +122,7 @@ struct cfdriver aibs_cd = {
 };
 
 static const char* aibs_hids[] = {
-	ACPI_DEV_ASUSAIBOOSTER,
+	"ATK0110",
 	NULL
 };