upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-04 17:05:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed nested #includes of <scsi/scsi_debug.h> and <scsi/scsi_driver.h>

Browse source 
from <scsi/scsiconf.h> and fixed everything that depended on them.
This commit is contained in:
Bruce Evans 1997-03-23 06:33:55 +00:00
parent db0ac821f2
commit 6617929964
16 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/i386/isa/ultra14f.c
View file

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.51 1997/02/22 09:37:20 peter Exp $
* $Id: ultra14f.c,v 1.52 1997/03/23 04:39:57 bde Exp $
*/
#include <sys/types.h>
@ -48,6 +48,7 @@
#endif /*KERNEL */
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include "ioconf.h"

3
sys/i386/scsi/aic7xxx.c
View file

@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: aic7xxx.c,v 1.105 1997/03/01 06:50:41 gibbs Exp $
* $Id: aic7xxx.c,v 1.106 1997/03/16 07:12:07 gibbs Exp $
*/
/*
* TODO:
@ -106,6 +106,7 @@
#include <scsi/scsi_debug.h>
#endif
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#if defined(__FreeBSD__)
#include <machine/clock.h>

3
sys/i386/scsi/bt.c
View file

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id$
* $Id: bt.c,v 1.12 1997/02/22 09:38:43 peter Exp $
*/
/*
@ -48,6 +48,7 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <i386/scsi/btreg.h>

4
sys/scsi/cd.c
View file

@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
* $Id: cd.c,v 1.78 1997/02/22 09:44:23 peter Exp $
* $Id: cd.c,v 1.79 1997/03/23 03:37:23 bde Exp $
*/
#include "opt_bounce.h"
@ -46,6 +46,8 @@
#include <scsi/scsi_cd.h>
#include <scsi/scsi_disk.h> /* rw_big and start_stop come from there */
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
static errval cd_get_parms __P((int, int));
static u_int32_t cd_size __P((int unit, int flags));

4
sys/scsi/od.c
View file

@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: od.c,v 1.28 1997/02/22 09:44:26 peter Exp $
*/
/*
@ -83,6 +83,8 @@
#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
#include <vm/vm.h>
#include <sys/dkstat.h>
#include <machine/md_var.h>

4
sys/scsi/pt.c
View file

@ -37,7 +37,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: pt.c,v 1.20 1997/02/22 09:44:26 peter Exp $
*/
#include "opt_bounce.h"
@ -54,6 +54,8 @@
#endif /*DEVFS*/
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
struct scsi_data {
struct buf_queue_head buf_queue;

3
sys/scsi/scsi_base.c
View file

@ -8,7 +8,7 @@
* file.
*
* Written by Julian Elischer (julian@dialix.oz.au)
* $Id$
* $Id: scsi_base.c,v 1.45 1997/02/22 09:44:28 peter Exp $
*/
#include "opt_bounce.h"
@ -31,6 +31,7 @@
#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
static errval sc_err1(struct scsi_xfer *);
static errval scsi_interpret_sense(struct scsi_xfer *);

3
sys/scsi/scsi_driver.c
View file

@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: scsi_driver.c,v 1.22 1997/02/22 09:44:31 peter Exp $
*
*/
@ -51,6 +51,7 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
#define GETUNIT(DEVICE, DEV) \

3
sys/scsi/scsi_ioctl.c
View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*End copyright
*
* $Id$
* $Id: scsi_ioctl.c,v 1.24 1997/02/22 09:44:33 peter Exp $
*
*
*/
@ -60,6 +60,7 @@
#include "scbus.h"
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <sys/scsiio.h>
static void scsierr(struct buf *, int); /* XXX ??? */

4
sys/scsi/scsiconf.c
View file

@ -16,7 +16,7 @@
*
* New configuration setup: dufault@hda.com
*
* $Id: scsiconf.c,v 1.80 1997/03/06 15:36:17 joerg Exp $
* $Id: scsiconf.c,v 1.81 1997/03/10 20:51:17 joerg Exp $
*/
#include "opt_scsi.h"
@ -47,6 +47,8 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
static struct extend_array *extend_new __P((void));
static void extend_release __P((struct extend_array *ea, int index));

4
sys/scsi/scsiconf.h
View file

@ -14,16 +14,14 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
* $Id$
* $Id: scsiconf.h,v 1.50 1997/02/22 09:44:35 peter Exp $
*/
#ifndef SCSI_SCSICONF_H
#define SCSI_SCSICONF_H 1
typedef int boolean;
typedef int errval;
#include <scsi/scsi_debug.h>
#include <scsi/scsi_all.h>
#include <scsi/scsi_driver.h>
/*
* The following documentation tries to describe the relationship between the

5
sys/scsi/sctarg.c
View file

@ -37,7 +37,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: sctarg.c,v 1.19 1997/02/22 09:44:36 peter Exp $
*/
#include "opt_bounce.h"
@ -54,7 +54,8 @@
#endif /*DEVFS*/
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
#define OPEN 0x01

4
sys/scsi/sd.c
View file

@ -15,7 +15,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
*
* $Id$
* $Id: sd.c,v 1.102 1997/02/22 09:44:37 peter Exp $
*/
#include "opt_bounce.h"
@ -41,6 +41,8 @@
#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
#include <vm/vm.h>
#include <vm/vm_param.h>

6
sys/scsi/st.c
View file

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id$
* $Id: st.c,v 1.76 1997/02/22 09:44:39 peter Exp $
*/
/*
@ -51,8 +51,8 @@
#include <scsi/scsi_all.h>
#include <scsi/scsi_tape.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
/* Defines for device specific stuff */
#define PAGE_0_SENSE_DATA_SIZE 12

4
sys/scsi/uk.c
View file

@ -2,7 +2,7 @@
* Driver for a device we can't identify.
* by Julian Elischer (julian@tfs.com)
*
* $Id$
* $Id: uk.c,v 1.16 1997/02/22 09:44:41 peter Exp $
*
* If you find that you are adding any code to this file look closely
* at putting it in "scsi_driver.c" instead.
@ -17,7 +17,7 @@
#endif /*DEVFS*/
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_driver.h>
static d_open_t ukopen;
static d_close_t ukclose;

4
sys/scsi/worm.c
View file

@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: worm.c,v 1.33 1997/02/22 09:44:41 peter Exp $
*/
#include "opt_bounce.h"
@ -63,7 +63,9 @@
#endif /*DEVFS*/
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsi_driver.h>
#include <scsi/scsi_worm.h>
/* #include <scsi/scsi_cd.h> */ /* XXX a CD-R includes all CD functionality */