[src/trunk]: src/sys/arch/pmax/dev - Add some extra TC ID strings that we sho...

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

details:   https://anonhg.NetBSD.org/src/rev/8b5ecd265c28
branches:  trunk
changeset: 480491:8b5ecd265c28
user:      ad <ad%NetBSD.org@localhost>
date:      Fri Jan 14 02:00:46 2000 +0000

description:
- Add some extra TC ID strings that we should recognise. From simonb.
- Function definition and RCS ID spacing.
- Fix multiple inclusion goo to be like the new order of things.

diffstat:

 sys/arch/pmax/dev/px.c    |  46 +++++++++++++---------------------------------
 sys/arch/pmax/dev/pxreg.h |   8 ++++----
 sys/arch/pmax/dev/pxvar.h |   8 ++++----
 3 files changed, 21 insertions(+), 41 deletions(-)

diffs (truncated from 328 to 300 lines):

diff -r 56b1cda98e67 -r 8b5ecd265c28 sys/arch/pmax/dev/px.c
--- a/sys/arch/pmax/dev/px.c    Fri Jan 14 01:04:24 2000 +0000
+++ b/sys/arch/pmax/dev/px.c    Fri Jan 14 02:00:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: px.c,v 1.26 2000/01/10 03:24:33 simonb Exp $   */
+/*     $NetBSD: px.c,v 1.27 2000/01/14 02:00:46 ad Exp $       */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.26 2000/01/10 03:24:33 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.27 2000/01/14 02:00:46 ad Exp $");
 
 /*
  * px.c: driver for the DEC TURBOchannel 2D and 3D accelerated framebuffers
@@ -64,12 +64,17 @@
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
+
 #include <miscfs/specfs/specdev.h>
 
 #include <dev/cons.h>
+
 #include <dev/ic/bt459reg.h>
+
 #include <dev/tc/tcvar.h>
+
 #include <dev/rcons/rcons.h>
+
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wsfont/wsfont.h>
@@ -120,9 +125,12 @@
 
 /* The different types of card that we support, for px_match(). */
 static const char *px_types[] = {
-       "PMAG-CA ",
-       "PMAG-DA ",
-       "PMAG-FA ",     /* XXX um, does this ever get reported? */
+       "PMAG-CA ",     /* 2DA */
+       "PMAG-DA ",     /* LM-3DA */
+       "PMAG-FA ",     /* HE-3DA */
+       "PMAG-FB ",     /* HE+3DA */
+       "PMAGB-FA",     /* HE+3DA */
+       "PMAGB-FB",     /* HE+3DA */
 };
 
 #define NUM_PX_TYPES (sizeof(px_types) / sizeof(px_types[0]))
@@ -270,7 +278,6 @@
        return (0);
 }
 
-
 /*
  * Attach the graphics board.
  */
@@ -320,7 +327,6 @@
        printf("\n");
 }
 
-
 /*
  * Initialize the graphics board. This can be called from tc_findcons and
  * the pmax console trickery, in which case ``fi'' will be null.
@@ -422,7 +428,6 @@
        return 1;
 }
 
-
 /*
  * Initalize our DISGUSTING little hack so we can use the qvss event-buffer
  * stuff for the X server.
@@ -455,7 +460,6 @@
        init_pmaxfbu(fi);
 }
 
-
 /*
  * Initialize the Brooktree 459 VDAC.
  */
@@ -524,7 +528,6 @@
        }
 }
 
-
 /*
  * Determine the number of planes supported by the given buffer.
  * XXX should know this from module name
@@ -564,7 +567,6 @@
        /* Don't give a damn about Z-buffers... */
        panic("px_probe_planes: (buf != 0) was un-implemented (bloat)");
 }
-       
 
 /*
  * Figure out how much SRAM the PXG has: 128KB or 256KB.
@@ -704,7 +706,6 @@
 #endif
 }
 
-
 /*
  * Make a cursor matching the current font dimensions.
  */
@@ -732,7 +733,6 @@
        }
 }
 
-
 /*
  * Convert a 16x16 cursor from the Xserver.
  */
@@ -757,7 +757,6 @@
        }
 }
 
-
 /*
  * Load a single byte into the cursor map.
  */
@@ -781,7 +780,6 @@
        }
 }
 
-
 /*
  * Load the cursor image.
  */
@@ -812,7 +810,6 @@
        }
 }
 
-
 /*
  * Load the colormap.
  */
@@ -839,7 +836,6 @@
                BT459_WRITE_CMAP(vdac, DUPBYTE0(*p));
 }
 
-
 /*
  * Flush any pending updates to the bt459. This gets called during vblank
  * on the PX to prevent shearing/snow. The PXG always has to flush.
@@ -923,7 +919,6 @@
        pxi->pxi_dirty = 0;
 }
 
-
 /*
  * PixelStamp board interrupt handler. We can get more than one interrupt
  * at a time (i.e. packet+vertical retrace) so we don't return after
@@ -1047,7 +1042,6 @@
        return (0);
 }
 
-
 /*
  * Allocate a PixelStamp packet buffer.
  */
@@ -1138,7 +1132,6 @@
        return buf;
 }
 
-
 /*
  * Send a PixelStamp packet.
  */
@@ -1209,7 +1202,6 @@
        return (-*poll);
 }
 
-
 /*
  * Draw a 'flat' rectangle
  */
@@ -1237,7 +1229,6 @@
        return px_send_packet(pxi, pb);
 }
 
-
 /*
  * Allocate attribute. We just pack these into an integer.
  */
@@ -1265,7 +1256,6 @@
        return 0;
 }
 
-
 /*
  * Erase columns
  */
@@ -1300,7 +1290,6 @@
        px_send_packet(pxi, pb);
 }
 
-
 /*
  * Erase rows
  */
@@ -1334,7 +1323,6 @@
        px_send_packet(pxi, pb);
 }
 
-
 /*
  * Copy rows.
  */
@@ -1397,7 +1385,6 @@
        }
 }
 
-
 /*
  * Copy columns.
  */
@@ -1444,7 +1431,6 @@
        px_send_packet(pxi, pbs);
 }
 
-
 /*
  * Blit a character at the specified co-ordinates.
  */
@@ -1567,7 +1553,6 @@
        px_send_packet(pxi, pb);
 }
 
-
 /*
  * Map a character.
  */
@@ -1595,7 +1580,6 @@
        return (5);
 }
 
-
 /*
  * Position|{enable|disable} the cursor at the specified location.
  */
@@ -1636,7 +1620,6 @@
                px_bt459_flush(pxi);
 }
 
-
 /*
  * Move the cursor for qvss. This is disgusting.
  */
@@ -1656,7 +1639,6 @@
                px_bt459_flush(pxi);
 }
 
-
 int
 pxopen(dev, flag, mode, p)
        dev_t dev;
@@ -1860,7 +1842,6 @@
        return (0);
 }
 
-
 int
 pxpoll(dev, events, p)
        dev_t dev;
@@ -1920,7 +1901,6 @@
        return (-1);
 }
 
-
 /*
  * mmap info struct for this card into userspace.
  */
diff -r 56b1cda98e67 -r 8b5ecd265c28 sys/arch/pmax/dev/pxreg.h
--- a/sys/arch/pmax/dev/pxreg.h Fri Jan 14 01:04:24 2000 +0000
+++ b/sys/arch/pmax/dev/pxreg.h Fri Jan 14 02:00:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pxreg.h,v 1.6 1999/05/18 21:51:58 ad Exp $ */
+/*     $NetBSD: pxreg.h,v 1.7 2000/01/14 02:00:46 ad Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PXREG_H_
-#define _PXREG_H_ 1
+#ifndef _PMAX_DEV_PXREG_H_
+#define _PMAX_DEV_PXREG_H_
 
 /*
  * Definitions for the PixelStamp on Digital's 2D and 3D TurboChannel
@@ -366,4 +366,4 @@
        return (volatile int32_t *)(slotbase + px_sys2dma(addr));
 }