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

Use correct console on KA65? machines. Bugfix when specifying adaptor

Browse Source 
number. Show compile-time for boot. Prettier printout.
This commit is contained in:
ragge 1997-06-08 17:49:15 +00:00
parent 5521477455
commit 4d45dc0466
5 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arch/vax/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 1997/03/15 13:04:22 ragge Exp $
# $NetBSD: Makefile,v 1.13 1997/06/08 17:49:15 ragge Exp $
#
INCPATH=-I. -I../../../../.. -I../../../.. -I../../.. -I../.. -I../../../lib/libsa
@ -54,21 +54,24 @@ xxboot: start.o bootxx.o romread.o libsvax.a ${SALIB}
@dd if=a.out of=xxboot bs=32 skip=1
@rm -f a.out
boot: boot.o srt0.o devopen.o conf.o ${DEVS} libsvax.a ${SALIB}
boot: boot.o srt0.o devopen.o conf.o ${DEVS} libsvax.a ${SALIB} vers.o
@date '+_vers: .globl _vers; .asciz ">> NetBSD/vax boot ver. %y%m%d %H:%M <<"' | as -o vers.o
ld -N -Ttext ${RELOC} -e nisse -o $@ srt0.o devopen.o boot.o \
conf.o ${DEVS} ${LIBS}
conf.o ${DEVS} ${LIBS} vers.o
@strip boot
@size boot
edlabel: edlabel.o srt0.o devopen.o conf.o ${DEVS} libsvax.a
edlabel: edlabel.o srt0.o devopen.o conf.o ${DEVS} libsvax.a vers.o
@date '+_vers: .globl _vers; .asciz ">> NetBSD/vax boot ver. %y%m%d %H:%M <<"' | as -o vers.o
ld -N -Ttext ${RELOC} -e nisse -o $@ srt0.o devopen.o edlabel.o\
conf.o ${DEVS} ${LIBS}
conf.o ${DEVS} ${LIBS} vers.o
@strip edlabel
@size edlabel
copy: copy.o srt0.o devopen.o conf.o ${DEVS} libsvax.a
copy: copy.o srt0.o devopen.o conf.o ${DEVS} libsvax.a vers.o
@date '+_vers: .globl _vers; .asciz ">> NetBSD/vax boot ver. %y%m%d %H:%M <<"' | as -o vers.o
ld -N -Ttext ${RELOC} -e nisse -o $@ srt0.o devopen.o copy.o \
conf.o ${DEVS} ${LIBS}
conf.o ${DEVS} ${LIBS} vers.o
@strip copy
@size copy

5
sys/arch/vax/boot/boot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boot.c,v 1.6 1997/03/15 13:04:23 ragge Exp $ */
/* $NetBSD: boot.c,v 1.7 1997/06/08 17:49:16 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@ -58,6 +58,7 @@ Xmain()
register howto asm("r11");
register bdev asm("r10");
int io, retry, type;
extern char vers[];
io=0;
bootdev=bdev;
@ -73,7 +74,7 @@ Xmain()
for (retry = 0;;) {
if (io >= 0)
printf("\nNboot\n");
printf("\n%s\n", vers);
if (howto & RB_ASKNAME) {
printf(": ");
gets(line);

12
sys/arch/vax/boot/bootxx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootxx.c,v 1.10 1997/04/10 21:25:20 ragge Exp $ */
/* $NetBSD: bootxx.c,v 1.11 1997/06/08 17:49:17 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@ -125,7 +125,7 @@ Xmain()
bootset = getbootdev();
printf("\nhowto 0x%x, bdev 0x%x, booting...\n", boothowto, bootdev);
printf("\nhowto 0x%x, bdev 0x%x, booting...", boothowto, bootdev);
io = open(hej, 0);
if (io >= 0 && io < SOPEN_MAX) {
@ -147,7 +147,7 @@ copyunix(aio)
printf("Bad format\n");
return;
}
printf("%d", x.a_text);
if (N_GETMAGIC(x) == ZMAGIC && lseek(io, N_TXTADDR(x), SEEK_SET) == -1)
goto shread;
if (read(io, (char *) 0x10000, x.a_text) != x.a_text)
@ -156,17 +156,17 @@ copyunix(aio)
if (N_GETMAGIC(x) == ZMAGIC || N_GETMAGIC(x) == NMAGIC)
while ((int) addr & CLOFSET)
*addr++ = 0;
printf("+%d", x.a_data);
if (read(io, addr + 0x10000, x.a_data) != x.a_data)
goto shread;
addr += x.a_data;
bcopy((void *) 0x10000, 0, (int) addr);
printf("+%d", x.a_bss);
for (i = 0; i < x.a_bss; i++)
*addr++ = 0;
for (i = 0; i < 128 * 512; i++) /* slop */
*addr++ = 0;
printf(" start 0x%x\n", x.a_entry);
printf("done. (%d+%d)\n", x.a_text + x.a_data, x.a_bss);
hoppabort(x.a_entry, boothowto, bootset);
(*((int (*) ()) x.a_entry)) ();
return;

32
sys/arch/vax/boot/consio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: consio.c,v 1.7 1997/04/10 21:25:21 ragge Exp $ */
/* $NetBSD: consio.c,v 1.8 1997/06/08 17:49:18 ragge Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -95,7 +95,7 @@ setup()
{
vax_cputype = (mfpr(PR_SID) >> 24) & 0xFF;
put_fp = pr_putchar;
put_fp = pr_putchar; /* Default */
get_fp = pr_getchar;
/*
* according to vax_cputype we initialize vax_boardtype.
@ -120,17 +120,12 @@ setup()
* enough to do that) we decide which method/routines to use
* for console I/O.
* mtpr/mfpr are restricted to serial consoles, ROM-based routines
* support both serial and graphical consoles, thus we use that
* as fallthrough/default.
* support both serial and graphical consoles.
* We default to mtpr routines; so that we don't crash if
* it isn't a supported system.
*/
switch (vax_boardtype) {
case VAX_BTYP_630: /* MVII has only mtpr console */
put_fp = pr_putchar;
get_fp = pr_getchar;
break;
case VAX_BTYP_650:
case VAX_BTYP_660:
case VAX_BTYP_670:
case VAX_BTYP_690:
@ -152,15 +147,16 @@ setup()
rom_putc = 0x20040058; /* 537133144 */
rom_getc = 0x20040044; /* 537133124 */
break;
default:
put_fp = rom_putchar;
get_fp = rom_getchar;
rom_putc = 0x20040058; /* 537133144 */
rom_getc = 0x20040044; /* 537133124 */
break;
#ifdef notdef
case VAX_BTYP_630:
case VAX_BTYP_650:
case VAX_BTYP_9CC:
case VAX_BTYP_60:
put_fp = pr_putchar;
get_fp = pr_getchar;
break
#endif
}
return;
}

3
sys/arch/vax/boot/devopen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: devopen.c,v 1.7 1997/03/15 13:04:26 ragge Exp $ */
/* $NetBSD: devopen.c,v 1.8 1997/06/08 17:49:19 ragge Exp $ */
/*
* Copyright (c) 1997 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -60,6 +60,7 @@ devopen(f, fname, file)
if (cnvtab[i] == dev)
dp = devsw + i;
x = 0;
if ((s = index(fname, '('))) {
*s++ = 0;