Change color map and share color map data with kernel part.

This commit is contained in:
takemura 2000-03-20 10:47:33 +00:00
parent 7dbb8560d6
commit 9a04280130
12 changed files with 3284 additions and 2953 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bivideo.c,v 1.3 2000/03/13 18:49:17 uch Exp $ */
/* $NetBSD: bivideo.c,v 1.4 2000/03/20 10:47:33 takemura Exp $ */
/*-
* Copyright (c) 1999
@ -37,7 +37,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1999 Shin Takemura. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$Id: bivideo.c,v 1.3 2000/03/13 18:49:17 uch Exp $";
"$Id: bivideo.c,v 1.4 2000/03/20 10:47:33 takemura Exp $";
#include <sys/param.h>
#include <sys/systm.h>
@ -56,6 +56,8 @@ static const char _rcsid[] __attribute__ ((unused)) =
#include <machine/platid.h>
#include <machine/platid_mask.h>
#include <dev/wscons/wsconsio.h>
#include <arch/hpcmips/dev/hpcfbvar.h>
#include <arch/hpcmips/dev/hpcfbio.h>
#include <arch/hpcmips/dev/bivideovar.h>
@ -268,11 +270,52 @@ bivideo_ioctl(v, cmd, data, flag, p)
int flag;
struct proc *p;
{
int i;
struct bivideo_softc *sc = (struct bivideo_softc *)v;
struct hpcfb_fbconf *fbconf;
struct hpcfb_dspconf *dspconf;
struct wsdisplay_cmap *cmap;
static u_char compo6[6] = { 0, 51, 102, 153, 204, 255 };
switch (cmd) {
case WSDISPLAYIO_GETCMAP:
cmap = (struct wsdisplay_cmap*)data;
if (sc->sc_fbconf.hf_class != HPCFB_CLASS_INDEXCOLOR ||
sc->sc_fbconf.hf_pack_width != 8 ||
256 <= cmap->index ||
256 < (cmap->index + cmap->count))
return (EINVAL);
if (!uvm_useracc(cmap->red, cmap->count, B_WRITE) ||
!uvm_useracc(cmap->green, cmap->count, B_WRITE) ||
!uvm_useracc(cmap->blue, cmap->count, B_WRITE))
return (EFAULT);
for (i = cmap->index; i < cmap->index + cmap->count; i++) {
if (i < 32) {
cmap->red[i] = i;
cmap->green[i] = i;
cmap->blue[i] = i;
} else
if (i < 32 + 6 * 6 * 6) {
cmap->red[i] = compo6[(i - 32) / 36];
cmap->green[i] = compo6[((i - 32) / 6) % 6];
cmap->blue[i] = compo6[(i - 32) % 6];
} else {
cmap->red[i] = 255;
cmap->green[i] = 255;
cmap->blue[i] = 255;
}
}
return (0);
case WSDISPLAYIO_PUTCMAP:
/*
* This driver can't set color map.
*/
return (EINVAL);
case HPCFBIO_GCONF:
fbconf = (struct hpcfb_fbconf *)data;
if (fbconf->hf_conf_index != 0 &&

View File

@ -0,0 +1,94 @@
/* $Id: hpccmap.c,v 1.1 2000/03/20 10:47:33 takemura Exp $ */
/*-
* Copyright (c) 1999
* Shin Takemura and PocketBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the PocketBSD project
* and its contributors.
* 4. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* 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.
*
*/
/*
* Do not edit.
* This file is automatically generated by hpccmap_gen.
*/
#include <arch/hpcmips/dev/hpccmapvar.h>
unsigned char bivideo_cmap_r[256] = {
0,127, 0,127, 0,127, 0,199,127,255, 0,255, 0,255, 0,255,
0, 17, 34, 51, 68, 85,102,119,136,153,170,187,204,221,238,255,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51,102,102,102,102,102,102,102,102,
102,102,102,102,102,102,102,102,102,102,102,102,102,102,102,102,
102,102,102,102,102,102,102,102,102,102,102,102,153,153,153,153,
153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
204,204,204,204,255,255,255,255,255,255,255,255,255,255,255,255,
255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
};
unsigned char bivideo_cmap_g[256] = {
0, 0,127,127, 0, 0,127,199,127, 0,255,255, 0, 0,255,255,
0, 17, 34, 51, 68, 85,102,119,136,153,170,187,204,221,238,255,
0, 0, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51,102,102,102,102,
102,102,153,153,153,153,153,153,204,204,204,204,204,204,255,255,
255,255,255,255, 0, 0, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51,
102,102,102,102,102,102,153,153,153,153,153,153,204,204,204,204,
204,204,255,255,255,255,255,255, 0, 0, 0, 0, 0, 0, 51, 51,
51, 51, 51, 51,102,102,102,102,102,102,153,153,153,153,153,153,
204,204,204,204,204,204,255,255,255,255,255,255, 0, 0, 0, 0,
0, 0, 51, 51, 51, 51, 51, 51,102,102,102,102,102,102,153,153,
153,153,153,153,204,204,204,204,204,204,255,255,255,255,255,255,
0, 0, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51,102,102,102,102,
102,102,153,153,153,153,153,153,204,204,204,204,204,204,255,255,
255,255,255,255, 0, 0, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51,
102,102,102,102,102,102,153,153,153,153,153,153,204,204,204,204,
204,204,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
};
unsigned char bivideo_cmap_b[256] = {
0, 0, 0, 0,127,127,127,199,127, 0, 0, 0,255,255,255,255,
0, 17, 34, 51, 68, 85,102,119,136,153,170,187,204,221,238,255,
0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,
204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,
102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255,
0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,
204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,
102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255,
0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,
204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,
102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255,
0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,
204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,
102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,204,255,
0, 51,102,153,204,255, 0, 51,102,153,204,255, 0, 51,102,153,
204,255, 0, 51,102,153,204,255,255,255,255,255,255,255,255,255,
};

View File

@ -0,0 +1,149 @@
/* $Id: hpccmap_gen.c,v 1.1 2000/03/20 10:47:33 takemura Exp $ */
/*-
* Copyright (c) 1999
* Shin Takemura and PocketBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the PocketBSD project
* and its contributors.
* 4. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* 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.
*
*/
typedef unsigned char u_char;
typedef void (*output_func)(void*, int, u_char, u_char, u_char);
void main(int ac, char *av[]);
void rgb_separate_out(void*, int, u_char, u_char, u_char);
void cmap_gen(output_func, void *);
unsigned char compo6[6] = { 0, 51, 102, 153, 204, 255 };
unsigned char compo7[7] = { 0, 42, 85, 127, 170, 212, 255 };
void
main(ac, av)
int ac;
char *av[];
{
int i;
char *rgb = "rgb";
printf("/*\n");
printf(" * Do not edit.\n");
printf(" * This file is automatically generated by hpccmap_gen.\n");
printf(" */\n");
printf("#include <arch/hpcmips/dev/hpccmapar.h>\n");
for (i = 0; i < 3; i++) {
printf("unsigned char bivideo_cmap_%c[256] = {\n", rgb[i]);
cmap_gen(rgb_separate_out, (void*)i);
printf("};\n");
}
}
void
rgb_separate_out(ctxx, idx, r, g, b)
void* ctxx;
int idx;
unsigned char r, g, b;
{
int rgb = (int)ctxx;
if ((idx % 16) == 0)
printf("\t");
switch(rgb) {
case 0:
printf("%3d,", r);
break;
case 1:
printf("%3d,", g);
break;
case 2:
printf("%3d,", b);
break;
}
if ((idx % 16) == 15)
printf("\n");
}
void
cmap_gen(func, ctx)
output_func func;
void *ctx;
{
int i, r, g, b;
i = 0;
/*
* 0 - 15, for ANSI escape sequence
* (see sys/dev/rasops/rasops.c)
*/
(*func)(ctx, i++, 0x00, 0x00, 0x00); /* black */
(*func)(ctx, i++, 0x7f, 0x00, 0x00); /* red */
(*func)(ctx, i++, 0x00, 0x7f, 0x00); /* green */
(*func)(ctx, i++, 0x7f, 0x7f, 0x00); /* brown */
(*func)(ctx, i++, 0x00, 0x00, 0x7f); /* blue */
(*func)(ctx, i++, 0x7f, 0x00, 0x7f); /* magenta */
(*func)(ctx, i++, 0x00, 0x7f, 0x7f); /* cyan */
(*func)(ctx, i++, 0xc7, 0xc7, 0xc7); /* white */
(*func)(ctx, i++, 0x7f, 0x7f, 0x7f); /* black */
(*func)(ctx, i++, 0xff, 0x00, 0x00); /* red */
(*func)(ctx, i++, 0x00, 0xff, 0x00); /* green */
(*func)(ctx, i++, 0xff, 0xff, 0x00); /* brown */
(*func)(ctx, i++, 0x00, 0x00, 0xff); /* blue */
(*func)(ctx, i++, 0xff, 0x00, 0xff); /* magenta */
(*func)(ctx, i++, 0x00, 0xff, 0xff); /* cyan */
(*func)(ctx, i++, 0xff, 0xff, 0xff); /* white */
/*
* 16 - 31, gray scale
*/
for (; i < 32; i++) {
(*func)(ctx, i, (i - 16) * 17, (i - 16) * 17, (i - 16) * 17);
}
/*
* 32 - 247, RGB color
*/
for (r = 0; r < 6; r++) {
for (g = 0; g < 6; g++) {
for (b = 0; b < 6; b++) {
(*func)(ctx, i,
compo6[r], compo6[g], compo6[b]);
i++;
}
}
}
/*
* 248 - 255, just white
*/
for ( ; i < 256; i++) {
(*func)(ctx, i, 255, 255, 255);
}
}

View File

@ -0,0 +1,39 @@
/* $Id: hpccmapvar.h,v 1.1 2000/03/20 10:47:33 takemura Exp $ */
/*-
* Copyright (c) 1999
* Shin Takemura and PocketBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the PocketBSD project
* and its contributors.
* 4. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* 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.
*
*/
extern unsigned char bivideo_cmap_r[256];
extern unsigned char bivideo_cmap_g[256];
extern unsigned char bivideo_cmap_b[256];

View File

@ -1,4 +1,4 @@
/* $NetBSD: hpcfb.c,v 1.1 2000/03/12 05:04:46 takemura Exp $ */
/* $NetBSD: hpcfb.c,v 1.2 2000/03/20 10:47:34 takemura Exp $ */
/*-
* Copyright (c) 1999
@ -37,7 +37,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1999 Shin Takemura. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$Id: hpcfb.c,v 1.1 2000/03/12 05:04:46 takemura Exp $";
"$Id: hpcfb.c,v 1.2 2000/03/20 10:47:34 takemura Exp $";
#include <sys/param.h>
@ -356,6 +356,8 @@ hpcfb_ioctl(v, cmd, data, flag, p)
wdf->cmsize = 256; /* XXXX */
return 0;
case WSDISPLAYIO_GETCMAP:
case WSDISPLAYIO_PUTCMAP:
case HPCFBIO_GCONF:
case HPCFBIO_SCONF:
case HPCFBIO_GDSPCONF:

View File

@ -0,0 +1 @@
#include "../../dev/hpccmap.c"

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.33 2000/03/19 11:10:57 takemura Exp $ */
/* $NetBSD: main.c,v 1.34 2000/03/20 10:47:35 takemura Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@ -59,7 +59,7 @@
*/
TCHAR *version_string =
TEXT("PocketBSD boot loader\r\n")
TEXT("Version 1.11.0 2000.03.19\r\n")
TEXT("Version 1.12.0 2000.03.20\r\n")
#if ( _WIN32_WCE < 200 )
TEXT("Compiled for WinCE 1.01\r\n")
#else

View File

@ -1,4 +1,4 @@
/* $NetBSD: palette.c,v 1.1 2000/03/19 11:10:58 takemura Exp $ */
/* $NetBSD: palette.c,v 1.2 2000/03/20 10:47:35 takemura Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@ -37,6 +37,8 @@
*/
#include <pbsdboot.h>
#include <arch/hpcmips/dev/hpccmapvar.h>
/*
* If Windows have no color palette, we have nothing to do here.
*/
@ -57,8 +59,6 @@ static void palette_setup(PALETTEENTRY *pal);
enum palette_status palette_succeeded = PAL_NOERROR;
#endif
static u_char compo6[6] = { 0, 51, 102, 153, 204, 255 };
static u_char compo7[7] = { 0, 42, 85, 127, 170, 212, 255 };
static HPALETTE pal = NULL;
void
@ -109,39 +109,13 @@ palette_init(HWND hWnd)
static void
palette_setup(PALETTEENTRY *pal)
{
int i, r, g, b;
int i;
/*
* 0 - 31, gray scale
*/
for (i = 0; i < 32; i++) {
for (i = 0; i < 256; i++) {
pal[i].peFlags = PC_EXPLICIT;
pal[i].peRed = i * 8;
pal[i].peGreen = i * 8;
pal[i].peBlue = i * 8;
}
/*
* 32 - 247, RGB color
*/
for (r = 0; r < 6; r++) {
for (g = 0; g < 6; g++) {
for (b = 0; b < 6; b++) {
pal[i].peFlags = PC_EXPLICIT;
pal[i].peRed = compo6[r];
pal[i].peGreen = compo6[g];
pal[i].peBlue = compo6[b];
i++;
}
}
}
/*
* 248 - 255, just white
*/
for ( ; i < 256; i++) {
pal[i].peFlags = PC_EXPLICIT;
pal[i].peRed = 255;
pal[i].peGreen = 255;
pal[i].peBlue = 255;
pal[i].peRed = bivideo_cmap_r[i];
pal[i].peGreen = bivideo_cmap_g[i];
pal[i].peBlue = bivideo_cmap_b[i];
}
}
#endif /* HAVE_COLOR_PALETTE */

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $NetBSD: pbsdboot.config,v 1.6 2000/03/19 11:10:58 takemura Exp $
# $NetBSD: pbsdboot.config,v 1.7 2000/03/20 10:47:35 takemura Exp $
# config file/script to generate project file (.dsp) for pbsdboot
@ -9,6 +9,7 @@ NAME='pbsdboot'
SRCFILE_LIST='
disptest.c
elf.c
hpccmap.c
layout.c
main.c
mips.c

View File

@ -109,6 +109,10 @@ SOURCE=.\elf.c
# End Source File
# Begin Source File
SOURCE=.\hpccmap.c
# End Source File
# Begin Source File
SOURCE=.\layout.c
# End Source File
# Begin Source File

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff