Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Screen console works now.

This commit is contained in:
tsubai 2000-11-15 14:29:40 +00:00
parent 503701f0d3
commit 0d339b0df5
4 changed files with 88 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
sys/arch/newsmips/conf/DEJIKO
View File

@ -1,15 +1,16 @@
# $NetBSD: DEJIKO,v 1.2 2000/09/24 15:59:36 jdolecek Exp $
# $NetBSD: DEJIKO,v 1.3 2000/11/15 14:29:40 tsubai Exp $
#
# NEWS5000 example
# Dejiko's sekai-seifuku NEWS5000 nyo.
include "arch/newsmips/conf/std.newsmips"
maxusers 16
options news5000
options MIPS3 # R4000 support
options MIPS3 # R4x00 support
options MIPS3_L2CACHE_PRESENT
options CPU_SINGLE
options CPU_SINGLE # no I/O processor
options BUFPAGES=4096
# Debugging options
options DDB # kernel dynamic debugger
@ -17,22 +18,28 @@ options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options DEBUG # extra kernel debugging support
options DIAGNOSTIC # extra kernel sanity checking
# Filesystem options
file-system FFS # Berkeley Fast Filesystem
file-system MFS # memory-based filesystem
file-system NFS # Sun NFS-compatible filesystem client
file-system PROCFS # /proc
file-system CD9660 # ISO 9660 + Rock Ridge file system
# Networking options
options INET # Internet protocols
options IPFILTER_LOG # ipmon(8) log support
options NFS_BOOT_BOOTPARAM
options NFS_BOOTPARAM_NOGATEWAY
# Compatibility options
options COMPAT_43 # compatibility with 4.3BSD binaries
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
options COMPAT_14 # NetBSD 1.4 binary compatibility
# Filesystem options
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
file-system MFS # memory-based filesystem
# wscons options
options WSEMUL_VT100 # VT100 / VT220 emulation
options FONT_GALLANT12x22
options INET # Internet protocols
options NFS_BOOT_BOOTPARAM
config netbsd root on ? type nfs
config netbsd root on ? type ?
mainbus0 at root
@ -41,11 +48,28 @@ ap0 at mainbus0
mkclock* at ap?
sn* at ap? # SONIC Ethernet
zsc0 at ap?
tlp* at ap?
dmac* at ap?
spifi* at ap? # SPIFI SCSI
zsc0 at ap? # ESCC
zstty0 at zsc0 channel 0 # tty00
zstty1 at zsc0 channel 1 # tty01
xafb* at ap?
kb0 at ap?
ms0 at ap?
wsdisplay* at xafb? console ?
wskbd* at kb? console ?
wsmouse* at ms?
scsibus* at spifi?
sd* at scsibus? target ? lun ? # SCSI disks
cd* at scsibus? target ? lun ? # SCSI CD-ROMs
pseudo-device loop # loopback interface; required
pseudo-device pty # pseudo-terminals
pseudo-device ipfilter # ip filter
pseudo-device bpfilter 16 # Berkeley Packet Filter
pseudo-device vnd 4 # disk-like interface to files
pseudo-device pty # pseudo-terminals
pseudo-device rnd # /dev/random and in-kernel generator

18
sys/arch/newsmips/conf/GENERIC
View File

@ -1,10 +1,10 @@
# $NetBSD: GENERIC,v 1.32 2000/11/13 16:48:41 tsubai Exp $
# $NetBSD: GENERIC,v 1.33 2000/11/15 14:29:40 tsubai Exp $
#
# GENERIC kernel for RISC-NEWS
include "arch/newsmips/conf/std.newsmips"
#ident "GENERIC-$Revision: 1.32 $"
#ident "GENERIC-$Revision: 1.33 $"
maxusers 16
@ -86,7 +86,11 @@ options IPFILTER_LOG # ipmon(8) log support
options NFS_BOOT_BOOTPARAM
config netbsd root on ? type ?
# wscons options
options WSEMUL_VT100 # VT100 / VT220 emulation
options FONT_GALLANT12x22
config netbsd root on ? type ?
mainbus0 at root
@ -127,15 +131,17 @@ scsibus0 at sc0
#spifi* at ap? # SPIFI SCSI
#scsibus* at spifi?
xafb* at ap?
kb0 at ap?
ms0 at ap?
sd* at scsibus? target ? lun ? # SCSI disks
st* at scsibus? target ? lun ? # SCSI tapes
cd* at scsibus? target ? lun ? # SCSI CD-ROMs
ch* at scsibus? target ? lun ? # SCSI changer devices
options WSEMUL_VT100 # VT100 / VT220 emulation
options FONT_GALLANT12x22
wsdisplay0 at fb? console ?
wsdisplay0 at xafb? console ?
wskbd0 at kb? console ?
wsmouse0 at ms?

6
sys/arch/newsmips/conf/files.newsmips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.newsmips,v 1.14 2000/11/15 14:04:05 tsubai Exp $
# $NetBSD: files.newsmips,v 1.15 2000/11/15 14:29:40 tsubai Exp $
# NEWSMIPS-specific configuration info
@ -71,7 +71,7 @@ file arch/newsmips/apbus/ms_ap.c ms_ap
device fb: wsemuldisplaydev, rasops1
attach fb at hb
file arch/newsmips/dev/fb.c fb needs-count
file arch/newsmips/dev/fb.c fb needs-flag
device fdc {}
attach fdc at hb
@ -124,7 +124,7 @@ include "dev/rasops/files.rasops"
device xafb: wsemuldisplaydev, rasops8
attach xafb at ap
file arch/newsmips/apbus/xafb.c xafb
file arch/newsmips/apbus/xafb.c xafb needs-flag
# network devices MII bus
include "dev/mii/files.mii"

47
sys/arch/newsmips/newsmips/cpu_cons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu_cons.c,v 1.5 2000/11/13 16:48:46 tsubai Exp $ */
/* $NetBSD: cpu_cons.c,v 1.6 2000/11/15 14:29:41 tsubai Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -64,17 +64,20 @@
struct consdev *cn_tab = NULL;
extern struct consdev consdev_zs, consdev_zs_ap;
int tty00_is_console = 0;
void fb_cnattach(void);
void kb_hb_cnattach(void);
void xafb_cnattach(void);
void kb_ap_cnattach(void);
#include "fb.h"
#include "xafb.h"
#include "zsc.h"
void
consinit()
{
volatile int *dipsw;
static int initted = 0;
if (initted)
@ -82,19 +85,11 @@ consinit()
initted = 1;
#ifdef news5000
/* currently only serial console is available on news5000 */
if (systype == NEWS5000) {
tty00_is_console = 1;
cn_tab = &consdev_zs_ap;
(*cn_tab->cn_init)(cn_tab);
return;
}
#endif
switch (systype) {
#ifdef news3400
if (systype == NEWS3400) {
volatile int *dipsw = (void *)DIP_SWITCH;
case NEWS3400:
dipsw = (void *)DIP_SWITCH;
#if NFB > 0
if (*dipsw & SW_CONSOLE) {
@ -105,10 +100,30 @@ consinit()
#endif
#if NZSC > 0
tty00_is_console = 1;
cn_tab = &consdev_zs;
(*cn_tab->cn_init)(cn_tab);
#endif
}
#endif /* news3400 */
#ifdef news5000
case NEWS5000:
dipsw = (void *)NEWS5000_DIP_SWITCH;
#if NXAFB > 0
if (*dipsw & SW_CONSOLE) {
xafb_cnattach();
kb_ap_cnattach();
return;
}
#endif
#if NZSC > 0
cn_tab = &consdev_zs_ap;
(*cn_tab->cn_init)(cn_tab);
return;
#endif
#endif /* news5000 */
}
}