From owner-svn-src-stable@freebsd.org Fri Apr 20 12:40:06 2018 Return-Path: Delivered-To: svn-src-stable@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 89C1CF9EEFD; Fri, 20 Apr 2018 12:40:06 +0000 (UTC) (envelope-from nyan@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 382FC87127; Fri, 20 Apr 2018 12:40:06 +0000 (UTC) (envelope-from nyan@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 3326318675; Fri, 20 Apr 2018 12:40:06 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3KCe6i2001450; Fri, 20 Apr 2018 12:40:06 GMT (envelope-from nyan@FreeBSD.org) Received: (from nyan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3KCe66V001449; Fri, 20 Apr 2018 12:40:06 GMT (envelope-from nyan@FreeBSD.org) Message-Id: <201804201240.w3KCe66V001449@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nyan set sender to nyan@FreeBSD.org using -f From: Takahashi Yoshihiro Date: Fri, 20 Apr 2018 12:40: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: r332815 - stable/11/sys/pc98/cbus X-SVN-Group: stable-11 X-SVN-Commit-Author: nyan X-SVN-Commit-Paths: stable/11/sys/pc98/cbus X-SVN-Commit-Revision: 332815 X-SVN-Commit-Repository: base 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.25 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: Fri, 20 Apr 2018 12:40:06 -0000 Author: nyan Date: Fri Apr 20 12:40:05 2018 New Revision: 332815 URL: https://svnweb.freebsd.org/changeset/base/332815 Log: - Use __FBSDID(). - Fix pc98 build. Merge from sys/dev/syscons/scterm-teken.c r330918. Modified: stable/11/sys/pc98/cbus/scterm-sck.c Modified: stable/11/sys/pc98/cbus/scterm-sck.c ============================================================================== --- stable/11/sys/pc98/cbus/scterm-sck.c Fri Apr 20 12:37:08 2018 (r332814) +++ stable/11/sys/pc98/cbus/scterm-sck.c Fri Apr 20 12:40:05 2018 (r332815) @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_syscons.h" #include @@ -909,24 +910,18 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char } static void -scterm_puts(scr_stat *scp, u_char *buf, int len, int kernel) +scterm_puts(scr_stat *scp, u_char *buf, int len) { term_stat *tcp; u_char *ptr; #ifdef KANJI u_short kanji_code; #endif - color_t backup; tcp = scp->ts; ptr = buf; outloop: scp->sc->write_in_progress++; - backup = tcp->cur_color; - if (kernel) { - tcp->cur_color.fg = SC_KERNEL_CONS_ATTR & 0x0f; - tcp->cur_color.bg = (SC_KERNEL_CONS_ATTR >> 4) & 0x0f; - } if (tcp->esc) { scterm_scan_esc(scp, tcp, *ptr++); @@ -1109,8 +1104,6 @@ ascii_end: sc_term_gen_scroll(scp, scp->sc->scr_map[0x20], tcp->cur_attr); - if (kernel) - tcp->cur_color = backup; scp->sc->write_in_progress--; if (len) goto outloop;