From owner-svn-src-head@freebsd.org Mon Jul 27 14:03:36 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B163E9AC402; Mon, 27 Jul 2015 14:03:36 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.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 8F338C0B; Mon, 27 Jul 2015 14:03:36 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6RE3aTU086959; Mon, 27 Jul 2015 14:03:36 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6RE3ZO5086956; Mon, 27 Jul 2015 14:03:35 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201507271403.t6RE3ZO5086956@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Mon, 27 Jul 2015 14:03:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285911 - in head/sys/dev/vt/hw: efifb fb 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.20 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, 27 Jul 2015 14:03:36 -0000 Author: marius Date: Mon Jul 27 14:03:34 2015 New Revision: 285911 URL: https://svnweb.freebsd.org/changeset/base/285911 Log: - Nuke dupe $FreeBSD$. - Fix whitespace. MFC after: 3 days Modified: head/sys/dev/vt/hw/efifb/efifb.c head/sys/dev/vt/hw/fb/vt_early_fb.c head/sys/dev/vt/hw/fb/vt_fb.c Modified: head/sys/dev/vt/hw/efifb/efifb.c ============================================================================== --- head/sys/dev/vt/hw/efifb/efifb.c Mon Jul 27 13:17:57 2015 (r285910) +++ head/sys/dev/vt/hw/efifb/efifb.c Mon Jul 27 14:03:34 2015 (r285911) @@ -25,8 +25,6 @@ * 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 @@ -178,4 +176,3 @@ vt_efifb_remap(void *xinfo) info->fb_vbase = (intptr_t)pmap_mapdev_attr(info->fb_pbase, info->fb_size, VM_MEMATTR_WRITE_COMBINING); } - Modified: head/sys/dev/vt/hw/fb/vt_early_fb.c ============================================================================== --- head/sys/dev/vt/hw/fb/vt_early_fb.c Mon Jul 27 13:17:57 2015 (r285910) +++ head/sys/dev/vt/hw/fb/vt_early_fb.c Mon Jul 27 14:03:34 2015 (r285911) @@ -25,8 +25,6 @@ * 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 @@ -127,7 +125,7 @@ vt_efb_initialize(struct fb_info *info) default: panic("Unknown color space fb_depth %d", info->fb_depth); break; - } + } } static phandle_t @@ -213,9 +211,9 @@ vt_efb_init(struct vt_device *vd) if (len == -1) { len = OF_getprop(OF_parent(node), "assigned-addresses", pciaddrs, sizeof(pciaddrs)); - } - if (len == -1) - len = 0; + } + if (len == -1) + len = 0; n_pciaddrs = len / sizeof(struct ofw_pci_register); /* @@ -283,7 +281,7 @@ vt_efb_init(struct vt_device *vd) BUS_SPACE_MAP_PREFETCHABLE, (bus_space_handle_t *)&info->fb_vbase); #endif - } + } /* blank full size */ len = info->fb_size / 4; Modified: head/sys/dev/vt/hw/fb/vt_fb.c ============================================================================== --- head/sys/dev/vt/hw/fb/vt_fb.c Mon Jul 27 13:17:57 2015 (r285910) +++ head/sys/dev/vt/hw/fb/vt_fb.c Mon Jul 27 14:03:34 2015 (r285911) @@ -25,8 +25,6 @@ * 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 @@ -188,7 +186,6 @@ vt_fb_setpixel(struct vt_device *vd, int /* panic? */ return; } - } void