[src/netbsd-1-5]: src/sys/arch/next68k/include pullup 1.6, approved by thorpej

[deberg <deberg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac9935b6fc26
branches:  netbsd-1-5
changeset: 489691:ac9935b6fc26
user:      deberg <deberg%NetBSD.org@localhost>
date:      Fri Oct 06 23:18:14 2000 +0000

description:
pullup 1.6, approved by thorpej

add support for 12-bit color displays, from Timm Wetzel w/ changes by
me.  closes 10741.

diffstat:

 sys/arch/next68k/include/bus_space.h |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 5b965c06f962 -r ac9935b6fc26 sys/arch/next68k/include/bus_space.h
--- a/sys/arch/next68k/include/bus_space.h      Fri Oct 06 23:17:36 2000 +0000
+++ b/sys/arch/next68k/include/bus_space.h      Fri Oct 06 23:18:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.h,v 1.5 1999/04/10 14:06:27 drochner Exp $   */
+/*     $NetBSD: bus_space.h,v 1.5.12.1 2000/10/06 23:18:14 deberg Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -83,9 +83,11 @@
 #define NEXT68K_INTIO_BUS_SPACE        intiobase
 
 /*
- * Value for the next68k mono video bus space tag, not to be used directly by MI code.
+ * Values for the next68k video bus space tags, not to be used directly
+ * by MI code.
  */
 #define NEXT68K_MONO_VIDEO_BUS_SPACE   monobase
+#define NEXT68K_COLOR_VIDEO_BUS_SPACE  colorbase
 
 /*
  * Mapping and unmapping operations.
@@ -95,7 +97,8 @@
      ((*(hp)=(bus_space_handle_t)((t)+((a)-INTIOBASE))),0) :            \
      ((((a)>=MONOBASE)&&((a)+(s)<MONOTOP)) ?                          \
       ((*(hp)=(bus_space_handle_t)((t)+((a)-MONOBASE))),0) :           \
-      (-1)))
+      ((((a)>=COLORBASE)&&((a)+(s)<COLORTOP)) ?                         \
+       ((*(hp)=(bus_space_handle_t)((t)+((a)-COLORBASE))),0) : (-1))))
 
 #define        bus_space_unmap(t, h, s)