svn commit: r315417 - stable/10/sys/dev/uart

[Ian Lepore]

Author: ian
Date: Thu Mar 16 15:43:32 2017
New Revision: 315417
URL: https://svnweb.freebsd.org/changeset/base/315417

Log:
  MFC r314918, r314919:
  
    Add the pnp id for a Wacom 'WACF00e' tablet.
  
    Update the comment for the Wacom WACF00e to make it clear it's not an
    accidental duplicate of WACF004.
  
  PR:           217306

Modified:
  stable/10/sys/dev/uart/uart_bus_acpi.c
  stable/10/sys/dev/uart/uart_bus_isa.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/uart/uart_bus_acpi.c
==============================================================================
--- stable/10/sys/dev/uart/uart_bus_acpi.c	Thu Mar 16 15:13:28 2017	(r315416)
+++ stable/10/sys/dev/uart/uart_bus_acpi.c	Thu Mar 16 15:43:32 2017	(r315417)
@@ -64,6 +64,7 @@ static struct isa_pnp_id acpi_ns8250_ids
 	{0x1005d041, "Generic IRDA-compatible device"},	/* PNP0510 */
 	{0x1105d041, "Generic IRDA-compatible device"},	/* PNP0511 */
 	{0x04f0235c, "Wacom Tablet PC Screen"},		/* WACF004 */
+	{0x0ef0235c, "Wacom Tablet PC Screen 00e"},	/* WACF00e */
 	{0xe502aa1a, "Wacom Tablet at FuS Lifebook T"},	/* FUJ02E5 */
 	{0}
 };

Modified: stable/10/sys/dev/uart/uart_bus_isa.c
==============================================================================
--- stable/10/sys/dev/uart/uart_bus_isa.c	Thu Mar 16 15:13:28 2017	(r315416)
+++ stable/10/sys/dev/uart/uart_bus_isa.c	Thu Mar 16 15:43:32 2017	(r315417)
@@ -142,7 +142,8 @@ static struct isa_pnp_id isa_ns8250_ids[
 	{0x90307256, NULL},	/* USR3090 - USR ? */
 	{0x70917256, NULL},	/* USR9170 - U.S. Robotics 56K FAX INT */
 	{0x90917256, NULL},	/* USR9190 - USR 56k Voice INT */
-	{0x04f0235c, NULL},	/* WACF004 - Wacom Tablet PC Screen*/
+	{0x04f0235c, NULL},	/* WACF004 - Wacom Tablet PC Screen */
+	{0x0ef0235c, NULL},	/* WACF00e - Wacom Tablet PC Screen 00e */
 	{0x0300695c, NULL},	/* WCI0003 - Fax/Voice/Modem/Speakphone/Asvd */
 	{0x01a0896a, NULL},	/* ZTIA001 - Zoom Internal V90 Faxmodem */
 	{0x61f7896a, NULL},	/* ZTIF761 - Zoom ComStar 33.6 */