From 17a9c2cb31dc9e022ae56cd4a1e3d659fdf177c5 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Wed, 24 Jun 2009 11:38:41 +0000
Subject: for the isp(4) driver, invert the meaning of the options which pull
 firmwares into the smaller (and larger) media ok krw

---
 sys/arch/sparc/dev/isp_sbus.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'sys/arch/sparc/dev')

diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index 59cc9292ab7..97acb49f4a1 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_sbus.c,v 1.27 2009/06/24 11:00:53 krw Exp $	*/
+/*	$OpenBSD: isp_sbus.c,v 1.28 2009/06/24 11:38:40 deraadt Exp $	*/
 /*
  * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -43,8 +43,15 @@
 #include <sparc/sparc/cpuvar.h>
 
 #include <dev/ic/isp_openbsd.h>
-#if	defined(ISP_COMPILE_FW) || defined(ISP_COMPILE_1000_FW)
+
+#ifndef ISP_NOFIRMWARE
+#define ISP_FIRMWARE_1000
+#endif
+
+#if	defined(ISP_FIRMWARE_1000)
 #include <dev/microcode/isp/asm_sbus.h>
+#else
+#define	ISP_1000_RISC_CODE	NULL
 #endif
 
 #define ISP_SBUSIFY_ISPHDR(isp, hdrp)					\
@@ -67,10 +74,6 @@ static void
 isp_sbus_dmateardown(struct ispsoftc *, struct scsi_xfer *, u_int32_t);
 static int isp_sbus_intr(void *);
 
-#ifndef	ISP_1000_RISC_CODE
-#define	ISP_1000_RISC_CODE	NULL
-#endif
-
 static struct ispmdvec mdvec = {
 	isp_sbus_rd_isr,
 	isp_sbus_rd_reg,
-- 
cgit v1.2.3