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.
This commit is contained in:
parent
139107f0ff
commit
b7ccd3dc56
|
@ -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.
|
** 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[] =
|
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
|
static const u_long ncr_version = NCR_VERSION * 11
|
||||||
+ (u_long) sizeof (struct ncb) * 7
|
+ (u_long) sizeof (struct ncb) * 7
|
||||||
|
@ -3311,6 +3311,8 @@ static void ncr_attach (pcici_t config_id, int unit)
|
||||||
|
|
||||||
np->maxwide = 0;
|
np->maxwide = 0;
|
||||||
np->rv_scntl3 = 0x13; /* default: 40MHz clock */
|
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.
|
** 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);
|
np->rv_scntl3 = ((scntl3 & 0x7) << 4) -0x20 + (scntl3 & 0x7);
|
||||||
|
|
||||||
if (bootverbose) {
|
if (bootverbose) {
|
||||||
|
|
Loading…
Reference in New Issue