From owner-svn-src-head@FreeBSD.ORG Tue Apr 8 14:18:40 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 161537D7; Tue, 8 Apr 2014 14:18:40 +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 DD513168A; Tue, 8 Apr 2014 14:18:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38EIdh6045990; Tue, 8 Apr 2014 14:18:39 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38EIdk4045989; Tue, 8 Apr 2014 14:18:39 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201404081418.s38EIdk4045989@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 8 Apr 2014 14:18:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264259 - head/sys/dev/vt 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 14:18:40 -0000 Author: ray Date: Tue Apr 8 14:18:39 2014 New Revision: 264259 URL: http://svnweb.freebsd.org/changeset/base/264259 Log: Update to fix at r264244. o Unmute terminal when done with driver replacement. o Move init fonts to early point. o Minor cleanup. MFC after: 6 days X-MFC-with: r264244 r264242 Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Tue Apr 8 14:14:25 2014 (r264258) +++ head/sys/dev/vt/vt_core.c Tue Apr 8 14:18:39 2014 (r264259) @@ -720,9 +720,11 @@ vt_flush(struct vt_device *vd) #endif vw = vd->vd_curwindow; - if (vw == NULL) return; + if (vw == NULL) + return; vf = vw->vw_font; - if ((vf == NULL) && !(vd->vd_flags & VDF_TEXTMODE)) return; + if (((vd->vd_flags & VDF_TEXTMODE) == 0) && (vf == NULL)) + return; if (vd->vd_flags & VDF_SPLASH || vw->vw_flags & VWF_BUSY) return; @@ -1891,9 +1893,6 @@ vt_upgrade(struct vt_device *vd) } terminal_maketty(vw->vw_terminal, "v%r", VT_UNIT(vw)); - /* Assign default font to window, if not textmode. */ - if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) - vw->vw_font = vtfont_ref(&vt_font_default); } if (vd->vd_curwindow == NULL) vd->vd_curwindow = vd->vd_windows[VT_CONSWINDOW]; @@ -1914,6 +1913,9 @@ vt_resize(struct vt_device *vd) for (i = 0; i < VT_MAXWINDOWS; i++) { vw = vd->vd_windows[i]; + /* Assign default font to window, if not textmode. */ + if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) + vw->vw_font = vtfont_ref(&vt_font_default); /* Resize terminal windows */ vt_change_font(vw, vw->vw_font); } @@ -1975,8 +1977,10 @@ vt_allocate(struct vt_driver *drv, void vtterm_splash(vd); #endif - if (vd->vd_flags & VDF_ASYNC) + if (vd->vd_flags & VDF_ASYNC) { + terminal_mute(vd->vd_curwindow->vw_terminal, 0); callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ); + } termcn_cnregister(vd->vd_windows[VT_CONSWINDOW]->vw_terminal);