summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormjacob <mjacob@NetBSD.org>1998-01-28 19:09:24 +0000
committermjacob <mjacob@NetBSD.org>1998-01-28 19:09:24 +0000
commit99139bc35a23b9724f1bb2c1d8e8cc9d199860c3 (patch)
treeaeb8a7153555c4cb105813db3a4be1ac4a8eb2e6 /sys/dev
parent9359316f6f3cca4832e2e7b55aa706398826acc7 (diff)
Fix for port-alpha/4903- always download f/w unless config flags say
no or we have no firmware to download.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/isp.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 71efa483437..b6594fd72c7 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.17 1998/01/12 09:23:26 thorpej Exp $ */
+/* $NetBSD: isp.c,v 1.18 1998/01/28 19:09:24 mjacob Exp $ */
/*
* Machine Independent (well, as best as possible)
@@ -265,11 +265,15 @@ isp_reset(isp)
}
/*
- * Download new Firmware, unless requested not to
- * or not appropriate to do so.
+ * Download new Firmware, unless requested not to do so.
+ * This is made slightly trickier in some cases where the
+ * firmware of the ROM revision is newer than the revision
+ * compiled into the driver. So, where we used to compare
+ * versions of our f/w and the ROM f/w, now we just see
+ * whether we have f/w at all and whether a config flag
+ * has disabled our download.
*/
- if ((isp->isp_fwrev >= isp->isp_mdvec->dv_fwrev) ||
- (cf_flags & 0x80) != 0) {
+ if (isp->isp_mdvec->dv_fwlen == 0 || (cf_flags & 0x80) != 0) {
dodnld = 0;
}