summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/alpha/conf/GENERIC3
-rw-r--r--sys/alpha/conf/NOTES3
-rw-r--r--sys/amd64/conf/GENERIC3
-rw-r--r--sys/conf/NOTES6
-rw-r--r--sys/conf/options3
-rw-r--r--sys/dev/isp/isp_freebsd.c3
-rw-r--r--sys/dev/isp/isp_freebsd.h23
-rw-r--r--sys/dev/isp/isp_pci.c15
-rw-r--r--sys/i386/conf/GENERIC3
-rw-r--r--sys/i386/conf/LINT6
-rw-r--r--sys/i386/conf/NOTES6
-rw-r--r--sys/i386/conf/SMP-GENERIC3
-rw-r--r--sys/pci/isp_pci.c15
13 files changed, 36 insertions, 56 deletions
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 11a7053..21c1f97 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.5 1998/08/30 10:50:30 dfr Exp $
+# $Id: GENERIC,v 1.6 1998/09/16 08:22:09 dfr Exp $
machine "alpha"
cpu "EV4"
@@ -39,7 +39,6 @@ options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options UCONSOLE #Allow users to grab the console
options FAILSAFE #Be conservative
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 11a7053..21c1f97 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.5 1998/08/30 10:50:30 dfr Exp $
+# $Id: GENERIC,v 1.6 1998/09/16 08:22:09 dfr Exp $
machine "alpha"
cpu "EV4"
@@ -39,7 +39,6 @@ options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options UCONSOLE #Allow users to grab the console
options FAILSAFE #Be conservative
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 59e1e19..b27938a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
+# $Id: GENERIC,v 1.117 1998/09/17 03:15:30 msmith Exp $
machine "i386"
cpu "I386_CPU"
@@ -33,7 +33,6 @@ options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options UCONSOLE #Allow users to grab the console
options FAILSAFE #Be conservative
options USERCONFIG #boot -c editor
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4090f43..b304609 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.468 1998/09/17 21:54:17 nsouch Exp $
+# $Id: LINT,v 1.469 1998/09/18 00:01:39 ken Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -676,9 +676,6 @@ device sctarg0 at scbus? # SCSI target
# SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
# queue after a bus reset, and the number of milliseconds to
# freeze the device queue after a bus device reset.
-# SCSI_CAM: This is only currently needed for the QLogic ISP driver. If
-# you don't have the QLogic driver in your kernel, you don't
-# need this option.
options CAMDEBUG
options "CAM_DEBUG_BUS=-1"
options "CAM_DEBUG_TARGET=-1"
@@ -689,7 +686,6 @@ options SCSI_NO_SENSE_STRINGS
options SCSI_NO_OP_STRINGS
options SCSI_REPORT_GEOMETRY
options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
# Options for the CAM CDROM driver:
# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
diff --git a/sys/conf/options b/sys/conf/options
index f0a3519..827d316 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $Id: options,v 1.97 1998/09/15 09:59:15 gibbs Exp $
+# $Id: options,v 1.98 1998/09/15 11:44:42 phk Exp $
#
# On the handling of kernel options
#
@@ -151,7 +151,6 @@ CAM_DEBUG_BUS opt_cam.h
CAM_DEBUG_TARGET opt_cam.h
CAM_DEBUG_LUN opt_cam.h
CAM_DEBUG_FLAGS opt_cam.h
-SCSI_CAM opt_scsi.h
SCSI_DELAY opt_scsi.h
SCSI_REPORT_GEOMETRY opt_scsi.h
SCSI_NO_SENSE_STRINGS opt_scsi.h
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 37bbf13..f3935be 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -34,7 +34,8 @@
*/
#include <dev/isp/isp_freebsd.h>
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
+
static void isp_async __P((void *, u_int32_t, struct cam_path *, void *));
static void isp_poll __P((struct cam_sim *));
static void isp_action __P((struct cam_sim *, union ccb *));
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 98c93c1..6677b7c 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -35,14 +35,18 @@
#define _ISP_FREEBSD_H
#define ISP_PLATFORM_VERSION_MAJOR 0
-#define ISP_PLATFORM_VERSION_MINOR 96
+#define ISP_PLATFORM_VERSION_MINOR 97
-#include "opt_scsi.h"
-#ifdef SCSI_CAM
+#include <sys/param.h>
+
+#ifndef __FreeBSD_version
+#define __FreeBSD_version 226000
+#endif
+
+#if __FreeBSD_version >= 300004
#include <dev/isp/isp_freebsd_cam.h>
#else
-#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/buf.h>
@@ -55,15 +59,6 @@
#include <vm/pmap.h>
#include <sys/kernel.h>
-/*
- * Now that __FreeBSD_version is in sys/param.h, we can
- * automatically handle pre-3.0 cases.
- */
-
-#ifndef __FreeBSD_version
-#define __FreeBSD_version 226000
-#endif
-
#define ISP_SCSI_XFER_T struct scsi_xfer
struct isposinfo {
char name[8];
@@ -167,5 +162,5 @@ extern void isp_attach __P((struct ispsoftc *));
#define PVS "Qlogic ISP Driver, FreeBSD Non-Cam"
-#endif /* !SCSI_CAM */
+#endif /* __FreeBSD_version >= 300004 */
#endif /* _ISP_FREEBSD_H */
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index f0d7a75..29ac3ab 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -44,7 +44,7 @@
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
#include <machine/bus_memio.h>
#include <machine/bus_pio.h>
#include <machine/bus.h>
@@ -55,7 +55,7 @@ static void isp_pci_wr_reg __P((struct ispsoftc *, int, u_int16_t));
static int isp_pci_mbxdma __P((struct ispsoftc *));
static int isp_pci_dmasetup __P((struct ispsoftc *, ISP_SCSI_XFER_T *,
ispreq_t *, u_int8_t *, u_int8_t));
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
static void
isp_pci_dmateardown __P((struct ispsoftc *, ISP_SCSI_XFER_T *, u_int32_t));
#else
@@ -133,7 +133,7 @@ static void isp_pci_attach __P((pcici_t config_d, int unit));
/* This distinguishing define is not right, but it does work */
-#ifndef SCSI_CAM
+#if __FreeBSD_version < 300004
#define IO_SPACE_MAPPING 0
#define MEM_SPACE_MAPPING 1
typedef int bus_space_tag_t;
@@ -168,7 +168,7 @@ struct isp_pcisoftc {
pcici_t pci_id;
bus_space_tag_t pci_st;
bus_space_handle_t pci_sh;
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
bus_dma_tag_t parent_dmat;
bus_dma_tag_t cntrol_dmat;
bus_dmamap_t cntrol_dmap;
@@ -302,7 +302,7 @@ isp_pci_attach(config_id, unit)
return;
}
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
if (bus_dma_tag_create(NULL, 0, 0, BUS_SPACE_MAXADDR_32BIT,
BUS_SPACE_MAXADDR, NULL, NULL, 1<<24,
255, 1<<24, 0, &pcs->parent_dmat) != 0) {
@@ -411,7 +411,7 @@ isp_pci_wr_reg(isp, regoff, val)
}
}
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
static void isp_map_rquest __P((void *, bus_dma_segment_t *, int, int));
static void isp_map_result __P((void *, bus_dma_segment_t *, int, int));
static void isp_map_fcscrt __P((void *, bus_dma_segment_t *, int, int));
@@ -758,7 +758,8 @@ isp_pci_dmateardown(isp, ccb, handle)
bus_dmamap_unload(pci->parent_dmat, *dp);
}
-#else /* SCSI_CAM */
+#else /* __FreeBSD_version >= 300004 */
+
static int
isp_pci_mbxdma(isp)
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 59e1e19..b27938a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
+# $Id: GENERIC,v 1.117 1998/09/17 03:15:30 msmith Exp $
machine "i386"
cpu "I386_CPU"
@@ -33,7 +33,6 @@ options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options UCONSOLE #Allow users to grab the console
options FAILSAFE #Be conservative
options USERCONFIG #boot -c editor
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 4090f43..b304609 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.468 1998/09/17 21:54:17 nsouch Exp $
+# $Id: LINT,v 1.469 1998/09/18 00:01:39 ken Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -676,9 +676,6 @@ device sctarg0 at scbus? # SCSI target
# SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
# queue after a bus reset, and the number of milliseconds to
# freeze the device queue after a bus device reset.
-# SCSI_CAM: This is only currently needed for the QLogic ISP driver. If
-# you don't have the QLogic driver in your kernel, you don't
-# need this option.
options CAMDEBUG
options "CAM_DEBUG_BUS=-1"
options "CAM_DEBUG_TARGET=-1"
@@ -689,7 +686,6 @@ options SCSI_NO_SENSE_STRINGS
options SCSI_NO_OP_STRINGS
options SCSI_REPORT_GEOMETRY
options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
# Options for the CAM CDROM driver:
# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 4090f43..b304609 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.468 1998/09/17 21:54:17 nsouch Exp $
+# $Id: LINT,v 1.469 1998/09/18 00:01:39 ken Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -676,9 +676,6 @@ device sctarg0 at scbus? # SCSI target
# SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
# queue after a bus reset, and the number of milliseconds to
# freeze the device queue after a bus device reset.
-# SCSI_CAM: This is only currently needed for the QLogic ISP driver. If
-# you don't have the QLogic driver in your kernel, you don't
-# need this option.
options CAMDEBUG
options "CAM_DEBUG_BUS=-1"
options "CAM_DEBUG_TARGET=-1"
@@ -689,7 +686,6 @@ options SCSI_NO_SENSE_STRINGS
options SCSI_NO_OP_STRINGS
options SCSI_REPORT_GEOMETRY
options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
# Options for the CAM CDROM driver:
# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC
index c22f92a..d8fd948 100644
--- a/sys/i386/conf/SMP-GENERIC
+++ b/sys/i386/conf/SMP-GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: SMP-GENERIC,v 1.13 1998/09/15 10:01:13 gibbs Exp $
+# $Id: SMP-GENERIC,v 1.14 1998/09/16 18:27:45 andreas Exp $
machine "i386"
# SMP does NOT support 386/486 CPUs.
@@ -47,7 +47,6 @@ options "CD9660" #ISO 9660 Filesystem
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options BOUNCE_BUFFERS #include support for DMA bounce buffers
options UCONSOLE #Allow users to grab the console
options FAILSAFE #Be conservative
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index f0d7a75..29ac3ab 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -44,7 +44,7 @@
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
#include <machine/bus_memio.h>
#include <machine/bus_pio.h>
#include <machine/bus.h>
@@ -55,7 +55,7 @@ static void isp_pci_wr_reg __P((struct ispsoftc *, int, u_int16_t));
static int isp_pci_mbxdma __P((struct ispsoftc *));
static int isp_pci_dmasetup __P((struct ispsoftc *, ISP_SCSI_XFER_T *,
ispreq_t *, u_int8_t *, u_int8_t));
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
static void
isp_pci_dmateardown __P((struct ispsoftc *, ISP_SCSI_XFER_T *, u_int32_t));
#else
@@ -133,7 +133,7 @@ static void isp_pci_attach __P((pcici_t config_d, int unit));
/* This distinguishing define is not right, but it does work */
-#ifndef SCSI_CAM
+#if __FreeBSD_version < 300004
#define IO_SPACE_MAPPING 0
#define MEM_SPACE_MAPPING 1
typedef int bus_space_tag_t;
@@ -168,7 +168,7 @@ struct isp_pcisoftc {
pcici_t pci_id;
bus_space_tag_t pci_st;
bus_space_handle_t pci_sh;
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
bus_dma_tag_t parent_dmat;
bus_dma_tag_t cntrol_dmat;
bus_dmamap_t cntrol_dmap;
@@ -302,7 +302,7 @@ isp_pci_attach(config_id, unit)
return;
}
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
if (bus_dma_tag_create(NULL, 0, 0, BUS_SPACE_MAXADDR_32BIT,
BUS_SPACE_MAXADDR, NULL, NULL, 1<<24,
255, 1<<24, 0, &pcs->parent_dmat) != 0) {
@@ -411,7 +411,7 @@ isp_pci_wr_reg(isp, regoff, val)
}
}
-#ifdef SCSI_CAM
+#if __FreeBSD_version >= 300004
static void isp_map_rquest __P((void *, bus_dma_segment_t *, int, int));
static void isp_map_result __P((void *, bus_dma_segment_t *, int, int));
static void isp_map_fcscrt __P((void *, bus_dma_segment_t *, int, int));
@@ -758,7 +758,8 @@ isp_pci_dmateardown(isp, ccb, handle)
bus_dmamap_unload(pci->parent_dmat, *dp);
}
-#else /* SCSI_CAM */
+#else /* __FreeBSD_version >= 300004 */
+
static int
isp_pci_mbxdma(isp)
OpenPOWER on IntegriCloud