summaryrefslogtreecommitdiffstats
path: root/sys/pci/ncr.c
diff options
context:
space:
mode:
authorse <se@FreeBSD.org>1996-10-14 10:09:52 +0000
committerse <se@FreeBSD.org>1996-10-14 10:09:52 +0000
commit8310fffb27f8d2ab3c969bbb2c61ad10581b61d3 (patch)
tree1b8fea2df5999bcc0d47cfcc936db42c144fac66 /sys/pci/ncr.c
parent99256fa202d60d819bc54c0de7f264f1b8405676 (diff)
downloadFreeBSD-src-8310fffb27f8d2ab3c969bbb2c61ad10581b61d3.zip
FreeBSD-src-8310fffb27f8d2ab3c969bbb2c61ad10581b61d3.tar.gz
Move the initialization of np->ns_sync and ns_async out of ncr_getclock(),
which does no longer get called for non-Ultra cards. Fix suggested by Gerard Roudier, slightly modified by me.
Diffstat (limited to 'sys/pci/ncr.c')
-rw-r--r--sys/pci/ncr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index c3fae46..862af82 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: ncr.c,v 1.80 1996/10/11 19:50:09 se Exp $
+** $Id: ncr.c,v 1.81 1996/10/12 17:33:48 se Exp $
**
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
**
@@ -1250,7 +1250,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
- "\n$Id: ncr.c,v 1.80 1996/10/11 19:50:09 se Exp $\n";
+ "\n$Id: ncr.c,v 1.81 1996/10/12 17:33:48 se Exp $\n";
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
@@ -3311,6 +3311,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; /* XXX no support for Fast-20, yet */
+ np->ns_async = 50;
/*
** Get the frequency of the chip's clock.
@@ -6854,8 +6856,6 @@ static void ncr_getclock (ncb_p np)
}
}
- np->ns_sync = 25;
- np->ns_async = 50;
np->rv_scntl3 = ((scntl3 & 0x7) << 4) -0x20 + (scntl3 & 0x7);
if (bootverbose) {
OpenPOWER on IntegriCloud