Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcmips Change color map and share color map data w...
details: https://anonhg.NetBSD.org/src/rev/49255575277e
branches: trunk
changeset: 483890:49255575277e
user: takemura <takemura%NetBSD.org@localhost>
date: Mon Mar 20 10:47:33 2000 +0000
description:
Change color map and share color map data with kernel part.
diffstat:
sys/arch/hpcmips/dev/bivideo.c | 47 +-
sys/arch/hpcmips/dev/hpccmap.c | 94 +
sys/arch/hpcmips/dev/hpccmap_gen.c | 149 +
sys/arch/hpcmips/dev/hpccmapvar.h | 39 +
sys/arch/hpcmips/dev/hpcfb.c | 6 +-
sys/arch/hpcmips/stand/pbsdboot/hpccmap.c | 1 +
sys/arch/hpcmips/stand/pbsdboot/main.c | 4 +-
sys/arch/hpcmips/stand/pbsdboot/palette.c | 42 +-
sys/arch/hpcmips/stand/pbsdboot/pbsdboot.config | 3 +-
sys/arch/hpcmips/stand/pbsdboot/pbsdboot.dsp | 4 +
sys/arch/hpcmips/stand/pbsdboot/pbsdboot.uu | 3426 +++++++++++-----------
sys/arch/hpcmips/stand/pbsdboot/pbsdboot1.uu | 2512 ++++++++--------
12 files changed, 3329 insertions(+), 2998 deletions(-)
diffs (truncated from 7131 to 300 lines):
diff -r f2aa4de3f44c -r 49255575277e sys/arch/hpcmips/dev/bivideo.c
--- a/sys/arch/hpcmips/dev/bivideo.c Mon Mar 20 08:07:52 2000 +0000
+++ b/sys/arch/hpcmips/dev/bivideo.c Mon Mar 20 10:47:33 2000 +0000
@@ -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 @@
#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 @@
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 &&
diff -r f2aa4de3f44c -r 49255575277e sys/arch/hpcmips/dev/hpccmap.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcmips/dev/hpccmap.c Mon Mar 20 10:47:33 2000 +0000
@@ -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,
+};
diff -r f2aa4de3f44c -r 49255575277e sys/arch/hpcmips/dev/hpccmap_gen.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcmips/dev/hpccmap_gen.c Mon Mar 20 10:47:33 2000 +0000
@@ -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 */
Home |
Main Index |
Thread Index |
Old Index