From owner-p4-projects@FreeBSD.ORG Wed Jan 5 22:41:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 482F916A4D0; Wed, 5 Jan 2005 22:41:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2147616A4CE for ; Wed, 5 Jan 2005 22:41:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D5D843D3F for ; Wed, 5 Jan 2005 22:41:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05MfP4G045484 for ; Wed, 5 Jan 2005 22:41:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05MfPNh045481 for perforce@freebsd.org; Wed, 5 Jan 2005 22:41:25 GMT (envelope-from jhb@freebsd.org) Date: Wed, 5 Jan 2005 22:41:25 GMT Message-Id: <200501052241.j05MfPNh045481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jan 2005 22:41:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=68359 Change 68359 by jhb@jhb_slimer on 2005/01/05 22:41:12 IFC @68356. Affected files ... .. //depot/projects/smpng/sys/cam/cam.c#6 integrate .. //depot/projects/smpng/sys/cam/cam.h#3 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/smpng/sys/cam/cam_debug.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#17 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#5 integrate .. //depot/projects/smpng/sys/cam/cam_queue.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_queue.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_sim.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_sim.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#24 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#21 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#24 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#56 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.h#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_iu.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.h#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_message.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#21 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targetio.h#4 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#42 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#35 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#11 integrate .. //depot/projects/smpng/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#5 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#19 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#15 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#11 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#6 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#21 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#21 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/smpng/sys/compat/netbsd/dvcfg.h#2 integrate .. //depot/projects/smpng/sys/compat/netbsd/physio_proc.h#2 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#23 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_exec.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#18 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#38 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.h#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#21 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_termios.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_types.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_util.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/smpng/sys/conf/NOTES#89 integrate Differences ... ==== //depot/projects/smpng/sys/cam/cam.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Generic utility routines for the Common Access Method layer. * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.8 2003/06/14 22:17:38 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.9 2005/01/05 22:34:34 imp Exp $"); #include #ifdef _KERNEL ==== //depot/projects/smpng/sys/cam/cam.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for the CAM system. * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.10 2002/01/09 03:38:58 msmith Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_H ==== //depot/projects/smpng/sys/cam/cam_ccb.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for CAM Control Blocks (CCBs). * * Copyright (c) 1997, 1998 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.27 2004/06/07 19:12:44 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.28 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/smpng/sys/cam/cam_debug.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Macros for tracing/loging information in the CAM layer * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_debug.h,v 1.7 2001/03/27 05:45:09 ken Exp $ + * $FreeBSD: src/sys/cam/cam_debug.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_DEBUG_H #define _CAM_CAM_DEBUG_H 1 ==== //depot/projects/smpng/sys/cam/cam_periph.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Common functions for CAM "type" (peripheral) drivers. * * Copyright (c) 1997, 1998 Justin T. Gibbs. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.57 2004/08/30 20:14:21 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.58 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_periph.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for CAM peripheral ("type") drivers. * * Copyright (c) 1997, 1998 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.15 2004/10/05 04:22:20 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.16 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_PERIPH_H ==== //depot/projects/smpng/sys/cam/cam_queue.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * CAM request queue management functions. * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.8 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_queue.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * CAM request queue management definitions. * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_queue.h,v 1.8 2000/05/26 02:01:42 jake Exp $ + * $FreeBSD: src/sys/cam/cam_queue.h,v 1.9 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_QUEUE_H ==== //depot/projects/smpng/sys/cam/cam_sim.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Common functions for SCSI Interface Modules (SIMs). * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.8 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_sim.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for SCSI Interface Modules (SIMs). * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.5 2001/01/24 01:46:18 jhb Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.6 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_SIM_H ==== //depot/projects/smpng/sys/cam/cam_xpt.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of the Common Access Method Transport (XPT) layer. * * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.145 2004/11/18 07:24:29 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.146 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_xpt.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ - /* +/*- * Data structures and definitions for dealing with the * Common Access Method Transport (xpt) layer. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.4 2001/03/27 05:45:10 ken Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_XPT_H ==== //depot/projects/smpng/sys/cam/cam_xpt_periph.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ - /* +/*- * Data structures and definitions for dealing with the * Common Access Method Transport (xpt) layer from peripheral * drivers. @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.3 1999/12/29 04:54:28 peter Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.4 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_XPT_PERIPH_H ==== //depot/projects/smpng/sys/cam/cam_xpt_sim.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ - /* +/*- * Data structures and definitions for dealing with the * Common Access Method Transport (xpt) layer. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.7 2000/01/14 23:08:46 gibbs Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_XPT_SIM_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of Utility functions for all SCSI device types. * * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.45 2004/08/13 18:45:04 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.46 2005/01/05 22:34:34 imp Exp $"); #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Largely written by Julian Elischer (julian@tfs.com) * for TRW Financial Systems. * @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.23 2003/04/30 00:35:22 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.24 2005/01/05 22:34:34 imp Exp $ */ /* ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 Justin T. Gibbs. * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry. * All rights reserved. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -/* +/*- * Portions of this driver taken from the original FreeBSD cd driver. * Written by Julian Elischer (julian@tfs.com) * for TRW Financial Systems for use under the MACH(2.5) operating system. @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.90 2004/09/05 21:15:58 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.91 2005/01/05 22:34:34 imp Exp $"); #include "opt_cd.h" ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 Justin T. Gibbs. * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry. * All rights reserved. @@ -31,7 +31,7 @@ * $NetBSD: ch.c,v 1.32 1998/01/12 09:49:12 thorpej Exp $ * */ -/* +/*- * Copyright (c) 1996, 1997 Jason R. Thorpe * All rights reserved. * @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.40 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.41 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_ch.h,v 1.4 2003/05/31 16:54:37 phk Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_ch.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ /* $NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $ */ -/* +/*- * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * @@ -41,7 +41,7 @@ * SCSI changer interface description */ -/* +/*- * Partially derived from software written by Stefan Grefen * (grefen@goofy.zdv.uni-mainz.de soon grefen@convex.com) * based on the SCSI System by written Julian Elischer (julian@tfs.com) ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#56 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of SCSI Direct Access Peripheral driver for CAM. * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.172 2004/08/29 11:10:09 des Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.173 2005/01/05 22:34:34 imp Exp $"); #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Structures and definitions for SCSI commands to Direct Access Devices */ -/* +/*- * Some lines of this file come from a file of the name "scsi.h" * distributed by OSF as part of mach2.5, * so the following disclaimer has been kept. @@ -30,7 +30,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* +/*- * Largely written by Julian Elischer (julian@tfs.com) * for TRW Financial Systems. * @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ #ifndef _SCSI_SCSI_DA_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_dvcfg.h#2 (text+ko) ==== @@ -1,8 +1,8 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_dvcfg.h,v 1.1 2000/10/23 12:55:27 non Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_dvcfg.h,v 1.2 2005/01/05 22:34:34 imp Exp $ */ /* $NecBSD: scsi_dvcfg.h,v 1.4 1998/03/14 07:05:06 kmatsuda Exp $ */ /* $NetBSD$ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1994, 1995, 1996, 1997, 1998 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_iu.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* +/*- * This file is in the public domain. - * $FreeBSD: src/sys/cam/scsi/scsi_iu.h,v 1.2 2003/01/20 18:05:46 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_iu.h,v 1.3 2005/01/05 22:34:34 imp Exp $ */ #ifndef _SCSI_SCSI_IU_H #define _SCSI_SCSI_IU_H 1 ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.c#11 (text+ko) ==== @@ -2,7 +2,7 @@ /* $NetBSD$ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.21 2003/06/14 22:17:38 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.22 2005/01/05 22:34:34 imp Exp $"); #define SCSI_LOW_STATICS #define SCSI_LOW_DEBUG @@ -22,7 +22,7 @@ #define SCSI_LOW_FLAGS_QUIRKS_OK #endif /* __FreeBSD__ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.h#5 (text+ko) ==== @@ -1,11 +1,11 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.7 2004/07/10 20:54:01 marcel Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ /* $NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $ */ /* $NetBSD$ */ #define SCSI_LOW_DIAGNOSTIC #define SCSI_LOW_ALT_QTAG_ALLOCATE -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NecBSD: scsi_low_pisa.c,v 1.13.18.1 2001/06/08 06:27:48 honda Exp $ */ /* $NetBSD$ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1995, 1996, 1997, 1998 * NetBSD/pc98 porting staff. All rights reserved. @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.7 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8 2005/01/05 22:34:34 imp Exp $"); #ifdef __NetBSD__ #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.h#3 (text+ko) ==== @@ -1,8 +1,8 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.4 2002/03/20 08:55:22 alfred Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ /* $NecBSD: scsi_low_pisa.h,v 1.3.14.1 2001/06/08 06:27:49 honda Exp $ */ /* $NetBSD$ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1998 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_message.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* +/*- * This file is in the public domain. - * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.6 2002/06/05 19:05:01 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.7 2005/01/05 22:34:34 imp Exp $ */ /* Messages (1 byte) */ /* I/T (M)andatory or (O)ptional */ ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997, 1998, 2000 Justin T. Gibbs. * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry. * All rights reserved. @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.41 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.42 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997, 1999 Kenneth D. Merry. * All rights reserved. * @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.4 2001/03/27 05:45:11 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ #ifndef _SCSI_PASS_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of SCSI Processor Target Peripheral driver for CAM. * * Copyright (c) 1998 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.42 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.43 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Structure and function declarations for Processor type devices. * * Copyright (c) 1998 Justin T. Gibbs @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.3 2001/01/12 02:49:40 steve Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.4 2005/01/05 22:34:35 imp Exp $ */ #ifndef _SCSI_SCSI_PT_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of SCSI Sequential Access Peripheral driver for CAM. * * Copyright (c) 1999, 2000 Matthew Jacob @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.101 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.102 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Structure and function declarations for the * SCSI Sequential Access Peripheral driver for CAM. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.9 2001/01/12 02:49:40 steve Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.10 2005/01/05 22:34:35 imp Exp $ */ #ifndef _SCSI_SCSI_SA_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2000 Matthew Jacob * All rights reserved. * @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.29 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.30 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.2 2000/01/15 22:40:04 mjacob Exp $ */ -/* +/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.3 2005/01/05 22:34:35 imp Exp $ */ +/*- * Copyright (c) 2000 by Matthew Jacob * All rights reserved. * ==== //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of the Target Mode 'Black Hole device' for CAM. * * Copyright (c) 1999 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.20 2003/09/30 08:03:52 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.21 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Generic SCSI Target Kernel Mode Driver * * Copyright (c) 2002 Nate Lawson. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.63 2004/08/15 06:24:40 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.64 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_targetio.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Ioctl definitions for the SCSI Target Driver * * Copyright (c) 2002 Nate Lawson. @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.11 2002/11/22 22:55:51 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.12 2005/01/05 22:34:35 imp Exp $ */ #ifndef _CAM_SCSI_SCSI_TARGETIO_H_ ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#42 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav * Copyright (c) 1999 Pierre Beyssac * Copyright (c) 1993 Jan-Simon Pendry @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.86 2004/12/01 21:33:02 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.87 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#35 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.121 2004/08/16 07:28:16 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.122 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999 Marcel Moolenaar * All rights reserved. * @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.21 2004/07/02 15:31:44 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.22 2005/01/05 22:34:35 imp Exp $ */ #ifndef _LINUX_IOCTL_H_ ==== //depot/projects/smpng/sys/compat/linux/linux_util.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994 Christos Zoulas * Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Scott Bartram @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.26 2004/06/23 06:35:43 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.27 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_util.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994 Christos Zoulas * Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Scott Bartram @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.23 2004/10/10 18:34:30 dwmalone Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.24 2005/01/05 22:34:35 imp Exp $ */ /* ==== //depot/projects/smpng/sys/compat/ndis/cfg_var.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.2 2003/12/18 03:51:21 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.3 2005/01/05 22:34:36 imp Exp $ */ #ifndef _CFG_VAR_H_ ==== //depot/projects/smpng/sys/compat/ndis/hal_var.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.4 2004/08/01 20:04:30 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.5 2005/01/05 22:34:36 imp Exp $ */ #ifndef _HAL_VAR_H_ ==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60 2004/08/16 18:50:20 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.61 2005/01/05 22:34:36 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/ndis/ndis_var.h#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.29 2004/08/16 18:50:20 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.30 2005/01/05 22:34:36 imp Exp $ */ #ifndef _NDIS_VAR_H_ ==== //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<