Convert C++ style comments to proper C ones.

Clean up C comments just a tad.
Fix ID's.

16 files changed, 87 insertions, 72 deletions

diff --git a/sys/dev/asr/MAINTAINER b/sys/dev/asr/MAINTAINER
index 5acec7d..337f8fb 100644
--- a/sys/dev/asr/MAINTAINER
+++ b/sys/dev/asr/MAINTAINER
@@ -1,2 +1,2 @@
 $FreeBSD$
-MAINTAINER = mark_salyzyn@adaptec.com, scott_long@btc.adaptec.com
+MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 12e251b..893950f 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000-2001 Adaptec Corporation
@@ -103,6 +102,8 @@
  *                      stopped using fordriver for holding on to the TID
  *                      use proprietary packet creation instead of scsi_inquire
  *                      CAM layer sends synchronize commands.
+ *
+ * $FreeBSD$
  */
 
 #define ASR_VERSION     1
@@ -363,11 +364,11 @@ typedef struct Asr_softc {
 #               define HA_OFF_LINE          2
 #               define HA_OFF_LINE_RECOVERY 3
         /* Configuration information */
-        /* The target id maximums we take     */
-        u_int8_t                ha_MaxBus;     /* Maximum bus              */
-        u_int8_t                ha_MaxId;      /* Maximum target ID        */
-        u_int8_t                ha_MaxLun;     /* Maximum target LUN            */
-        u_int8_t                ha_SgSize;     /* Max SG elements          */
+        /* The target id maximums we take */
+        u_int8_t                ha_MaxBus;     /* Maximum bus */
+        u_int8_t                ha_MaxId;      /* Maximum target ID */
+        u_int8_t                ha_MaxLun;     /* Maximum target LUN */
+        u_int8_t                ha_SgSize;     /* Max SG elements */
         u_int8_t                ha_pciBusNum;
         u_int8_t                ha_pciDeviceNum;
         u_int8_t                ha_adapter_target[MAX_CHANNEL+1];
@@ -375,14 +376,14 @@ typedef struct Asr_softc {
         u_int16_t               ha_Msgs_Count;
 
         /* Links into other parents and HBAs */
-        struct Asr_softc      * ha_next;       /* HBA list                 */
+        struct Asr_softc      * ha_next;       /* HBA list */
 
 #ifdef ASR_MEASURE_PERFORMANCE
-#define MAX_TIMEQ_SIZE  256 // assumes MAX 256 scsi commands sent
+#define MAX_TIMEQ_SIZE  256	/* assumes MAX 256 scsi commands sent */
         asr_perf_t              ha_performance;
         u_int32_t               ha_submitted_ccbs_count;
 
-        // Queueing macros for a circular queue
+        /* Queueing macros for a circular queue */
 #define TIMEQ_FREE_LIST_EMPTY(head, tail) (-1 == (head) && -1 == (tail))
 #define TIMEQ_FREE_LIST_FULL(head, tail) ((((tail) + 1) % MAX_TIMEQ_SIZE) == (head))
 #define ENQ_TIMEQ_FREE_LIST(item, Q, head, tail) \
@@ -407,7 +408,7 @@ typedef struct Asr_softc {
                 debug_asr_printf("asr: Dequeueing when TimeQ Free List is empty... This should not happen!\n"); \
         }
 
-        // Circular queue of time stamps
+        /* Circular queue of time stamps */
         struct timeval          ha_timeQ[MAX_TIMEQ_SIZE];
         u_int32_t               ha_timeQFreeList[MAX_TIMEQ_SIZE];
         int                     ha_timeQFreeHead;
@@ -2855,7 +2856,7 @@ asr_attach (ATTACH_ARGS)
                 {
                         u_int32_t i;
 
-                        // initialize free list for timeQ
+                        /* initialize free list for timeQ */
                         sc->ha_timeQFreeHead = 0;
                         sc->ha_timeQFreeTail = MAX_TIMEQ_SIZE - 1;
                         for (i = 0; i < MAX_TIMEQ_SIZE; i++) {
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index c04a1b6..fb68896 100644
--- a/sys/dev/asr/dptalign.h
+++ b/sys/dev/asr/dptalign.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-1999 Distributed Processing Technology Corporation
  * All rights reserved.
@@ -21,6 +20,7 @@
  *
  * DPT Alignment Description File
  *
+ * $FreeBSD$
  */
 #if (!defined(__DPTALIGN_H))
 #define       __DPTALIGN_H
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index 01fca9e..d2d2690 100644
--- a/sys/dev/asr/dptsig.h
+++ b/sys/dev/asr/dptsig.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000-2001 Adaptec Corporation.
@@ -20,6 +19,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
+ * $FreeBSD$
  */
 
 #ifndef __DPTSIG_H_
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index d2ec6a9..36240b1 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corproation.
@@ -76,6 +75,9 @@
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
+ *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 #if !defined(I2O_ADPTR_HDR)
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index 7295772..c1e08a2 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
@@ -76,6 +75,9 @@
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
+ *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 #if !defined(I2O_BASE_SCSI_HDR)
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index 0fe2fc1..724d39c 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************************
  *
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
@@ -46,6 +45,8 @@
  * become a "Registered Developer" of the I2O SIG. This can be done by calling
  * 415-750-8352 in the US, or via http://www.i2osig.org.
  *
+ * $FreeBSD$
+ *
  **************************************************************************/
 
 /*
@@ -141,8 +142,8 @@ typedef long                   INT32;
 typedef long                   *pINT32;
 typedef unsigned long          UINT32;
 typedef unsigned long          *pUINT32;
-//typedef SCSI_REQUEST_BLOCK     OS_REQUEST_T;
-//typedef PSCSI_REQUEST_BLOCK    pOS_REQUEST_T;
+/* typedef SCSI_REQUEST_BLOCK     OS_REQUEST_T; */
+/* typedef PSCSI_REQUEST_BLOCK    pOS_REQUEST_T; */
 #define STATIC                 static
 #ifndef __NEAR__
 # if (defined(__BORLANDC__))
@@ -921,7 +922,7 @@ typedef unsigned long          *pUINT32;
                 getLU4((&(x)->Identifier),0)
 #define I2O_DPT_DEVICE_INFO_SCALAR_setIdentifier(x,y)\
                 setLU4((&(x)->Identifier),0,y)
-/*     U8          LunInfo[8]; // SCSI-2 8-bit scalar LUN goes into offset 1 */
+/*     U8         LunInfo[8]; *//* SCSI-2 8-bit scalar LUN goes into offset 1 */
 #define I2O_DPT_DEVICE_INFO_SCALAR_getLunInfo(x)\
                 getU1((&(x)->LunInfo[0]),1)
 #define I2O_DPT_DEVICE_INFO_SCALAR_setLunInfo(x,y)\
@@ -961,22 +962,23 @@ typedef unsigned long          *pUINT32;
                 getLU2((&(x)->OrganizationID),0)
 #define I2O_PRIVATE_MESSAGE_FRAME_setOrganizationID(x,y) \
                 setLU2((&(x)->OrganizationID),0,y)
-/* typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
- *     I2O_PRIVATE_MESSAGE_FRAME PRIVATE_SCSI_SCB_EXECUTE_MESSAGE;
- *     BF                        TID:16; // Upper four bits currently are zero
- *     // Command is interpreted by the host
- *     BF                        Interpret:1;
- *     // if TRUE, deal with Physical Firmware Array information
- *     BF                        Physical:1;
- *     BF                        Reserved1:14;
- *     U8                        CDBLength;
- *     U8                        Reserved;
- *     I2O_SCB_FLAGS             SCBFlags;
- *     U8                        CDB[  I2O_SCSI_CDB_LENGTH=16  ];
- *     U32                       ByteCount;
- *     I2O_SG_ELEMENT            SGL;
- * } PRIVATE_SCSI_SCB_EXECUTE_MESSAGE, * PPRIVATE_SCSI_SCB_EXECUTE_MESSAGE;
- */
+#if 0
+typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
+	I2O_PRIVATE_MESSAGE_FRAME PRIVATE_SCSI_SCB_EXECUTE_MESSAGE;
+	BF                        TID:16; /* Upper four bits currently are zero */
+	/* Command is interpreted by the host */
+	BF                        Interpret:1;
+	/* if TRUE, deal with Physical Firmware Array information */
+	BF                        Physical:1;
+	BF                        Reserved1:14;
+	U8                        CDBLength;
+	U8                        Reserved;
+	I2O_SCB_FLAGS             SCBFlags;
+	U8                        CDB[  I2O_SCSI_CDB_LENGTH=16  ];
+	U32                       ByteCount;
+	I2O_SG_ELEMENT            SGL;
+} PRIVATE_SCSI_SCB_EXECUTE_MESSAGE, * PPRIVATE_SCSI_SCB_EXECUTE_MESSAGE;
+#endif
 /*
  *       PRIVATE_SCSI_SCB_EXECUTE_MESSAGE
  */
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 0add374..9db07cb 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -1,9 +1,10 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
  * All rights reserved.
  *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 #if !defined(I2O_DPT_HDR)
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index eb04135..331de69 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
@@ -76,6 +75,9 @@
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
+ *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 /*********************************************************************
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index f6e200d..5050462 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
@@ -76,6 +75,9 @@
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
+ *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 /*********************************************************************
@@ -417,12 +419,11 @@ typedef struct _I2O_FAILURE_REPLY_MESSAGE_FRAME {
 #   else
         U8                      LowestVersion;
         U8                      HighestVersion;
-/*      BF                      Severity:I2O_FAILCODE_SEVERITY_SZ;
-//      BF                      FailureCode:I2O_FAILCODE_CODE_SZ;
-//
-// Due to our compiler padding this structure and making it larger than
-// it really is (4 bytes larger), we are re-defining these two fields
-*/
+/*      BF                      Severity:I2O_FAILCODE_SEVERITY_SZ; */
+/*      BF                      FailureCode:I2O_FAILCODE_CODE_SZ; */
+/* Due to our compiler padding this structure and making it larger than
+ * it really is (4 bytes larger), we are re-defining these two fields
+ */
         U8                      Severity;
         U8                      FailureCode;
         BF                      reserved:I2O_RESERVED_4BITS;
@@ -937,7 +938,7 @@ typedef struct _I2O_SG_ELEMENT {
        /* Transport Detail Element */
        I2O_SGE_TRANSPORT_ELEMENT           Transport;
 #if (defined(sun) && defined(u))
-// there is a macro defined in Solaris sys/user.h for u, rename this to uSG
+/* there is a macro defined in Solaris sys/user.h for u, rename this to uSG */
    } uSG ;
 #else
    } u ;
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index 18511e6..77bde2b 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
@@ -76,6 +75,9 @@
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
+ *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 #ifndef __INCi2otypesh
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index ee9ba54..dec2e3c 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /****************************************************************
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
@@ -76,6 +75,9 @@
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
+ *
+ * $FreeBSD$
+ *
  ****************************************************************/
 
 /*********************************************************************
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index 9103c73..68ec3e7 100644
--- a/sys/dev/asr/osd_defs.h
+++ b/sys/dev/asr/osd_defs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-1999 Distributed Processing Technology Corporation
  * All rights reserved.
@@ -19,6 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
+ * $FreeBSD$
  */
 
 #ifndef		_OSD_DEFS_H
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index 0a3a760..2ab1c4e 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-1999 Distributed Processing Technology Corporation
  * All rights reserved.
@@ -19,6 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
+ * $FreeBSD$
  */
 
 #ifndef         __OSD_UNIX_H
@@ -141,11 +141,11 @@ typedef struct {
 #include <sys/ddidmareq.h>
 #include <sys/mutex.h>
 #include <sys/scsi/scsi.h>
-//#define _KERNEL
+/*#define _KERNEL */
 #include <sys/dditypes.h>
 #include <sys/ddi_impldefs.h>
 #include <sys/scsi/impl/transport.h>
-//#undef _KERNEL
+/* #undef _KERNEL */
 
 #undef MSG_DISCONNECT
 #define MSG_DISCONNECT  0x11L
@@ -157,8 +157,8 @@ typedef struct {
 #define DPT_SYSINFO    5
 #define DPT_BLINKLED   6
 #define I2OUSRCMD      7
-//#define I2ORESCANCMD 8	/* Use DPT_IO_ACCESS instead */
-//#define I2ORESETCMD  9	/* Use DPT_IO_ACCESS instead */
+/* #define I2ORESCANCMD 8 */	/* Use DPT_IO_ACCESS instead */
+/* #define I2ORESETCMD  9 */	/* Use DPT_IO_ACCESS instead */
 
 #define	DPT_MAX_DMA_SEGS  32         /* Max used Scatter/Gather seg         */
 
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index 4cf049c..b054f0a 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-1999 Distributed Processing Technology Corporation
  * All rights reserved.
@@ -19,6 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
+ * $FreeBSD$
  */
 
 #ifndef         __OSD_UTIL_H
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index a51a8b4..2474d1e 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (c) 1996-1999 Distributed Processing Technology Corporation
  * All rights reserved.
@@ -19,6 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
+ * $FreeBSD$
  */
 
 #ifndef         __SYS_INFO_H
@@ -94,12 +94,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -172,12 +172,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -213,12 +213,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -261,12 +261,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -295,12 +295,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -329,12 +329,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -363,12 +363,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else
@@ -397,12 +397,12 @@
 
 #ifdef  __cplusplus
 
-//---------- Portability Additions ----------- in sp_sinfo.cpp
+/*---------- Portability Additions ----------- in sp_sinfo.cpp */
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
 #endif /* DPT PORTABLE */
-//--------------------------------------------
+/*--------------------------------------------*/
 
    };
 #else