summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/man/man4/isp.413
-rw-r--r--sys/arch/alpha/conf/RAMDISK7
-rw-r--r--sys/arch/alpha/conf/RAMDISKB8
-rw-r--r--sys/arch/macppc/conf/GENERIC3
-rw-r--r--sys/arch/macppc/conf/RAMDISK3
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP273
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP303
-rw-r--r--sys/arch/sgi/conf/RAMDISK-IP273
-rw-r--r--sys/arch/sgi/conf/RAMDISK-IP303
-rw-r--r--sys/arch/sparc/conf/GENERIC3
-rw-r--r--sys/arch/sparc/conf/SUN4C3
-rw-r--r--sys/arch/sparc/conf/SUN4M3
-rw-r--r--sys/arch/sparc/dev/isp_sbus.c15
-rw-r--r--sys/arch/sparc64/conf/GENERIC5
-rw-r--r--sys/arch/sparc64/conf/RAMDISK7
-rw-r--r--sys/arch/sparc64/conf/RAMDISKU55
-rw-r--r--sys/dev/pci/isp_pci.c66
-rw-r--r--sys/dev/sbus/isp_sbus.c16
18 files changed, 106 insertions, 63 deletions
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index 6d620dd771b..72cf1062639 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isp.4,v 1.23 2008/01/21 20:00:32 sobrado Exp $
+.\" $OpenBSD: isp.4,v 1.24 2009/06/24 11:38:40 deraadt Exp $
.\"
.\" Copyright (c) 1998, 1999
.\" Matthew Jacob, for NASA/Ames Research Center
@@ -26,17 +26,24 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: January 21 2008 $
+.Dd $Mdocdate: June 24 2009 $
.Dt ISP 4
.Os
.Sh NAME
.Nm isp
.Nd QLogic based SCSI or Fibre Channel SCSI interface
.Sh SYNOPSIS
+.Cd "#option ISP_NOFIRMWARE"
.Cd "isp* at pci? " Pq PCI
+.Cd "#option ISP_FIRMWARE_1000"
.Cd "isp* at sbus? " Pq SBus
.Cd "scsibus* at isp? "
-.Cd "option ISP_COMPILE_FW"
+.Cd "#option ISP_FIRMWARE_1040
+.Cd "#option ISP_FIRMWARE_1080"
+.Cd "#option ISP_FIRMWARE_12160"
+.Cd "#option ISP_FIRMWARE_2100"
+.Cd "#option ISP_FIRMWARE_2200"
+.Cd "#option ISP_FIRMWARE_2300"
.Sh DESCRIPTION
This driver provides access to a
.Tn SCSI
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 9867a07f326..4eba29d4fb4 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.69 2008/05/23 17:47:41 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.70 2009/06/24 11:38:39 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -92,10 +92,7 @@ tga* at pci? # DEC ZLXp-E[123] graphics
pcn* at pci? # AMD PCnet-PCI Ethernet
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#option ISP_COMPILE_FW=1
-#option ISP_COMPILE_1040_FW=1
-#option ISP_COMPILE_1080_FW=1
-#option ISP_COMPILE_12160_FW=1
+option ISP_NOFIRMWARE
# Media Independent Interface (mii) drivers
amphy* at mii? # AMD 79C873 PHYs
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 56d4f949533..f03284e22f2 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.34 2009/03/24 18:48:08 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.35 2009/06/24 11:38:39 deraadt Exp $
# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
machine alpha # architecture, used by config; REQUIRED
@@ -83,11 +83,9 @@ ppb* at pci? # PCI-PCI bridges
sio* at pci? # Intel PCI-ISA bridge
tga* at pci? # DEC ZLXp-E[123] graphics
#pcn* at pci? # AMD PCnet-PCI Ethernet
+
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#option ISP_COMPILE_FW=1
-#option ISP_COMPILE_1040_FW=1
-#option ISP_COMPILE_1080_FW=1
-#option ISP_COMPILE_12160_FW=1
+option ISP_NOFIRMWARE
# Media Independent Interface (mii) drivers
amphy* at mii? # AMD 79C873 PHYs
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 9ce035bab88..86d5564ab25 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.192 2009/06/09 01:13:47 deraadt Exp $g
+# $OpenBSD: GENERIC,v 1.193 2009/06/24 11:38:40 deraadt Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -64,7 +64,6 @@ pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mpi* at pci? # LSI Logic MPT-Fusion Message Passing Interface
arc* at pci? # Areca RAID Controllers
-option ISP_COMPILE_FW
pciide* at pci?
kauaiata* at pci? # Apple ATA 100
wdc* at kauaiata?
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 4aeb39c4740..1611394c861 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.88 2009/06/02 06:31:08 todd Exp $
+# $OpenBSD: RAMDISK,v 1.89 2009/06/24 11:38:40 deraadt Exp $
#
# PPC GENERIC config file
#
@@ -63,7 +63,6 @@ pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mpi* at pci? # LSI Logic MPT-Fusion Message Passing Interface
arc* at pci? # Areca RAID Controllers
-option ISP_COMPILE_FW
pciide* at pci?
kauaiata* at pci? # Apple ATA 100
wdc* at kauaiata?
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index a93487f93dc..4f91160f827 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.8 2009/06/21 18:01:54 miod Exp $
+# $OpenBSD: GENERIC-IP27,v 1.9 2009/06/24 11:38:40 deraadt Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -61,7 +61,6 @@ owserial* at onewire?
#### SCSI
isp* at pci?
-option ISP_COMPILE_FW
siop* at pci?
mpi* at pci?
scsibus* at isp?
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 1a74e6332a1..d252164e261 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.7 2009/06/21 18:01:54 miod Exp $
+# $OpenBSD: GENERIC-IP30,v 1.8 2009/06/24 11:38:40 deraadt Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -61,7 +61,6 @@ owserial* at onewire?
#### SCSI
isp* at pci?
-option ISP_COMPILE_FW
siop* at pci?
mpi* at pci?
scsibus* at isp?
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 524ae940fa0..0c2e298a538 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-IP27,v 1.4 2009/06/21 18:01:54 miod Exp $
+# $OpenBSD: RAMDISK-IP27,v 1.5 2009/06/24 11:38:40 deraadt Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
@@ -68,7 +68,6 @@ owserial* at onewire?
#### SCSI controllers
isp* at pci?
-option ISP_COMPILE_FW
siop* at pci?
# USB Controllers
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 78140ee558c..908136ef613 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-IP30,v 1.4 2009/06/21 18:01:54 miod Exp $
+# $OpenBSD: RAMDISK-IP30,v 1.5 2009/06/24 11:38:40 deraadt Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
@@ -69,7 +69,6 @@ owserial* at onewire?
#### SCSI controllers
isp* at pci?
-option ISP_COMPILE_FW
siop* at pci?
# USB Controllers
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 376630791b2..315ac6f0cb5 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.91 2009/05/20 18:22:32 miod Exp $
+# $OpenBSD: GENERIC,v 1.92 2009/06/24 11:38:40 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -160,7 +160,6 @@ esp* at dma? flags 0x00ff000f # depending on model
#sun4c, sun4m
isp* at sbus?
-options ISP_COMPILE_1000_FW=1
# sun4m Ethernet - an AMD 7990 LANCE behind
# specialized DMA glue
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 2eab1f04d60..52526975cfe 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4C,v 1.59 2009/05/20 18:22:33 miod Exp $
+# $OpenBSD: SUN4C,v 1.60 2009/06/24 11:38:40 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
# Machine architecture; required by config(8)
@@ -99,7 +99,6 @@ esp* at dma? flags 0x00ff000f # depending on model
#sun4c, sun4m
isp* at sbus?
-options ISP_COMPILE_1000_FW=1
# sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
le0 at sbus0 # sun4c on-board
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index a13f8662a06..9ad6cdb4170 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4M,v 1.74 2009/05/20 18:22:33 miod Exp $
+# $OpenBSD: SUN4M,v 1.75 2009/06/24 11:38:40 deraadt Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -115,7 +115,6 @@ esp* at dma? flags 0x00ff000f # depending on model
#sun4c, sun4m
isp* at sbus?
-options ISP_COMPILE_1000_FW=1
# sun4m Ethernet - an AMD 7990 LANCE behind
# specialized DMA glue
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,
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index ab8ead7732b..3c9b6cecc21 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.239 2009/06/04 00:26:17 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.240 2009/06/24 11:38:40 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -111,7 +111,6 @@ scsibus* at ahc?
siop* at pci? # NCR 538XX SCSI controllers
scsibus* at siop?
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-option ISP_COMPILE_FW=1
pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
scsibus* at pcscp?
mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface
@@ -394,9 +393,7 @@ wd* at wdc? flags 0x0000
dma* at sbus? # SBus
esp* at dma? # SBus
esp* at sbus?
-
isp* at sbus?
-option ISP_COMPILE_1000_FW=1
# SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches
# to the underlying hardware controller.
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index a578460de87..afa4c9e57fa 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.90 2009/06/04 00:26:17 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.91 2009/06/24 11:38:40 deraadt Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -163,7 +163,6 @@ dma* at sbus? # SBus
esp* at dma? # SBus
esp* at sbus?
isp* at sbus?
-option ISP_COMPILE_1000_FW=1
scsibus* at esp?
ahc* at pci?
@@ -177,14 +176,13 @@ ahci* at jmb?
pciide* at jmb?
ahci* at pci?
-option ISP_COMPILE_FW=1
scsibus* at ahc?
scsibus* at siop?
-scsibus* at isp?
scsibus* at mpi?
scsibus* at sili?
scsibus* at arc?
scsibus* at ahci?
+scsibus* at isp?
# These entries find devices on all SCSI busses and assign
# unit numers dynamically.
@@ -321,3 +319,4 @@ pseudo-device rd 2 # ramdisk
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device vlan # IEEE 802.1Q VLAN
+pseudo-device bio 1
diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5
index 4f2be56df61..0c36748a2a8 100644
--- a/sys/arch/sparc64/conf/RAMDISKU5
+++ b/sys/arch/sparc64/conf/RAMDISKU5
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKU5,v 1.15 2009/06/04 00:26:17 kettenis Exp $
+# $OpenBSD: RAMDISKU5,v 1.16 2009/06/24 11:38:40 deraadt Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -60,9 +60,8 @@ atapiscsi* at pciide?
scsibus* at atapiscsi?
siop* at pci?
-#isp* at pci?
-#option ISP_COMPILE_FW=1
scsibus* at siop?
+#isp* at pci?
#scsibus* at isp?
# These entries find devices on all SCSI busses and assign
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index a0caffdc95c..4b8c6ce001f 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_pci.c,v 1.47 2009/06/24 11:00:53 krw Exp $ */
+/* $OpenBSD: isp_pci.c,v 1.48 2009/06/24 11:38:40 deraadt Exp $ */
/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.148 2007/06/26 23:08:57 mjacob Exp $*/
/*-
* Copyright (c) 1997-2006 by Matthew Jacob
@@ -44,15 +44,63 @@
#include <mips64/archtype.h>
#endif
+#ifndef ISP_NOFIRMWARE
+#define ISP_FIRMWARE_1040
+#define ISP_FIRMWARE_1080
+#define ISP_FIRMWARE_12160
+#define ISP_FIRMWARE_2100
+#define ISP_FIRMWARE_2200
+#define ISP_FIRMWARE_2300
+#endif
+
+#if defined(ISP_FIRMWARE_1040)
+#define ISP_1040_RISC_CODE (u_int16_t *) isp_1040_risc_code
#include <dev/microcode/isp/asm_1040.h>
+#else
+#define ISP_1040_RISC_CODE NULL
+#endif
+
+#if defined(ISP_FIRMWARE_1080)
+#define ISP_1080_RISC_CODE (u_int16_t *) isp_1080_risc_code
#include <dev/microcode/isp/asm_1080.h>
+#else
+#define ISP_1080_RISC_CODE NULL
+#endif
+
+#if defined(ISP_FIRMWARE_12160)
+#define ISP_12160_RISC_CODE (u_int16_t *) isp_12160_risc_code
#include <dev/microcode/isp/asm_12160.h>
+#else
+#define ISP_12160_RISC_CODE NULL
+#endif
+
+#if defined(ISP_FIRMWARE_2100)
+#define ISP_2100_RISC_CODE (u_int16_t *) isp_2100_risc_code
#include <dev/microcode/isp/asm_2100.h>
+#else
+#define ISP_2100_RISC_CODE NULL
+#endif
+
+#if defined(ISP_FIRMWARE_2200)
+#define ISP_2200_RISC_CODE (u_int16_t *) isp_2200_risc_code
#include <dev/microcode/isp/asm_2200.h>
+#else
+#define ISP_2200_RISC_CODE NULL
+#endif
+
+#if defined(ISP_FIRMWARE_2300)
+#define ISP_2300_RISC_CODE (u_int16_t *) isp_2300_risc_code
#include <dev/microcode/isp/asm_2300.h>
-#include <dev/microcode/isp/asm_2400.h>
+#else
+#define ISP_2300_RISC_CODE NULL
+#endif
-#define BUS_PROBE_DEFAULT 0
+#if defined(ISP_FIRMWARE_2400)
+#define ISP_2400_RISC_CODE (u_int16_t *) isp_2400_risc_code
+#include <dev/microcode/isp/asm_2400.h>
+#else
+#define ISP_2400_RISC_CODE NULL
+#endif
uint32_t isp_pci_rd_reg(ispsoftc_t *, int);
void isp_pci_wr_reg(ispsoftc_t *, int, uint32_t);
@@ -84,7 +132,7 @@ static struct ispmdvec mdvec = {
isp_pci_reset0,
isp_pci_reset1,
isp_pci_dumpregs,
- NULL,
+ ISP_1040_RISC_CODE,
BIU_BURST_ENABLE|BIU_PCI_CONF1_FIFO_64
};
@@ -98,7 +146,7 @@ static struct ispmdvec mdvec_1080 = {
isp_pci_reset0,
isp_pci_reset1,
isp_pci_dumpregs,
- isp_1080_risc_code,
+ ISP_1080_RISC_CODE,
BIU_BURST_ENABLE|BIU_PCI_CONF1_FIFO_64
};
@@ -112,7 +160,7 @@ static struct ispmdvec mdvec_12160 = {
isp_pci_reset0,
isp_pci_reset1,
isp_pci_dumpregs,
- isp_12160_risc_code,
+ ISP_12160_RISC_CODE,
BIU_BURST_ENABLE|BIU_PCI_CONF1_FIFO_64
};
@@ -126,7 +174,7 @@ static struct ispmdvec mdvec_2100 = {
isp_pci_reset0,
isp_pci_reset1,
isp_pci_dumpregs,
- isp_2100_risc_code
+ ISP_2100_RISC_CODE
};
static struct ispmdvec mdvec_2200 = {
@@ -139,7 +187,7 @@ static struct ispmdvec mdvec_2200 = {
isp_pci_reset0,
isp_pci_reset1,
isp_pci_dumpregs,
- isp_2200_risc_code
+ ISP_2200_RISC_CODE
};
static struct ispmdvec mdvec_2300 = {
@@ -152,7 +200,7 @@ static struct ispmdvec mdvec_2300 = {
isp_pci_reset0,
isp_pci_reset1,
isp_pci_dumpregs,
- isp_2300_risc_code
+ ISP_2300_RISC_CODE
};
static struct ispmdvec mdvec_2400 = {
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index a92dfaebc20..d23bf3066f8 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.13 2009/06/24 11:00:53 krw Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.14 2009/06/24 11:38:40 deraadt Exp $ */
/* $NetBSD: isp_sbus.c,v 1.46 2001/09/26 20:53:14 eeh Exp $ */
/*
@@ -72,9 +72,17 @@
#include <machine/autoconf.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
+
#include <dev/sbus/sbusvar.h>
static int isp_sbus_intr(void *);
@@ -87,10 +95,6 @@ static int isp_sbus_dmasetup(struct ispsoftc *, XS_T *, ispreq_t *, u_int32_t *,
u_int32_t);
static void isp_sbus_dmateardown(struct ispsoftc *, XS_T *, u_int32_t);
-#ifndef ISP_1000_RISC_CODE
-#define ISP_1000_RISC_CODE NULL
-#endif
-
static struct ispmdvec mdvec = {
isp_sbus_rd_isr,
isp_sbus_rd_reg,
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 01:38:49 +0000