diff options
| author | oster <oster@NetBSD.org> | 1999-01-26 03:49:49 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 1999-01-26 03:49:49 +0000 |
| commit | a37be855297bc2fc6e328accf45e4a5148efedbb (patch) | |
| tree | e1385a512f08498a3437741401063cbaa859c025 /sys/dev/raidframe | |
| parent | 25b79ebda9f0c2119e20542b58a214240e72e2f7 (diff) | |
rf_ccmn.h no longer needed. Nuke it's inclusion from rf_disks.c.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_ccmn.h | 101 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_disks.c | 4 |
2 files changed, 1 insertions, 104 deletions
diff --git a/sys/dev/raidframe/rf_ccmn.h b/sys/dev/raidframe/rf_ccmn.h deleted file mode 100644 index fb966654b6d..00000000000 --- a/sys/dev/raidframe/rf_ccmn.h +++ /dev/null @@ -1,101 +0,0 @@ -/* $NetBSD: rf_ccmn.h,v 1.2 1999/01/26 02:33:50 oster Exp $ */ -/* - * Copyright (c) 1995 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Mark Holland - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -/* rf_ccmn.h - * header file that declares the ccmn routines, and includes - * the files needed to use them. - */ - - -#ifndef _RF__RF_CCMN_H_ -#define _RF__RF_CCMN_H_ - -#ifdef __osf__ -#include <sys/errno.h> -#include <sys/types.h> -#include <sys/file.h> -#include <sys/param.h> -#include <sys/uio.h> -#include <sys/time.h> -#include <sys/buf.h> -#include <sys/ioctl.h> -#include <io/common/iotypes.h> -#include <io/cam/cam_debug.h> -#include <io/cam/cam.h> -#include <io/cam/dec_cam.h> -#include <io/cam/uagt.h> -#include <io/cam/scsi_all.h> -#include <io/cam/scsi_direct.h> - -#ifdef KERNEL -#include <sys/conf.h> -#include <sys/mtio.h> -#include <io/common/devio.h> -#include <io/common/devdriver.h> -#include <io/cam/scsi_status.h> -#include <io/cam/pdrv.h> -#include <io/common/pt.h> -#include <sys/disklabel.h> -#include <io/cam/cam_disk.h> -#include <io/cam/ccfg.h> - -extern void ccmn_init(); -extern long ccmn_open_unit(); -extern void ccmn_close_unit(); -extern u_long ccmn_send_ccb(); -extern void ccmn_rem_ccb(); -extern void ccmn_abort_que(); -extern void ccmn_term_que(); -extern CCB_HEADER *ccmn_get_ccb(); -extern void ccmn_rel_ccb(); -extern CCB_SCSIIO *ccmn_io_ccb_bld(); -extern CCB_GETDEV *ccmn_gdev_ccb_bld(); -extern CCB_SETDEV *ccmn_sdev_ccb_bld(); -extern CCB_SETASYNC *ccmn_sasy_ccb_bld(); -extern CCB_RELSIM *ccmn_rsq_ccb_bld(); -extern CCB_PATHINQ *ccmn_pinq_ccb_bld(); -extern CCB_ABORT *ccmn_abort_ccb_bld(); -extern CCB_TERMIO *ccmn_term_ccb_bld(); -extern CCB_RESETDEV *ccmn_bdr_ccb_bld(); -extern CCB_RESETBUS *ccmn_br_ccb_bld(); -extern CCB_SCSIIO *ccmn_tur(); -extern CCB_SCSIIO *ccmn_mode_select(); -extern u_long ccmn_ccb_status(); -extern struct buf *ccmn_get_bp(); -extern void ccmn_rel_bp(); -extern u_char *ccmn_get_dbuf(); -extern void ccmn_rel_dbuf(); - -extern struct device *camdinfo[]; -extern struct controller *camminfo[]; -extern PDRV_UNIT_ELEM pdrv_unit_table[]; - -#endif /* KERNEL */ -#endif /* __osf__ */ - -#endif /* !_RF__RF_CCMN_H_ */ diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index fe326f81190..87c48b49e89 100644 --- a/sys/dev/raidframe/rf_disks.c +++ b/sys/dev/raidframe/rf_disks.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.3 1999/01/26 02:33:56 oster Exp $ */ +/* $NetBSD: rf_disks.c,v 1.4 1999/01/26 03:49:49 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -56,8 +56,6 @@ int raidlookup __P((char *, struct proc *p, struct vnode **)); #define DPRINTF6(a,b,c,d,e,f) if (rf_diskDebug) printf(a,b,c,d,e,f) #define DPRINTF7(a,b,c,d,e,f,g) if (rf_diskDebug) printf(a,b,c,d,e,f,g) -#include "rf_ccmn.h" - /**************************************************************************************** * * initialize the disks comprising the array |
