Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arc - vga/pckbc attachment for jazz internal bus of...
details: https://anonhg.NetBSD.org/src/rev/8f3e87cfa043
branches: trunk
changeset: 488063:8f3e87cfa043
user: soda <soda%NetBSD.org@localhost>
date: Sat Jun 17 07:29:06 2000 +0000
description:
- vga/pckbc attachment for jazz internal bus of Magnum derived machines
(including Pica, NEC RISCstation/RISCserver).
- TGA console initialization for NEC RISCstation 2250,
contributed by Shuichiro URATA <ur%a-r.org@localhost>
diffstat:
sys/arch/arc/arc/machdep.c | 104 ++++++++++----
sys/arch/arc/conf/ARCTIC | 29 +++-
sys/arch/arc/conf/GENERIC | 27 +++-
sys/arch/arc/conf/M403 | 22 ++-
sys/arch/arc/conf/MIMORI | 246 +++++++++++++++++++++++++++++++++++
sys/arch/arc/conf/P4032 | 5 +-
sys/arch/arc/conf/PCCONS | 314 +++++++++++++++++++++++++++++++++++++++++++++
sys/arch/arc/conf/PICA | 23 ++-
sys/arch/arc/conf/RAMDISK | 64 +++++++-
9 files changed, 769 insertions(+), 65 deletions(-)
diffs (truncated from 1152 to 300 lines):
diff -r f88738725791 -r 8f3e87cfa043 sys/arch/arc/arc/machdep.c
--- a/sys/arch/arc/arc/machdep.c Sat Jun 17 07:28:07 2000 +0000
+++ b/sys/arch/arc/arc/machdep.c Sat Jun 17 07:29:06 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38 2000/06/09 06:06:57 soda Exp $ */
+/* $NetBSD: machdep.c,v 1.39 2000/06/17 07:29:06 soda Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -104,8 +104,25 @@
#include <arc/dti/desktech.h>
#include <arc/algor/algor.h>
+#include "rasdisplay_jazzio.h"
+#if NRASDISPLAY_JAZZIO > 0
+#include <arc/jazz/rasdisplay_jazziovar.h>
+#endif
+
+#include "tga.h"
+#if NTGA > 0
+#include <dev/pci/pcivar.h>
+#include <dev/pci/tgavar.h>
+#include <arc/pci/necpbvar.h>
+#endif
+
#include "pc.h"
+#include "vga_jazzio.h"
+#if NVGA_JAZZIO > 0
+#include <arc/jazz/vga_jazziovar.h>
+#endif
+
#include "vga_isa.h"
#if NVGA_ISA > 0
#include <dev/ic/mc6845reg.h>
@@ -113,10 +130,16 @@
#include <dev/isa/vga_isavar.h>
#endif
-#include "pckbd.h"
+#include "pckbc_jazzio.h"
+#if NPCKBC_JAZZIO > 0
+#include <arc/jazz/pckbc_jazzioreg.h>
+#endif
+
+#include "pckbc.h"
#if NPCKBC > 0
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
+#include <dev/isa/isareg.h>
#endif
#include "com.h"
@@ -131,7 +154,7 @@
#endif
#ifndef COM_FREQ_MAGNUM
-#if 1
+#if 0
#define COM_FREQ_MAGNUM 4233600 /* 4.2336MHz - ARC? */
#else
#define COM_FREQ_MAGNUM 8192000 /* 8.192 MHz - NEC RISCstation M402 */
@@ -917,34 +940,27 @@
pccnattach();
return;
#endif
-#if NVGA_PICA > 0
- if (vga_cnattach(&arc_bus_io, &arc_bus_mem, -1, 1)
- == 0) {
-#if NPCKBC > 0
- pckbc_cnattach(&arc_bus_io, PICA_SYS_KBD, 1,
- PCKBC_KBD_SLOT);
+#if NVGA_JAZZIO > 0
+ if (vga_jazzio_cnattach() == 0) {
+#if NPCKBC_JAZZIO > 0
+ pckbc_cnattach(&pica_bus, PICA_SYS_KBD,
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
#endif
+ return;
}
- return;
#endif
break;
case MAGNUM:
-#if NFB > 0
- if (fb_console()) {
-#if NPCKBC > 0
- pckbc_cnattach(&arc_bus_io, PICA_SYS_KBD, 1,
- PCKBC_KBD_SLOT);
+ case NEC_R94:
+#if NRASDISPLAY_JAZZIO > 0
+ if (rasdisplay_jazzio_cnattach()) {
+#if NPCKBC_JAZZIO > 0
+ pckbc_cnattach(&pica_bus, PICA_SYS_KBD,
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
#endif
+ return;
}
- return;
-#endif
- break;
-
- case NEC_R94:
-#if NFB > 0
- fb_console();
- return;
#endif
break;
@@ -958,13 +974,18 @@
break;
case NEC_RD94:
-#if NTGA_PCI > 0
- tga_cnattach( /* XXX */);
-#if NPCKBC > 0
- pckbc_cnattach(&arc_bus_io, PICA_SYS_KBD, 1,
- PCKBC_KBD_SLOT);
+#if NTGA > 0
+ necpb_init(&necpb_configuration);
+ /* XXX device number is hardcoded */
+ if (tga_cnattach(&necpb_configuration.nc_iot,
+ &necpb_configuration.nc_memt,
+ &necpb_configuration.nc_pc, 0, 3, 0) == 0) {
+#if NPCKBC_JAZZIO > 0
+ pckbc_cnattach(&pica_bus, PICA_SYS_KBD,
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
#endif
- return;
+ return;
+ }
#endif
break;
@@ -974,9 +995,23 @@
pccnattach();
return;
#endif
-#if NFB > 0
- fb_console();
- return;
+#if NVGA_JAZZIO > 0
+ if (vga_jazzio_cnattach() == 0) {
+#if NPCKBC_JAZZIO > 0
+ pckbc_cnattach(&pica_bus, PICA_SYS_KBD,
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+#endif
+ return;
+ }
+#endif
+#if NRASDISPLAY_JAZZIO > 0
+ if (rasdisplay_jazzio_cnattach()) {
+#if NPCKBC_JAZZIO > 0
+ pckbc_cnattach(&pica_bus, PICA_SYS_KBD,
+ JAZZIO_KBCMDP, PCKBC_KBD_SLOT);
+#endif
+ return;
+ }
#endif
break;
@@ -987,10 +1022,11 @@
return;
#endif
#if NVGA_ISA > 0
- if (vga_cnattach(&arc_bus_io, &arc_bus_mem, -1, 1)
- == 0) {
+ if (vga_isa_cnattach(&arc_bus_io, &arc_bus_mem) == 0) {
+#if NPCKBC > 0
pckbc_cnattach(&arc_bus_io, IO_KBD, KBCMDP,
PCKBC_KBD_SLOT);
+#endif
}
return;
#endif
diff -r f88738725791 -r 8f3e87cfa043 sys/arch/arc/conf/ARCTIC
--- a/sys/arch/arc/conf/ARCTIC Sat Jun 17 07:28:07 2000 +0000
+++ b/sys/arch/arc/conf/ARCTIC Sat Jun 17 07:29:06 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ARCTIC,v 1.6 2000/06/14 22:02:19 veego Exp $
+# $NetBSD: ARCTIC,v 1.7 2000/06/17 07:29:07 soda Exp $
# $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
#
# configuration file for DeskStation
@@ -127,6 +127,8 @@
aclock0 at isa? port 0x70 irq 0
pc0 at isa? port 0x60 irq 1 # generic PC console device
+#vga0 at isa?
+#pckbc0 at isa? # PC keyboard controller
com0 at isa? port 0x3f8 irq 4
com1 at isa? port 0x2f8 irq 3
com2 at isa? port 0x3e8 irq 4
@@ -161,12 +163,6 @@
# ATAPI bus support
atapibus* at wdc? channel ?
-# ATAPI devices
-# flags have the same meaning as for IDE drives.
-cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives
-sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
-uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
-
# ISA parallel printer interfaces
lpt0 at isa? port 0x378 irq 7
@@ -198,6 +194,24 @@
ss* at scsibus? target ? lun ?
uk* at scsibus? target ? lun ?
+#### ATAPI bus devices
+
+# flags have the same meaning as for IDE drives.
+cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives
+sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
+uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
+
+#### Workstation Console attachments
+
+#wsdisplay* at vga?
+#wsdisplay* at tga?
+#pckbd* at pckbc? # PC keyboard (kbd port)
+#wskbd* at pckbd?
+#pms* at pckbc? # PS/2-style mouse (aux port)
+#wsmouse* at pms?
+#pmsi* at pckbc? # PS/2 "Intelli"mouse (aux port)
+#wsmouse* at pmsi?
+
#### Pseudo devices
# disk/mass storage pseudo-devices
@@ -218,6 +232,7 @@
pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
# miscellaneous pseudo-devices
pseudo-device pty 64 # pseudo-terminals
diff -r f88738725791 -r 8f3e87cfa043 sys/arch/arc/conf/GENERIC
--- a/sys/arch/arc/conf/GENERIC Sat Jun 17 07:28:07 2000 +0000
+++ b/sys/arch/arc/conf/GENERIC Sat Jun 17 07:29:06 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.32 2000/06/14 22:02:19 veego Exp $
+# $NetBSD: GENERIC,v 1.33 2000/06/17 07:29:07 soda Exp $
# $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
#
# GENERIC -- everything that's currently supported
@@ -6,7 +6,7 @@
include "arch/arc/conf/std.arc"
-#ident "GENERIC-$Revision: 1.32 $"
+#ident "GENERIC-$Revision: 1.33 $"
maxusers 32 # estimated number of users
@@ -122,8 +122,10 @@
pica* at mainbus0 # ACER Pica systems local bus.
aclock0 at pica?
-pc0 at pica?
-opms0 at pica?
+#pc0 at pica?
+#opms0 at pica?
+vga0 at pica? # Jazz localbus VGA
+pckbc0 at pica? # PC keyboard controller
com0 at pica?
com1 at pica?
lpt0 at pica?
@@ -135,6 +137,9 @@
asc0 at pica?
scsibus* at asc?
+#siop0 at pica?
+#scsibus* at siop?
+
#### ISA bus devices
isabr* at mainbus0 # ISA Bus bridge (std ISA bus).
@@ -144,6 +149,8 @@
aclock0 at isa? port 0x70 irq 0
pc0 at isa? port 0x60 irq 1 # generic PC console device
+#vga0 at isa?
+#pckbc0 at isa? # PC keyboard controller
com0 at isa? port 0x3f8 irq 4
com1 at isa? port 0x2f8 irq 3
com2 at isa? port 0x3e8 irq 4
@@ -241,7 +248,6 @@
atapibus* at pciide? channel ?
tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics
-wsdisplay* at tga?
ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
scsibus* at ahc?
@@ -276,6 +282,17 @@
sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
Home |
Main Index |
Thread Index |
Old Index