summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordumbbell <dumbbell@FreeBSD.org>2014-08-10 22:24:14 +0000
committerdumbbell <dumbbell@FreeBSD.org>2014-08-10 22:24:14 +0000
commit39f8672844e29fbcba9fffabfc92cdc948a26e43 (patch)
treec36b4437a0586bc99e501a687c6cc5809059caa5
parentd9417510dff7729f07b08522c33c4514cbe65d40 (diff)
downloadFreeBSD-src-39f8672844e29fbcba9fffabfc92cdc948a26e43.zip
FreeBSD-src-39f8672844e29fbcba9fffabfc92cdc948a26e43.tar.gz
Fix two files forgotten in r269783 (vt_generate_cons_palette)
Reported by: bz MFC after: 1 week MFC with: 269783
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3_fbd.c10
-rw-r--r--sys/powerpc/ps3/ps3_syscons.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
index 25d17c7..4828240 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -163,18 +163,18 @@ ipu3_fb_init_cmap(uint32_t *cmap, int bytespp)
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);
}
diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c
index 9cd9068..3b1aea9 100644
--- a/sys/powerpc/ps3/ps3_syscons.c
+++ b/sys/powerpc/ps3/ps3_syscons.c
@@ -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,
OpenPOWER on IntegriCloud