From owner-svn-src-head@FreeBSD.ORG  Tue Feb 25 09:34:30 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AD95F21A;
 Tue, 25 Feb 2014 09:34:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 96EC21319;
 Tue, 25 Feb 2014 09:34:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1P9YUZp025906;
 Tue, 25 Feb 2014 09:34:30 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1P9YU0V025905;
 Tue, 25 Feb 2014 09:34:30 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201402250934.s1P9YU0V025905@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 25 Feb 2014 09:34:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262478 - head/sys/dev/usb/input
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Feb 2014 09:34:30 -0000

Author: hselasky
Date: Tue Feb 25 09:34:30 2014
New Revision: 262478
URL: http://svnweb.freebsd.org/changeset/base/262478

Log:
  Don't generate devd rules for WSP device ID's found in the ATP driver yet.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/input/atp.c

Modified: head/sys/dev/usb/input/atp.c
==============================================================================
--- head/sys/dev/usb/input/atp.c	Tue Feb 25 08:37:06 2014	(r262477)
+++ head/sys/dev/usb/input/atp.c	Tue Feb 25 09:34:30 2014	(r262478)
@@ -509,7 +509,8 @@ static const struct wsp_dev_params wsp_d
 
 #define ATP_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
 
-static const STRUCT_USB_HOST_ID wsp_devs[] = {
+/* TODO: STRUCT_USB_HOST_ID */
+static const struct usb_device_id wsp_devs[] = {
 	/* MacbookAir1.1 */
 	ATP_DEV(APPLE, WELLSPRING_ANSI, WELLSPRING_DRIVER_INFO(WELLSPRING1)),
 	ATP_DEV(APPLE, WELLSPRING_ISO,  WELLSPRING_DRIVER_INFO(WELLSPRING1)),