From owner-svn-src-head@FreeBSD.ORG Sun Aug 10 22:24:15 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 1C7368F5 for ; Sun, 10 Aug 2014 22:24:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E08F52702 for ; Sun, 10 Aug 2014 22:24:14 +0000 (UTC) Received: from dumbbell (uid 1042) (envelope-from dumbbell@FreeBSD.org) id 23d4 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 10 Aug 2014 22:24:14 +0000 From: Jean-Sebastien Pedron Date: Sun, 10 Aug 2014 22:24:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269791 - in head/sys: arm/freescale/imx powerpc/ps3 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e7f10e.23d4.5ab585c1@svn.freebsd.org> X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 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: Sun, 10 Aug 2014 22:24:15 -0000 Author: dumbbell Date: Sun Aug 10 22:24:14 2014 New Revision: 269791 URL: http://svnweb.freebsd.org/changeset/base/269791 Log: Fix two files forgotten in r269783 (vt_generate_cons_palette) Reported by: bz MFC after: 1 week MFC with: 269783 Modified: head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c head/sys/powerpc/ps3/ps3_syscons.c Modified: head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c ============================================================================== --- head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Sun Aug 10 21:45:58 2014 (r269790) +++ head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Sun Aug 10 22:24:14 2014 (r269791) @@ -163,18 +163,18 @@ ipu3_fb_init_cmap(uint32_t *cmap, int by switch (bytespp) { case 8: - return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB, 0x7, 5, 0x7, 2, 0x3, 0)); case 15: - return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB, 0x1f, 10, 0x1f, 5, 0x1f, 0)); case 16: - return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, + return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB, 0x1f, 11, 0x3f, 5, 0x1f, 0)); case 24: case 32: /* Ignore alpha. */ - return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB, - 0xff, 16, 0xff, 8, 0xff, 0)); + return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB, + 0xff, 0, 0xff, 8, 0xff, 16)); default: return (1); } Modified: head/sys/powerpc/ps3/ps3_syscons.c ============================================================================== --- head/sys/powerpc/ps3/ps3_syscons.c Sun Aug 10 21:45:58 2014 (r269790) +++ head/sys/powerpc/ps3/ps3_syscons.c Sun Aug 10 22:24:14 2014 (r269791) @@ -178,8 +178,8 @@ ps3fb_init(struct vt_device *vd) sc->fb_info.fb_vbase = 0x10000000; /* 32-bit VGA palette */ - vt_generate_vga_palette(sc->fb_info.fb_cmap, COLOR_FORMAT_RGB, - 255, 16, 255, 8, 255, 0); + vt_generate_cons_palette(sc->fb_info.fb_cmap, COLOR_FORMAT_RGB, + 255, 0, 255, 8, 255, 16); /* Set correct graphics context */ lv1_gpu_context_attribute(sc->sc_fbcontext,