diff options
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/i386/i386/userconfig.c | 1 | ||||
| -rw-r--r-- | sys/i386/include/physio_proc.h | 89 |
4 files changed, 100 insertions, 0 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index fa8bac7..24f252e 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -94,6 +94,10 @@ device bt device aha 1 device aic +device ncv # NCR 53C500 +device nsp # Workbit Ninja SCSI-3 +device stg # TMC 18C30/18C50 + # RAID controllers interfaced to the SCSI subsystem device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID device dpt # DPT Smartcache III, IV - See NOTES for options! diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index e937b82..51e0dc6 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1263,10 +1263,13 @@ options AML_DEBUG # ISP 12160 Ultra3 SCSI, # Qlogic ISP 2100 and ISP 2200 Fibre Channel host adapters. # ncr: NCR 53C810, 53C825 self-contained SCSI host adapters. +# ncv: NCR 53C500 based SCSI host adapters. +# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. # sym: Symbios/Logic 53C8XX family of PCI-SCSI I/O processors: # 53C810, 53C810A, 53C815, 53C825, 53C825A, 53C860, 53C875, # 53C876, 53C885, 53C895, 53C895A, 53C896, 53C897, 53C1510D, # 53C1010-33, 53C1010-66. +# stg: TMC 18C30, 18C50 based SCSI host adapters. # # Note that the order is important in order for Buslogic ISA/EISA cards to be @@ -1287,7 +1290,10 @@ device amd device isp device ispfw device ncr +device ncv +device nsp device sym +device stg # The aic7xxx driver will attempt to use memory mapped I/O for all PCI # controllers that have it configured only if this option is set. Unfortunately, diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 2e49e0d..35e2480 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -338,6 +338,7 @@ static DEV_INFO device_info[] = { {"aic", "Adaptec 152x SCSI and compatible SCSI cards", 0, CLS_STORAGE}, {"nca", "ProAudio Spectrum SCSI and compatibles", 0, CLS_STORAGE}, {"sea", "Seagate ST01/ST02 SCSI and compatibles", 0, CLS_STORAGE}, +{"stg", "TMC 18C30/18C50 based SCSI cards", 0, CLS_STORAGE}, {"ata", "ATA/ATAPI compatible disk controller", 0, CLS_STORAGE}, {"fdc", "Floppy disk controller", FLG_FIXED, CLS_STORAGE}, {"mcd", "Mitsumi CD-ROM", 0, CLS_STORAGE}, diff --git a/sys/i386/include/physio_proc.h b/sys/i386/include/physio_proc.h new file mode 100644 index 0000000..f31507e --- /dev/null +++ b/sys/i386/include/physio_proc.h @@ -0,0 +1,89 @@ +/* $FreeBSD$ */ +/* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */ +/* $NetBSD$ */ + +/* + * [NetBSD for NEC PC-98 series] + * Copyright (c) 1998 + * NetBSD/pc98 porting staff. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _I386_PHYSIO_PROC_H_ +#define _I386_PHYSIO_PROC_H_ +#include <sys/buf.h> +#include <sys/queue.h> + +struct physio_proc; +TAILQ_HEAD(physio_proc_head, physio_proc); +struct physio_proc_head physio_proc_freet, physio_proc_busyt; + +struct physio_proc { + TAILQ_ENTRY(physio_proc) pp_chain; + struct proc *pp_proc; +}; + +static __inline struct physio_proc *physio_proc_enter __P((struct buf *)); +static __inline void physio_proc_leave __P((struct physio_proc *)); + +static __inline struct physio_proc * +physio_proc_enter(bp) + struct buf *bp; +{ + struct physio_proc *pp; + int s; + + if (bp == NULL || (bp->b_flags & B_PHYS) == 0) + return NULL; + if ((pp = physio_proc_freet.tqh_first) == NULL) + return NULL; + + s = splstatclock(); + TAILQ_REMOVE(&physio_proc_freet, pp, pp_chain); +#if !defined(__FreeBSD__) || __FreeBSD_version < 400001 + pp->pp_proc = bp->b_proc; +#endif + TAILQ_INSERT_TAIL(&physio_proc_busyt, pp, pp_chain); + splx(s); + return pp; +} + +static __inline void +physio_proc_leave(pp) + struct physio_proc *pp; +{ + int s; + + if (pp == NULL) + return; + + s = splstatclock(); + TAILQ_REMOVE(&physio_proc_busyt, pp, pp_chain); + TAILQ_INSERT_TAIL(&physio_proc_freet, pp, pp_chain); + pp->pp_proc = NULL; + splx(s); +} + +void physio_proc_init __P((void)); +#endif /* _I386_PHYSIO_PROC_H_ */ |
