[src/netbsd-1-6]: src/sys/arch/vax/uba pullup-1-6 ticket #196:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f469fc38db95
branches:  netbsd-1-6
changeset: 527795:f469fc38db95
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jun 07 19:32:42 2002 +0000

description:
pullup-1-6 ticket #196:

syssrc/sys/arch/vax/uba/uba_sbi.c 1.14

Original log message:

Just return if a zero uba vector is handled. It's OK to get them on Unibus
machines.

diffstat:

 sys/arch/vax/uba/uba_sbi.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r fdb489f56de5 -r f469fc38db95 sys/arch/vax/uba/uba_sbi.c
--- a/sys/arch/vax/uba/uba_sbi.c        Fri Jun 07 19:30:09 2002 +0000
+++ b/sys/arch/vax/uba/uba_sbi.c        Fri Jun 07 19:32:42 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uba_sbi.c,v 1.12.18.1 2002/06/05 04:13:00 lukem Exp $     */
+/*     $NetBSD: uba_sbi.c,v 1.12.18.2 2002/06/07 19:32:42 thorpej Exp $           */
 /*
  * Copyright (c) 1996 Jonathan Stone.
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@@ -212,8 +212,11 @@
 
        br = mfpr(PR_IPL);
        vec = ur->uba_brrvr[br - 0x14];
-       if (vec <= 0)
-               ubaerror(&vc->uv_sc, &br, (int *)&vec);
+       if (vec <= 0) {
+               ubaerror(&vc->uv_sc, &br, &vec);
+               if (vec == 0)
+                       return;
+       }
 
        if (cold && scb_vec[(vc->uh_ibase + vec)/4].hoppaddr == scb_stray) {
                scb_fake(vec + vc->uh_ibase, br);
@@ -256,7 +259,6 @@
  * on the stack, and value-result (through some trickery).
  * In particular, the uvec argument is used for further
  * uba processing so the result aspect of it is very important.
- * It must not be declared register.
  */
 /*ARGSUSED*/
 void
@@ -264,7 +266,7 @@
 {
        struct uba_vsoftc *vc = (void *)uh;
        struct  uba_regs *uba = vc->uv_uba;
-       register int sr, s;
+       int sr, s;
        char sbuf[256], sbuf2[256];
 
        if (*uvec == 0) {