diff options
| author |   downsj <downsj@openbsd.org> | 1996-11-30 23:04:38 +0000 |
|---|---|---|
| committer | downsj <downsj@openbsd.org> | 1996-11-30 23:04:38 +0000 |
| commit | 04a96bf0372877110c4bb9d536a34ef36d889b6b (patch) | |
| tree | b8521d938767b3e00e8090e4b5f0392784e103f5 | |
| parent | fix order of #if defined's so it compiles (diff) | |
| download | wireguard-openbsd-04a96bf0372877110c4bb9d536a34ef36d889b6b.tar.xz wireguard-openbsd-04a96bf0372877110c4bb9d536a34ef36d889b6b.zip | |
sync
| -rw-r--r-- | sys/dev/pci/ncr.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 03849a3b7ba..6f0659f8b4d 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.21 1996/11/30 21:54:53 millert Exp $ */ +/* $OpenBSD: ncr.c,v 1.22 1996/11/30 23:04:38 downsj Exp $ */ /* $NetBSD: ncr.c,v 1.48 1996/10/25 21:33:33 cgd Exp $ */ /************************************************************************** @@ -3516,8 +3516,8 @@ static void ncr_attach (pcici_t config_id, int unit) np->maxwide = 0; np->rv_scntl3 = 0x13; /* default: 40MHz clock */ - np->ns_sync = 25; - np->ns_async = 50; + np->ns_sync = 25; /* XXX no support for Fast-20, yet */ + np->ns_async = 50; /* ** Get the frequency of the chip's clock. @@ -5191,8 +5191,8 @@ void ncr_exception (ncb_p np) ** Never test for an error condition you don't know how to handle. */ - dstat = INB (nc_dstat); - sist = INW (nc_sist) ; + dstat = (istat & DIP) ? INB (nc_dstat) : 0; + sist = (istat & SIP) ? INW (nc_sist) : 0; np->profile.num_int++; if (DEBUG_FLAGS & DEBUG_TINY) @@ -7077,8 +7077,6 @@ ncrgetfreq (ncb_p np, int gen) } } - np->ns_sync = 25; - np->ns_async = 50; np->rv_scntl3 = ((scntl3 & 0x7) << 4) -0x20 + (scntl3 & 0x7); if (bootverbose) { |