From owner-svn-src-head@FreeBSD.ORG  Sat Mar  7 22:46:36 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2DAC5C6E;
 Sat,  7 Mar 2015 22:46:36 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 18275F28;
 Sat,  7 Mar 2015 22:46:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t27MkZuS013154;
 Sat, 7 Mar 2015 22:46:35 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t27MkZrW013153;
 Sat, 7 Mar 2015 22:46:35 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201503072246.t27MkZrW013153@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 7 Mar 2015 22:46:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279756 - head/sys/dev/usb/serial
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.18-1
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: Sat, 07 Mar 2015 22:46:36 -0000

Author: hselasky
Date: Sat Mar  7 22:46:35 2015
New Revision: 279756
URL: https://svnweb.freebsd.org/changeset/base/279756

Log:
  Use correct mode variable for PPS support.
  
  PR:		196897
  Submitted by:	ian @
  MFC after:	1 week

Modified:
  head/sys/dev/usb/serial/usb_serial.c

Modified: head/sys/dev/usb/serial/usb_serial.c
==============================================================================
--- head/sys/dev/usb/serial/usb_serial.c	Sat Mar  7 21:31:37 2015	(r279755)
+++ head/sys/dev/usb/serial/usb_serial.c	Sat Mar  7 22:46:35 2015	(r279756)
@@ -1105,7 +1105,7 @@ ucom_cfg_status_change(struct usb_proc_m
 	/* time pulse counting support */
 	switch(ucom_pps_mode) {
 	case 1:
-		if ((sc->sc_pps.ppscap & PPS_CAPTUREBOTH) &&
+		if ((sc->sc_pps.ppsparam.mode & PPS_CAPTUREBOTH) &&
 		    (msr_delta & SER_CTS)) {
 			pps_capture(&sc->sc_pps);
 			pps_event(&sc->sc_pps, (sc->sc_msr & SER_CTS) ?
@@ -1113,7 +1113,7 @@ ucom_cfg_status_change(struct usb_proc_m
 		}
 		break;
 	case 2:
-		if ((sc->sc_pps.ppscap & PPS_CAPTUREBOTH) &&
+		if ((sc->sc_pps.ppsparam.mode & PPS_CAPTUREBOTH) &&
 		    (msr_delta & SER_DCD)) {
 			pps_capture(&sc->sc_pps);
 			pps_event(&sc->sc_pps, (sc->sc_msr & SER_DCD) ?