PERFORCE change 166545 for review

[Alexander Motin]

http://perforce.freebsd.org/chv.cgi?CH=166545

Change 166545 by mav at mav_mavbook on 2009/07/25 10:54:06

	Reduce diff from HEAD.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#13 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#27 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#4 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#14 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.h#5 delete

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#13 (text+ko) ====

@@ -22,6 +22,8 @@
  * 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.
+ *
+ * $FreeBSD: head/sys/cam/ata/ata_all.h 195534 2009-07-10 08:18:08Z scottl $
  */
 
 #ifndef	CAM_ATA_ALL_H

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#27 (text+ko) ====

@@ -63,7 +63,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
-#include <cam/ata/ata_xpt.h>
 #include <cam/ata/ata_all.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include "opt_cam.h"

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#4 (text+ko) ====

@@ -1,3 +1,35 @@
+/*-
+ * Copyright 2009 Scott Long
+ * 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,
+ *    without modification, immediately at the beginning of the file.
+ * 2. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD: head/sys/cam/cam_xpt_internal.h 195534 2009-07-10 08:18:08Z scottl $
+ */
+
+#ifndef _CAM_CAM_XPT_INTERNAL_H
+#define _CAM_CAM_XPT_INTERNAL_H 1
+
+/* Forward Declarations */
 struct cam_eb;
 struct cam_et;
 struct cam_ed;
@@ -170,3 +202,4 @@
 
 MALLOC_DECLARE(M_CAMXPT);
 
+#endif

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#14 (text+ko) ====

@@ -65,7 +65,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
-#include <cam/scsi/scsi_xpt.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include "opt_cam.h"