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

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

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

description:
pullup 1.14, approved by thorpej

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

diffstat:

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

diffs (31 lines):

diff -r ac9935b6fc26 -r 16c92dbab9bf sys/arch/next68k/include/cpu.h
--- a/sys/arch/next68k/include/cpu.h    Fri Oct 06 23:18:14 2000 +0000
+++ b/sys/arch/next68k/include/cpu.h    Fri Oct 06 23:18:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.12 2000/05/26 21:20:03 thorpej Exp $ */
+/*     $NetBSD: cpu.h,v 1.12.4.1 2000/10/06 23:18:48 deberg Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -299,7 +299,10 @@
 #define NEXT_P_MEMSIZE         0x04000000
 #define NEXT_P_VIDEOMEM                (NEXT_SLOT_ID+0x0b000000)
 #define NEXT_P_VIDEOSIZE       0x0003a800
+#if 0
 #define NEXT_P_C16_VIDEOMEM    (NEXT_SLOT_ID+0x06000000)       /* COLOR_FB */
+#endif
+#define NEXT_P_C16_VIDEOMEM    (0x2c000000)
 #define NEXT_P_C16_VIDEOSIZE   0x001D4000              /* COLOR_FB */
 #define NEXT_P_WF4VIDEO                (NEXT_SLOT_ID+0x0c000000)       /* w A+B-AB function */
 #define NEXT_P_WF3VIDEO                (NEXT_SLOT_ID+0x0d000000)       /* w (1-A)B function */
@@ -390,8 +393,8 @@
 #define        INTIOTOP        (0x02120000)
 #define MONOBASE        (0x0b000000)
 #define MONOTOP         (0x0b03a800)
-#define COLORBASE      (0x06000000)
-#define COLORTOP       (0x061D4000)
+#define COLORBASE      (0x2c000000)
+#define COLORTOP       (0x2c1D4000)
                                      
 #define NEXT_INTR_BITS \
 
"\20\40NMI\37PFAIL\36TIMER\35ENETX_DMA\34ENETR_DMA\33SCSI_DMA\32DISK_DMA\31PRINTER_DMA\30SOUND_OUT_DMA\27SOUND_IN_DMA\26SCC_DMA\25DSP_DMA\24M2R_DMA\23R2M_DMA\22SCC\21REMOTE\20BUS\17DSP_4\16DISK|C16_VIDEO\15SCSI\14PRINTER\13ENETX\12ENETR\11SOUND_OVRUN\10PHONE\07DSP_3\06VIDEO\05MONITOR\04KYBD_MOUSE\03POWER\02SOFTINT1\01SOFTINT0"