*** NO COMMENTS ***

@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*
- * Copyright 2005-06 Adaptec, Inc.
- * Copyright (c) 2005-06 Adaptec Inc., Achim Leubner
+ * Copyright (c) 2010-11 PMC-Sierra, Inc.
+ * Copyright (c) 2005-10 Adaptec Inc., Achim Leubner
  * Copyright (c) 2000 Michael Smith
  * Copyright (c) 2000 Scott Long
  * Copyright (c) 2000 BSDi
  * All rights reserved.
  *

@@ -28,18 +29,17 @@
  * 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: /repoman/r/ncvs/src/sys/sys/aac_ioctl.h,
- *    v 1.11 2004/12/09 22:20:25 scottl Exp $
  */
 
 #ifndef _AAC_IOCTL_H_
 #define _AAC_IOCTL_H_
 
+#pragma ident   "@(#)aac_ioctl.h        1.3     07/10/30 SMI"
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
 /*

@@ -81,11 +81,11 @@
 };
 
 struct aac_get_adapter_fib
 {
         uint32_t context;
-        int32_t wait;
+        int wait;
         uint32_t aif_fib;       /* RAID config app is 32bit */
 };
 
 struct aac_pci_info {
         uint32_t bus;

@@ -116,11 +116,11 @@
 typedef union {
         struct {
                 uint32_t largeLBA  : 1; /* disk support greater 2TB */
                 uint32_t IoctlBuf  : 1; /* ARCIOCTL call support */
                 uint32_t AIFSupport: 1; /* AIF support */
-                uint32_t JBODSupport:1; /* firmware+driver both support JBOD */
+                uint32_t JBODSupport:1; /* firmware + driver both support JBOD */
                 uint32_t fReserved : 28;
         } fBits;
         uint32_t fValue;
 } featuresState;
 

@@ -136,11 +136,11 @@
  * Aligned structure definitions for variable declarations that require
  * alignment.
  *
  * Normally the packed structures are defined in a way that if the initial
  * member is aligned, then the following members will also be aligned. So
- * we need only to make sure the packed structure, ie. the first member, is
+ * we need only to make the packed structure, ie. the first member, is
  * aligned to satisfy alignment requirement.
  */
 union aac_revision_align {
         struct aac_revision d;
         uint32_t dummy;