Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/atari/conf Add support for wsdisplay and wskbd for ...



details:   https://anonhg.NetBSD.org/src/rev/311ba7f65c1a
branches:  trunk
changeset: 542611:311ba7f65c1a
user:      thomas <thomas%NetBSD.org@localhost>
date:      Sun Feb 02 18:26:22 2003 +0000

description:
Add support for wsdisplay and wskbd for HADES.
Add config option for et4000 with 2MB memory.

diffstat:

 sys/arch/atari/conf/ATARITT      |  3 ++-
 sys/arch/atari/conf/BOOT         |  3 ++-
 sys/arch/atari/conf/BOOTX        |  3 ++-
 sys/arch/atari/conf/FALCON       |  2 +-
 sys/arch/atari/conf/GENERIC.in   |  3 ++-
 sys/arch/atari/conf/HADES        |  7 ++++++-
 sys/arch/atari/conf/HADES.in     |  6 +++++-
 sys/arch/atari/conf/MILAN-ISAIDE |  2 +-
 sys/arch/atari/conf/MILAN-PCIIDE |  2 +-
 sys/arch/atari/conf/files.atari  |  5 +++--
 10 files changed, 25 insertions(+), 11 deletions(-)

diffs (174 lines):

diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/ATARITT
--- a/sys/arch/atari/conf/ATARITT       Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/ATARITT       Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: ATARITT,v 1.54 2002/12/28 22:13:22 leo Exp $
+# $NetBSD: ATARITT,v 1.55 2003/02/02 18:26:22 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -152,6 +152,7 @@
 
 options        TT_SCSI                 # SCSI-support for TT
 options        TT_VIDEO                # Graphics support for TT
+#options       ET4000_HAS_2MB_MEM      # et4000 with 2 MB video memory
 
 options        MEMORY_DISK_HOOKS       # Boot RAM-disk
 options        DISKLABEL_NBDA          # NetBSD disklabels (required)
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/BOOT
--- a/sys/arch/atari/conf/BOOT  Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/BOOT  Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: BOOT,v 1.52 2002/12/28 22:13:22 leo Exp $
+# $NetBSD: BOOT,v 1.53 2003/02/02 18:26:23 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -86,6 +86,7 @@
 
 options        TT_SCSI                 # SCSI-support for TT
 options        TT_VIDEO                # Graphics support for TT
+#options       ET4000_HAS_2MB_MEM      # et4000 with 2 MB video memory
 
 options        FALCON_SCSI             # SCSI-support for Falcon
 options        FALCON_VIDEO            # Graphics support for FALCON
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/BOOTX
--- a/sys/arch/atari/conf/BOOTX Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/BOOTX Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: BOOTX,v 1.46 2002/12/28 22:13:22 leo Exp $
+# $NetBSD: BOOTX,v 1.47 2003/02/02 18:26:23 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -90,6 +90,7 @@
 
 options        TT_SCSI                 # SCSI-support for TT
 options        TT_VIDEO                # Graphics support for TT
+#options       ET4000_HAS_2MB_MEM      # et4000 with 2 MB video memory
 
 options        FALCON_SCSI             # SCSI-support for Falcon
 options        FALCON_VIDEO            # Graphics support for FALCON
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/FALCON
--- a/sys/arch/atari/conf/FALCON        Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/FALCON        Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: FALCON,v 1.55 2002/12/28 22:13:22 leo Exp $
+# $NetBSD: FALCON,v 1.56 2003/02/02 18:26:23 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/GENERIC.in
--- a/sys/arch/atari/conf/GENERIC.in    Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/GENERIC.in    Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC.in,v 1.30 2002/12/28 22:11:30 leo Exp $
+#      $NetBSD: GENERIC.in,v 1.31 2003/02/02 18:26:23 thomas Exp $
 #
 # Generic atari
 #
@@ -191,6 +191,7 @@
 #if defined(TT030_KERNEL) || defined(HADES_KERNEL)
 options        TT_SCSI                 # SCSI-support for TT
 options        TT_VIDEO                # Graphics support for TT
+#options       ET4000_HAS_2MB_MEM      # et4000 with 2 MB video memory
 #endif
 #ifdef FALCON_KERNEL
 options        FALCON_SCSI             # SCSI-support for Falcon
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/HADES
--- a/sys/arch/atari/conf/HADES Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/HADES Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: HADES,v 1.46 2002/12/28 22:13:22 leo Exp $
+# $NetBSD: HADES,v 1.47 2003/02/02 18:26:23 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -155,6 +155,7 @@
 
 options        TT_SCSI                 # SCSI-support for TT
 options        TT_VIDEO                # Graphics support for TT
+#options       ET4000_HAS_2MB_MEM      # et4000 with 2 MB video memory
 
 options        MEMORY_DISK_HOOKS       # Boot RAM-disk
 options        DISKLABEL_NBDA          # NetBSD disklabels (required)
@@ -246,6 +247,10 @@
 ite2           at grfet2
 pcib0          at mainbus0     # PCI-bus
 pci0           at pcib0
+#wsdisplay/keybd: if used, remove grfbus* grfet* and ite*
+#vga0          at pci? dev ? function ? # a PCI VGA card
+#wsdisplay*    at vga? console ?       # as a wscons console
+#wskbd0                at kbd0 console ?       # Keyboard
 avmebus0       at mainbus0     # VME bus
 vme0           at avmebus0
 le0            at vme0 irq 5   # Lance ethernet (Riebl/PAM).
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/HADES.in
--- a/sys/arch/atari/conf/HADES.in      Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/HADES.in      Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: HADES.in,v 1.5 2002/12/08 21:31:37 leo Exp $
+#      $NetBSD: HADES.in,v 1.6 2003/02/02 18:26:23 thomas Exp $
 #
 # Medusa-Hades
 #
@@ -30,6 +30,10 @@
 ite2           at grfet2
 pcib0          at mainbus0     # PCI-bus
 pci0           at pcib0
+# wsdisplay/keybd: if used, remove grfbus* grfet* and ite*
+#vga0          at pci? dev ? function ? # a PCI VGA card
+#wsdisplay*    at vga? console ?       # as a wscons console
+#wskbd0                at kbd0 console ?       # Keyboard
 avmebus0       at mainbus0     # VME bus
 vme0           at avmebus0
 le0            at vme0 irq 5   # Lance ethernet (Riebl/PAM).
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/MILAN-ISAIDE
--- a/sys/arch/atari/conf/MILAN-ISAIDE  Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/MILAN-ISAIDE  Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.22 2002/12/28 22:13:23 leo Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.23 2003/02/02 18:26:23 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/MILAN-PCIIDE
--- a/sys/arch/atari/conf/MILAN-PCIIDE  Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/MILAN-PCIIDE  Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.22 2002/12/28 22:13:23 leo Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.23 2003/02/02 18:26:24 thomas Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
diff -r d1d13270c008 -r 311ba7f65c1a sys/arch/atari/conf/files.atari
--- a/sys/arch/atari/conf/files.atari   Sun Feb 02 18:12:25 2003 +0000
+++ b/sys/arch/atari/conf/files.atari   Sun Feb 02 18:26:22 2003 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: files.atari,v 1.101 2002/12/08 21:31:37 leo Exp $
+#      $NetBSD: files.atari,v 1.102 2003/02/02 18:26:24 thomas Exp $
 
 maxpartitions 16
 
@@ -29,9 +29,10 @@
 file   arch/atari/dev/clock.c
 
 # keyboard
-device kbd: event
+device kbd: event,wskbddev
 attach kbd at mainbus
 file   arch/atari/dev/kbd.c            kbd needs-flag
+file   arch/atari/dev/wskbdmap_atari.c kbd
 
 # serial port via 68901 (ttyB0/ttyB1)
 device ser: tty



Home | Main Index | Thread Index | Old Index