[src/trunk]: src/sys/arch/atari/conf Restructure the ite/grf definitions:

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

details:   https://anonhg.NetBSD.org/src/rev/88a3c86f6e21
branches:  trunk
changeset: 481346:88a3c86f6e21
user:      leo <leo%NetBSD.org@localhost>
date:      Wed Jan 26 14:56:40 2000 +0000

description:
Restructure the ite/grf definitions:
  - Make the ite<n> -> grfXX<n> relations explicit. This solves problems
    with the newer autoconf code.
  - Nuke the grfcc definition in std.atari. A Hades has not grfcc...

diffstat:

 sys/arch/atari/conf/ATARITT   |  12 +++++++-----
 sys/arch/atari/conf/BOOT      |   4 +++-
 sys/arch/atari/conf/BOOTX     |  12 +++++++-----
 sys/arch/atari/conf/FALCON    |  10 +++++++---
 sys/arch/atari/conf/GENERIC   |   8 ++++++--
 sys/arch/atari/conf/HADES     |  10 +++++-----
 sys/arch/atari/conf/std.atari |   4 +---
 7 files changed, 36 insertions(+), 24 deletions(-)

diffs (172 lines):

diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/ATARITT
--- a/sys/arch/atari/conf/ATARITT       Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/ATARITT       Wed Jan 26 14:56:40 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: ATARITT,v 1.29 1999/09/16 12:00:04 leo Exp $
+#      $NetBSD: ATARITT,v 1.30 2000/01/26 14:56:40 leo Exp $
 #
 # ATARI-TT
 #
@@ -109,9 +109,11 @@
 fd0    at fdc0 unit 0          # builtin floppy drive
 fd1    at fdc0 unit 1          # external floppy drive
 zs0    at mainbus0             # Serial support through 8530
-grfcc1 at grfbus0              # second graphics driver
-ite*   at grfcc1               # second tty
-grfcc2 at grfbus0              # third graphics driver
-ite*   at grfcc2               # third tty
+grfcc0 at grfbus0              # graphics driver
+ite0   at grfcc0               # console
+grfcc1 at grfbus0              # 2nd graphics driver
+ite1   at grfcc1               # 2nd tty
+grfcc2 at grfbus0              # 3rd graphics driver
+ite2   at grfcc2               # 3rd tty
 nvr0   at mainbus0             # nvram driver
 lp0    at mainbus0             # centronics printer
diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/BOOT
--- a/sys/arch/atari/conf/BOOT  Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/BOOT  Wed Jan 26 14:56:40 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: BOOT,v 1.28 1999/07/29 10:37:15 augustss Exp $
+#      $NetBSD: BOOT,v 1.29 2000/01/26 14:56:40 leo Exp $
 #
 # BOOT
 #
@@ -99,6 +99,8 @@
 fd0    at fdc0 unit 0          # builtin floppy drive
 fd1    at fdc0 unit 1          # external floppy drive
 zs0    at mainbus0             # Serial support through 8530
+grfcc0 at grfbus0              # graphics driver
+ite0   at grfcc0               # console
 nvr0   at mainbus0             # nvram driver
 wdc0   at mainbus0             # IDE-bus
 wd*    at wdc? drive ?         #    ... and drives
diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/BOOTX
--- a/sys/arch/atari/conf/BOOTX Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/BOOTX Wed Jan 26 14:56:40 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: BOOTX,v 1.22 1999/07/29 10:37:15 augustss Exp $
+#      $NetBSD: BOOTX,v 1.23 2000/01/26 14:56:41 leo Exp $
 #
 # BOOTX
 #
@@ -103,10 +103,12 @@
 fd0    at fdc0 unit 0          # builtin floppy drive
 fd1    at fdc0 unit 1          # external floppy drive
 zs0    at mainbus0             # Serial support through 8530
-grfcc1 at grfbus0              # second graphics driver
-ite*   at grfcc1               # second tty
-grfcc2 at grfbus0              # third graphics driver
-ite*   at grfcc2               # third tty
+grfcc0 at grfbus0              # graphics driver
+ite0   at grfcc0               # console
+grfcc1 at grfbus0              # 2nd graphics driver
+ite1   at grfcc1               # 2nd tty
+grfcc2 at grfbus0              # 3rd graphics driver
+ite2   at grfcc2               # 3rd tty
 nvr0   at mainbus0             # nvram driver
 lp0    at mainbus0             # centronics printer
 wdc0   at mainbus0             # IDE-bus
diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/FALCON
--- a/sys/arch/atari/conf/FALCON        Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/FALCON        Wed Jan 26 14:56:40 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: FALCON,v 1.29 1999/07/29 10:37:15 augustss Exp $
+#      $NetBSD: FALCON,v 1.30 2000/01/26 14:56:41 leo Exp $
 #
 # ATARI-FALCON
 #
@@ -99,8 +99,12 @@
 fd0    at fdc0 unit 0          # builtin floppy drive
 fd1    at fdc0 unit 1          # external floppy drive
 zs0    at mainbus0             # Serial support through 8530
-grfcc1 at grfbus0              # second graphics driver
-ite*   at grfcc1               # second tty
+grfcc0 at grfbus0              # graphics driver
+ite0   at grfcc0               # console
+grfcc1 at grfbus0              # 2nd graphics driver
+ite1   at grfcc1               # 2nd tty
+grfcc2 at grfbus0              # 3rd graphics driver
+ite2   at grfcc2               # 3rd tty
 nvr0   at mainbus0             # nvram driver
 lp0    at mainbus0             # centronics printer
 wdc0   at mainbus0             # IDE-bus
diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/GENERIC
--- a/sys/arch/atari/conf/GENERIC       Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/GENERIC       Wed Jan 26 14:56:40 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC,v 1.59 2000/01/23 23:46:07 hubertf Exp $
+#      $NetBSD: GENERIC,v 1.60 2000/01/26 14:56:42 leo Exp $
 #
 # Generic atari
 #
@@ -8,7 +8,7 @@
 
 include "arch/atari/conf/std.atari"
 
-#ident                 "GENERIC-$Revision: 1.59 $"
+#ident                 "GENERIC-$Revision: 1.60 $"
 
 #
 # Add support for about 16 users. This variable is used to size
@@ -194,6 +194,10 @@
 fd1    at fdc0 unit 1                  # external floppy drive
 ser0   at mainbus0                     # Serial support through 68901 (modem1)
 zs0    at mainbus0                     # Serial support through 8530
+grfcc0 at grfbus0                      # Frambuffer graphics driver
+ite*   at grfcc0                       # Frambuffer console
+grfet0 at grfbus0                      # Tseng graphics driver
+ite*   at grfet0                       # et4000/et6000/et6100 console
 nvr0   at mainbus0                     # nvram driver
 lp0    at mainbus0                     # centronics printer
 
diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/HADES
--- a/sys/arch/atari/conf/HADES Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/HADES Wed Jan 26 14:56:40 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: HADES,v 1.20 1999/07/29 10:37:16 augustss Exp $
+#      $NetBSD: HADES,v 1.21 2000/01/26 14:56:43 leo Exp $
 #
 # Medusa-Hades
 #
@@ -107,12 +107,12 @@
 zs0    at mainbus0             # Serial support through 8530
 nvr0   at mainbus0             # nvram driver
 lp0    at mainbus0             # centronics printer
-grfet0 at grfbus0              # ET4000 consoles
-ite*   at grfet0
+grfet0 at grfbus0              # et4000/et6000/et6100 consoles
+ite0   at grfet0
 grfet1 at grfbus0
-ite*   at grfet1
+ite1   at grfet1
 grfet2 at grfbus0
-ite*   at grfet2
+ite2   at grfet2
 pcibus0        at mainbus0             # PCI-bus
 pci0   at pcibus0
 avmebus0 at mainbus0           # VME bus
diff -r c0959010a42f -r 88a3c86f6e21 sys/arch/atari/conf/std.atari
--- a/sys/arch/atari/conf/std.atari     Wed Jan 26 14:23:41 2000 +0000
+++ b/sys/arch/atari/conf/std.atari     Wed Jan 26 14:56:40 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.atari,v 1.16 1999/11/15 19:00:27 fvdl Exp $
+#      $NetBSD: std.atari,v 1.17 2000/01/26 14:56:43 leo Exp $
 #
 # standard atari information
 #
@@ -19,8 +19,6 @@
 grfbus0                at mainbus0             # bitmapped display's
 ncrscsi0       at mainbus0             # SCSI driver
 scsibus0       at ncrscsi0             # SCSI bus
-grfcc0         at grfbus0              # graphics driver
-ite*           at grfcc0               # console
 
 # any disk/tape drives on configured controllers.
 sd*    at scsibus? target ? lun ?