From f08eca2b03584c9643ed73221ab3072129c6c22e Mon Sep 17 00:00:00 2001
From: veego <veego@NetBSD.org>
Date: Sun, 19 Oct 1997 19:20:30 +0000
Subject: [PATCH] Add CyberVision 64/3D support.

---
 sys/arch/amiga/conf/GENERIC     | 18 +++++++++++-------
 sys/arch/amiga/conf/files.amiga |  8 +++++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 5081c3159b5f..620b5b75cd44 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.92 1997/10/18 23:31:32 is Exp $
+#	$NetBSD: GENERIC,v 1.93 1997/10/19 19:20:30 veego Exp $
 
 #
 # GENERIC AMIGA
@@ -69,9 +69,9 @@ file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union filesystem
 
 # Filesystem options
-options		NFSSERVER	# Network File System server side code
-options		FIFO		# FIFOs; RECOMMENDED
-options		QUOTA		# User and group quotas in FFS
+options 	NFSSERVER	# Network File System server side code
+options 	FIFO		# FIFOs; RECOMMENDED
+options 	QUOTA		# User and group quotas in FFS
 
 #
 # Compatability options for various existing systems
@@ -132,6 +132,7 @@ options 	ULOWELLCONSOLE	# enable code to allow a2410 to be console
 options 	CL5426CONSOLE	# Cirrus console
 options 	CV64CONSOLE	# CyberVision console
 options 	TSENGCONSOLE	# Tseng console
+#options 	CV3DCONSOLE	# CyberVision 3D console [BROKEN]
 
 options 	GRF_ECS		# Enhanced Chip Set
 options 	GRF_NTSC	# NTSC
@@ -166,6 +167,7 @@ grfcl*		at zbus0		# Picasso II/Piccalo/Spectrum
 grful0		at zbus0		# A2410
 grfcv0		at zbus0		# CyberVision 64
 grfet*		at zbus0		# Tseng (oMniBus, Domino, Merlin)
+grfcv3d0	at zbus0		# CyberVision 64/3D
 
 grf0		at grfcc0
 grf1		at grfrt0
@@ -174,6 +176,7 @@ grf3		at grfcl?
 grf4		at grful0
 grf5		at grfcv0
 grf6		at grfet?
+grf7		at grfcv3d0
 
 ite0		at grf0			# terminal emulators for grf's
 ite1		at grf1			# terminal emulators for grf's
@@ -182,6 +185,7 @@ ite3		at grf3			# terminal emulators for grf's
 ite4		at grf4			# terminal emulators for grf's
 ite5		at grf5			# terminal emulators for grf's
 ite6		at grf6			# terminal emulators for grf's
+#ite7		at grf6			# Do not use it now. [BROKEN]
 
 msc0		at zbus0		# A2232 MSC multiport serial.
 mfc0		at zbus0		# MultiFaceCard I/O board
@@ -237,10 +241,10 @@ afsc0		at zbus0		# A4091 scsi
 aftsc0		at mainbus0		# A4000T scsi
 flsc0		at zbus0		# FastlaneZ3 scsi
 bzsc0		at zbus0		# Blizzard 1230 I,II scsi 
-bzivsc0		at zbus0		# Blizzard 12x0 IV scsi 
-bztzsc0		at zbus0		# Blizzard 2060 scsi
+bzivsc0 	at zbus0		# Blizzard 12x0 IV scsi 
+bztzsc0 	at zbus0		# Blizzard 2060 scsi
 cbsc0		at zbus0		# CyberSCSI I
-cbiisc0		at zbus0		# CyberSCSI II
+cbiisc0 	at zbus0		# CyberSCSI II
 empsc0		at zbus0		# Emplant scsi
 idesc0		at mainbus0		# A4000 & A1200 IDE
 drsc0		at mainbus0		# DraCo scsi
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index 4f9c699ee3ae..363deb1c7758 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amiga,v 1.69 1997/10/18 23:31:37 is Exp $
+#	$NetBSD: files.amiga,v 1.70 1997/10/19 19:20:34 veego Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
@@ -136,6 +136,12 @@ attach	grfet at zbus
 file	arch/amiga/dev/grf_et.c		grfet needs-flag
 file	arch/amiga/dev/ite_et.c		grfet & ite
 
+# CyberVison 64/3D grf (ite7 grf7)
+device	grfcv3d: grfbus
+attach	grfcv3d at zbus
+file	arch/amiga/dev/grf_cv3d.c	grfcv3d needs-flag
+file	arch/amiga/dev/ite_cv3d.c	grfcv3d & ite
+
 # device defined in sys/conf/files
 # A2065, Ameristar, Ariadne ethernet cards
 attach	le at zbus with le_zbus