diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-25 19:04:47 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-25 19:04:47 +0000 |
| commit | b10827af3e24cd3c71ca74f41942c9f7aff3945c (patch) | |
| tree | 5cd616ec019ed156d8f85ff77c885fbe1996b19e /sys/dev/sbus | |
| parent | 48bbde10e0385b5b1c97150234d637538444f51b (diff) | |
Adapt the framebuffer code to the WSDISPLAY_TYPE constant changes, and
add the necessary magic for wsemul_sun color handling.
Initially based on a patch from jason@, then some tinkering by me.
Diffstat (limited to 'sys/dev/sbus')
| -rw-r--r-- | sys/dev/sbus/bwtwo.c | 6 | ||||
| -rw-r--r-- | sys/dev/sbus/cgsix.c | 8 | ||||
| -rw-r--r-- | sys/dev/sbus/cgthree.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c index 6c993656e49..d6583af0324 100644 --- a/sys/dev/sbus/bwtwo.c +++ b/sys/dev/sbus/bwtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwtwo.c,v 1.1 2002/06/04 19:42:53 jason Exp $ */ +/* $OpenBSD: bwtwo.c,v 1.2 2002/07/25 19:04:46 miod Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -304,7 +304,7 @@ bwtwo_ioctl(v, cmd, data, flags, p) switch (cmd) { case WSDISPLAYIO_GTYPE: - *(u_int *)data = WSDISPLAY_TYPE_UNKNOWN; + *(u_int *)data = WSDISPLAY_TYPE_SUNBW; break; case WSDISPLAYIO_GINFO: wdf = (void *)data; @@ -319,7 +319,7 @@ bwtwo_ioctl(v, cmd, data, flags, p) case WSDISPLAYIO_GETCMAP: case WSDISPLAYIO_PUTCMAP: - return (-1); + break; case WSDISPLAYIO_SVIDEO: case WSDISPLAYIO_GVIDEO: diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c index 31e03b645aa..de4fe1a21d6 100644 --- a/sys/dev/sbus/cgsix.c +++ b/sys/dev/sbus/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.21 2002/06/03 02:32:06 jason Exp $ */ +/* $OpenBSD: cgsix.c,v 1.22 2002/07/25 19:04:46 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -365,7 +365,7 @@ cgsixattach(parent, self, aux) cgsix_stdscreen.ncols = sc->sc_rasops.ri_cols; cgsix_stdscreen.textops = &sc->sc_rasops.ri_ops; sc->sc_rasops.ri_ops.alloc_attr(&sc->sc_rasops, - WSCOL_WHITE, WSCOL_BLACK, WSATTR_WSCOLORS, &defattr); + WSCOL_BLACK, WSCOL_WHITE, WSATTR_WSCOLORS, &defattr); printf("\n"); @@ -373,7 +373,7 @@ cgsixattach(parent, self, aux) int *ccolp, *crowp; cgsix_setcolor(sc, WSCOL_BLACK, 0, 0, 0); - cgsix_setcolor(sc, 255, 255, 255, 255); + cgsix_setcolor(sc, 255, 0, 0, 0); cgsix_setcolor(sc, WSCOL_RED, 255, 0, 0); cgsix_setcolor(sc, WSCOL_GREEN, 0, 255, 0); cgsix_setcolor(sc, WSCOL_BROWN, 154, 85, 46); @@ -489,7 +489,7 @@ cgsix_alloc_screen(v, type, cookiep, curxp, curyp, attrp) *curyp = 0; *curxp = 0; sc->sc_rasops.ri_ops.alloc_attr(&sc->sc_rasops, - WSCOL_WHITE, WSCOL_BLACK, WSATTR_WSCOLORS, attrp); + WSCOL_BLACK, WSCOL_WHITE, WSATTR_WSCOLORS, attrp); sc->sc_nscreens++; return (0); } diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c index a9c8c9a19c6..e799263e809 100644 --- a/sys/dev/sbus/cgthree.c +++ b/sys/dev/sbus/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.18 2002/06/03 02:32:06 jason Exp $ */ +/* $OpenBSD: cgthree.c,v 1.19 2002/07/25 19:04:46 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -301,7 +301,7 @@ cgthreeattach(parent, self, aux) cgthree_stdscreen.ncols = sc->sc_rasops.ri_cols; cgthree_stdscreen.textops = &sc->sc_rasops.ri_ops; sc->sc_rasops.ri_ops.alloc_attr(&sc->sc_rasops, - WSCOL_WHITE, WSCOL_BLACK, WSATTR_WSCOLORS, &defattr); + WSCOL_BLACK, WSCOL_WHITE, WSATTR_WSCOLORS, &defattr); printf("\n"); @@ -417,7 +417,7 @@ cgthree_alloc_screen(v, type, cookiep, curxp, curyp, attrp) *curyp = 0; *curxp = 0; sc->sc_rasops.ri_ops.alloc_attr(&sc->sc_rasops, - WSCOL_WHITE, WSCOL_BLACK, WSATTR_WSCOLORS, attrp); + WSCOL_BLACK, WSCOL_WHITE, WSATTR_WSCOLORS, attrp); sc->sc_nscreens++; return (0); } |