diff options
Diffstat (limited to 'sys/arch/vax/stand')
| -rw-r--r-- | sys/arch/vax/stand/boot/boot.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/stand/boot/consio.c | 10 | ||||
| -rw-r--r-- | sys/arch/vax/stand/boot/version | 9 |
3 files changed, 16 insertions, 7 deletions
diff --git a/sys/arch/vax/stand/boot/boot.c b/sys/arch/vax/stand/boot/boot.c index 433b20f23a0..e53f54027c6 100644 --- a/sys/arch/vax/stand/boot/boot.c +++ b/sys/arch/vax/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.14 2006/08/05 12:24:28 miod Exp $ */ +/* $OpenBSD: boot.c,v 1.15 2006/08/24 20:29:38 miod Exp $ */ /* $NetBSD: boot.c,v 1.18 2002/05/31 15:58:26 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -111,7 +111,7 @@ Xmain(void) transition = ' '; askname = bootrpb.rpb_bootr5 & RB_ASKNAME; - printf("\n\r>> OpenBSD/vax boot [%s] [%s] <<\n", "1.10", __DATE__); + printf("\n\r>> OpenBSD/vax boot [%s] [%s] <<\n", "1.11", __DATE__); printf(">> Press enter to autoboot now, or any other key to abort: "); sluttid = getsecs() + 5; senast = 0; diff --git a/sys/arch/vax/stand/boot/consio.c b/sys/arch/vax/stand/boot/consio.c index 6ff171106be..3ac6a220f39 100644 --- a/sys/arch/vax/stand/boot/consio.c +++ b/sys/arch/vax/stand/boot/consio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: consio.c,v 1.5 2002/08/09 20:26:45 jsyn Exp $ */ +/* $OpenBSD: consio.c,v 1.6 2006/08/24 20:29:38 miod Exp $ */ /* $NetBSD: consio.c,v 1.13 2002/05/24 21:40:59 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. @@ -280,13 +280,17 @@ void ka53_consinit(void) static volatile int *vxtregs = (int *)0x200A0000; #define CH_SR 1 +#define CH_CR 2 #define CH_DAT 3 -#define SR_TX_RDY 0x04 +#define CR_RX_ENA 0x01 +#define CR_TX_ENA 0x04 #define SR_RX_RDY 0x01 +#define SR_TX_RDY 0x04 void vxt_putchar(int c) { + vxtregs[CH_CR] = CR_TX_ENA; while ((vxtregs[CH_SR] & SR_TX_RDY) == 0) ; vxtregs[CH_DAT] = c; @@ -295,6 +299,7 @@ vxt_putchar(int c) int vxt_getchar(void) { + vxtregs[CH_CR] = CR_RX_ENA; while ((vxtregs[CH_SR] & SR_RX_RDY) == 0) ; return vxtregs[CH_DAT]; @@ -303,6 +308,7 @@ vxt_getchar(void) int vxt_testchar(void) { + vxtregs[CH_CR] = CR_RX_ENA; if ((vxtregs[CH_SR] & SR_RX_RDY) == 0) return 0; return vxtregs[CH_DAT]; diff --git a/sys/arch/vax/stand/boot/version b/sys/arch/vax/stand/boot/version index 4e5f4b0b4c1..b13b00dbe1a 100644 --- a/sys/arch/vax/stand/boot/version +++ b/sys/arch/vax/stand/boot/version @@ -1,4 +1,4 @@ -$OpenBSD: version,v 1.1 2002/06/11 09:36:23 hugh Exp $ +$OpenBSD: version,v 1.2 2006/08/24 20:29:38 miod Exp $ $NetBSD: version,v 1.4 2001/11/09 19:53:15 scw Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this @@ -27,5 +27,8 @@ is taken as the current. 1.8: Switch to loadfile instead of exec. Now we can load a.out or ELF kernels. 1.9: Support verbose/quiet boot. -1.10: loadfile() update: ELF symbols no longer need backward seeks. -1.11: loadfile() update to avoid backwards seeks for ELF Program Headers. +1.10: Remove the 11/750 pcs code and the list of kernels to try to boot + in order. + Work around some PROM bugs in graphics mode which cause \h and \t not + to behave as expected. +1.11: Better VXT2000{,+} support. |