From owner-svn-src-all@FreeBSD.ORG Sun Dec 8 22:49:13 2013 Return-Path: Delivered-To: svn-src-all@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 C3394253; Sun, 8 Dec 2013 22:49:13 +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 A3ACF15C2; Sun, 8 Dec 2013 22:49:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8MnDjA086351; Sun, 8 Dec 2013 22:49:13 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8MnD37086348; Sun, 8 Dec 2013 22:49:13 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201312082249.rB8MnD37086348@svn.freebsd.org> From: Aleksandr Rybalko Date: Sun, 8 Dec 2013 22:49:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259110 - in head/sys: conf 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 22:49:13 -0000 Author: ray Date: Sun Dec 8 22:49:12 2013 New Revision: 259110 URL: http://svnweb.freebsd.org/changeset/base/259110 Log: o Build syscons(9)'s splash support if both sc and splash are enabled. o Include opt_splash.h for vt(9) to know when splash device is enabled. o Build logo_freebsd.c only if splash and vt are enabled. o Include opt_compat.h to know when we have to respect compatibility. Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/files head/sys/dev/vt/vt.h head/sys/dev/vt/vt_core.c Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Dec 8 21:59:46 2013 (r259109) +++ head/sys/conf/files Sun Dec 8 22:49:12 2013 (r259110) @@ -1398,7 +1398,7 @@ dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/fbd.c optional fbd | vt dev/fb/fb_if.m standard -dev/fb/splash.c optional splash +dev/fb/splash.c optional sc splash dev/fdt/fdt_common.c optional fdt dev/fdt/fdt_ic_if.m optional fdt dev/fdt/fdt_pci.c optional fdt pci @@ -2468,7 +2468,7 @@ dev/vt/font/vt_font_default.c optional v dev/vt/font/vt_mouse_cursor.c optional vt dev/vt/hw/fb/vt_fb.c optional vt dev/vt/hw/vga/vga.c optional vt vt_vga -dev/vt/logo/logo_freebsd.c optional vt +dev/vt/logo/logo_freebsd.c optional vt splash dev/vt/vt_buf.c optional vt dev/vt/vt_consolectl.c optional vt dev/vt/vt_core.c optional vt Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Sun Dec 8 21:59:46 2013 (r259109) +++ head/sys/dev/vt/vt.h Sun Dec 8 22:49:12 2013 (r259110) @@ -46,7 +46,9 @@ #include #include +#include "opt_compat.h" #include "opt_syscons.h" +#include "opt_splash.h" #ifndef VT_MAXWINDOWS #ifdef MAXCONS Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Sun Dec 8 21:59:46 2013 (r259109) +++ head/sys/dev/vt/vt_core.c Sun Dec 8 22:49:12 2013 (r259110) @@ -794,6 +794,7 @@ vtterm_done(struct terminal *tm) } } +#ifdef DEV_SPLASH static void vtterm_splash(struct vt_device *vd) { @@ -813,6 +814,7 @@ vtterm_splash(struct vt_device *vd) vd->vd_flags |= VDF_SPLASH; } } +#endif static void vtterm_cnprobe(struct terminal *tm, struct consdev *cp) @@ -845,7 +847,9 @@ vtterm_cnprobe(struct terminal *tm, stru vt_winsize(vd, vw->vw_font, &wsz); terminal_set_winsize(tm, &wsz); +#ifdef DEV_SPLASH vtterm_splash(vd); +#endif vd->vd_flags |= VDF_INITIALIZED; main_vd = vd; @@ -1788,8 +1792,10 @@ vt_allocate(struct vt_driver *drv, void /* Refill settings with new sizes. */ vt_resize(vd); +#ifdef DEV_SPLASH if (vd->vd_flags & VDF_SPLASH) vtterm_splash(vd); +#endif if (vd->vd_curwindow != NULL) callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);