From owner-svn-src-head@freebsd.org Mon Jul 23 19:27:12 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 258CC10530BC; Mon, 23 Jul 2018 19:27:12 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C143C8B17F; Mon, 23 Jul 2018 19:27:11 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9637420C16; Mon, 23 Jul 2018 19:27:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6NJRBgN076554; Mon, 23 Jul 2018 19:27:11 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6NJRBFD076553; Mon, 23 Jul 2018 19:27:11 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807231927.w6NJRBFD076553@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 23 Jul 2018 19:27:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336648 - head/sys/dev/uart X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/uart X-SVN-Commit-Revision: 336648 X-SVN-Commit-Repository: base 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.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 19:27:12 -0000 Author: imp Date: Mon Jul 23 19:27:11 2018 New Revision: 336648 URL: https://svnweb.freebsd.org/changeset/base/336648 Log: Now that we set the busy_detect bit in the bas to support setting it for the console, set our override in the bas as well. Tested by: emaste@ Modified: head/sys/dev/uart/uart_dev_snps.c Modified: head/sys/dev/uart/uart_dev_snps.c ============================================================================== --- head/sys/dev/uart/uart_dev_snps.c Mon Jul 23 18:47:04 2018 (r336647) +++ head/sys/dev/uart/uart_dev_snps.c Mon Jul 23 19:27:11 2018 (r336648) @@ -107,7 +107,7 @@ snps_uart_attach(struct uart_softc *uart_sc) sc = (struct snps_softc *)uart_sc; /* UART requires to read USR reg when IIR_BUSY */ - sc->ns8250.busy_detect = 1; + uart_sc->sc_bas.busy_detect = 1; return (ns8250_bus_attach(uart_sc)); }