From owner-svn-src-stable@freebsd.org Thu Mar 16 03:49:08 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E28ED0E46E; Thu, 16 Mar 2017 03:49:08 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C67201875; Thu, 16 Mar 2017 03:49:07 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2G3n63L013144; Thu, 16 Mar 2017 03:49:06 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2G3n6kR013141; Thu, 16 Mar 2017 03:49:06 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201703160349.v2G3n6kR013141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Thu, 16 Mar 2017 03:49:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315367 - stable/11/sys/dev/uart X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2017 03:49:08 -0000 Author: ian Date: Thu Mar 16 03:49:06 2017 New Revision: 315367 URL: https://svnweb.freebsd.org/changeset/base/315367 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/11/sys/dev/uart/uart_bus_acpi.c stable/11/sys/dev/uart/uart_bus_isa.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/uart/uart_bus_acpi.c ============================================================================== --- stable/11/sys/dev/uart/uart_bus_acpi.c Thu Mar 16 03:41:31 2017 (r315366) +++ stable/11/sys/dev/uart/uart_bus_acpi.c Thu Mar 16 03:49:06 2017 (r315367) @@ -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/11/sys/dev/uart/uart_bus_isa.c ============================================================================== --- stable/11/sys/dev/uart/uart_bus_isa.c Thu Mar 16 03:41:31 2017 (r315366) +++ stable/11/sys/dev/uart/uart_bus_isa.c Thu Mar 16 03:49:06 2017 (r315367) @@ -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 */