[src/trunk]: src/sys/arch/amiga Defopting grf_cc configuration parameters

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

details:   https://anonhg.NetBSD.org/src/rev/c90664c20f88
branches:  trunk
changeset: 467548:c90664c20f88
user:      is <is%NetBSD.org@localhost>
date:      Thu Mar 25 21:55:17 1999 +0000

description:
Defopting grf_cc configuration parameters

diffstat:

 sys/arch/amiga/amiga/amiga_init.c |   5 ++++-
 sys/arch/amiga/conf/files.amiga   |  12 +++++++++---
 sys/arch/amiga/dev/grfabs_cc.c    |   4 +++-
 sys/arch/amiga/dev/grfabs_ccglb.c |   4 +++-
 sys/arch/amiga/dev/ite_cc.c       |   5 ++++-
 5 files changed, 23 insertions(+), 7 deletions(-)

diffs (99 lines):

diff -r 6f8ea0b33831 -r c90664c20f88 sys/arch/amiga/amiga/amiga_init.c
--- a/sys/arch/amiga/amiga/amiga_init.c Thu Mar 25 21:54:10 1999 +0000
+++ b/sys/arch/amiga/amiga/amiga_init.c Thu Mar 25 21:55:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amiga_init.c,v 1.64 1998/09/07 19:50:17 mhitch Exp $   */
+/*     $NetBSD: amiga_init.c,v 1.65 1999/03/25 21:55:18 is Exp $       */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -30,6 +30,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include "opt_amigaccgrf.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff -r 6f8ea0b33831 -r c90664c20f88 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Thu Mar 25 21:54:10 1999 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Thu Mar 25 21:55:17 1999 +0000
@@ -1,12 +1,18 @@
-#      $NetBSD: files.amiga,v 1.80 1999/03/07 22:16:19 is Exp $
+#      $NetBSD: files.amiga,v 1.81 1999/03/25 21:55:17 is Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16                       # NOTE THAT AMIGA IS SPECIAL!
 
 maxusers 2 8 64
 
-device mainbus {}
-attach mainbus at root
+defopt opt_amigaccgrf.h        GRF_PAL:GRF_NTSC        # temporary workaround
+defopt opt_amigaccgrf.h        GRF_NTSC
+defopt opt_amigaccgrf.h        GRF_ECS GRF_AGA
+defopt opt_amigaccgrf.h        GRF_AGA_VGA:GRF_AGA
+defopt opt_amigaccgrf.h        GRF_SUPER72:GRF_AGA
+
+device mainbus {}
+attach mainbus at root
 
 device cpu
 attach cpu at mainbus
diff -r 6f8ea0b33831 -r c90664c20f88 sys/arch/amiga/dev/grfabs_cc.c
--- a/sys/arch/amiga/dev/grfabs_cc.c    Thu Mar 25 21:54:10 1999 +0000
+++ b/sys/arch/amiga/dev/grfabs_cc.c    Thu Mar 25 21:55:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grfabs_cc.c,v 1.18 1999/03/24 22:24:43 is Exp $        */
+/*     $NetBSD: grfabs_cc.c,v 1.19 1999/03/25 21:55:17 is Exp $        */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -35,6 +35,8 @@
  *
  */
 
+#include "opt_amigaccgrf.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
diff -r 6f8ea0b33831 -r c90664c20f88 sys/arch/amiga/dev/grfabs_ccglb.c
--- a/sys/arch/amiga/dev/grfabs_ccglb.c Thu Mar 25 21:54:10 1999 +0000
+++ b/sys/arch/amiga/dev/grfabs_ccglb.c Thu Mar 25 21:55:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grfabs_ccglb.c,v 1.8 1996/04/28 06:33:58 mhitch Exp $  */
+/*     $NetBSD: grfabs_ccglb.c,v 1.9 1999/03/25 21:55:17 is Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -30,6 +30,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_amigaccgrf.h"
+
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff -r 6f8ea0b33831 -r c90664c20f88 sys/arch/amiga/dev/ite_cc.c
--- a/sys/arch/amiga/dev/ite_cc.c       Thu Mar 25 21:54:10 1999 +0000
+++ b/sys/arch/amiga/dev/ite_cc.c       Thu Mar 25 21:55:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite_cc.c,v 1.25 1996/04/21 21:11:54 veego Exp $        */
+/*     $NetBSD: ite_cc.c,v 1.26 1999/03/25 21:55:17 is Exp $   */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -29,6 +29,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include "opt_amigaccgrf.h"
+
 #include "grfcc.h"
 #if NGRFCC > 0