First pass of style(9) for #define's.

author: obrien <obrien@FreeBSD.org> 2002-05-14 00:53:08 +0000
committer: obrien <obrien@FreeBSD.org> 2002-05-14 00:53:08 +0000
commit: a10b57ba71436bf6decc5f2145b924efa1d53d3e (patch)
tree: e521fa9522b350f15cd0b36779a3a6722f5a9b81 /sys/dev/asr
parent: b028831d22d44b921c59e2a69aa1e904459aac6d (diff)
download: FreeBSD-src-a10b57ba71436bf6decc5f2145b924efa1d53d3e.zip
FreeBSD-src-a10b57ba71436bf6decc5f2145b924efa1d53d3e.tar.gz
15 files changed, 1677 insertions, 1677 deletions
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index a232d62..a3c8d1d 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -106,12 +106,12 @@
  * $FreeBSD$
  */
 
-#define ASR_VERSION     1
-#define ASR_REVISION    '0'
-#define ASR_SUBREVISION '8'
-#define ASR_MONTH       8
-#define ASR_DAY         21
-#define ASR_YEAR        2001 - 1980
+#define	ASR_VERSION     1
+#define	ASR_REVISION    '0'
+#define	ASR_SUBREVISION '8'
+#define	ASR_MONTH       8
+#define	ASR_DAY         21
+#define	ASR_YEAR        2001 - 1980
 
 /*
  *      Debug macros to reduce the unsightly ifdefs
@@ -196,7 +196,7 @@
 # define debug_usr_cmd_dump_message(message)
 #endif /* DEBUG_ASR_USR_CMD */
 
-#define dsDescription_size 46   /* Snug as a bug in a rug */
+#define	dsDescription_size 46   /* Snug as a bug in a rug */
 #include "dev/asr/dptsig.h"
 
 static dpt_sig_S ASR_sig = {
@@ -246,8 +246,8 @@ static dpt_sig_S ASR_sig = {
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
 
-#define STATIC static
-#define INLINE
+#define	STATIC static
+#define	INLINE
 
 #if (defined(DEBUG_ASR) && (DEBUG_ASR > 0))
 # undef STATIC
@@ -255,12 +255,12 @@ static dpt_sig_S ASR_sig = {
 # undef INLINE
 # define INLINE
 #endif
-#define IN
-#define OUT
-#define INOUT
+#define	IN
+#define	OUT
+#define	INOUT
 
-#define osdSwap4(x) ((u_long)ntohl((u_long)(x)))
-#define KVTOPHYS(x) vtophys(x)
+#define	osdSwap4(x) ((u_long)ntohl((u_long)(x)))
+#define	KVTOPHYS(x) vtophys(x)
 #include        "dev/asr/dptalign.h"
 #include        "dev/asr/i2oexec.h"
 #include        "dev/asr/i2obscsi.h"
@@ -272,14 +272,14 @@ static dpt_sig_S ASR_sig = {
 
 /* Configuration Definitions */
 
-#define SG_SIZE          58     /* Scatter Gather list Size              */
-#define MAX_TARGET_ID    126    /* Maximum Target ID supported           */
-#define MAX_LUN          255    /* Maximum LUN Supported                 */
-#define MAX_CHANNEL      7      /* Maximum Channel # Supported by driver */
-#define MAX_INBOUND      2000   /* Max CCBs, Also Max Queue Size         */
-#define MAX_OUTBOUND     256    /* Maximum outbound frames/adapter       */
-#define MAX_INBOUND_SIZE 512    /* Maximum inbound frame size            */
-#define MAX_MAP          4194304L /* Maximum mapping size of IOP         */
+#define	SG_SIZE          58     /* Scatter Gather list Size              */
+#define	MAX_TARGET_ID    126    /* Maximum Target ID supported           */
+#define	MAX_LUN          255    /* Maximum LUN Supported                 */
+#define	MAX_CHANNEL      7      /* Maximum Channel # Supported by driver */
+#define	MAX_INBOUND      2000   /* Max CCBs, Also Max Queue Size         */
+#define	MAX_OUTBOUND     256    /* Maximum outbound frames/adapter       */
+#define	MAX_INBOUND_SIZE 512    /* Maximum inbound frame size            */
+#define	MAX_MAP          4194304L /* Maximum mapping size of IOP         */
                                 /* Also serves as the minimum map for    */
                                 /* the 2005S zero channel RAID product   */
 
@@ -379,14 +379,14 @@ typedef struct Asr_softc {
         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 */
-#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) \
+#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) \
         if (!TIMEQ_FREE_LIST_FULL((head), (tail))) { \
                 if TIMEQ_FREE_LIST_EMPTY((head),(tail)) { \
                         (head) = (tail) = 0; \
@@ -397,7 +397,7 @@ typedef struct Asr_softc {
         else { \
                 debug_asr_printf("asr: Enqueueing when TimeQ Free List is full... This should not happen!\n"); \
         }
-#define DEQ_TIMEQ_FREE_LIST(item, Q, head, tail) \
+#define	DEQ_TIMEQ_FREE_LIST(item, Q, head, tail) \
         if (!TIMEQ_FREE_LIST_EMPTY((head), (tail))) { \
                 item  = Q[(head)]; \
                 if ((head) == (tail)) { (head) = (tail) = -1; } \
@@ -424,23 +424,23 @@ STATIC Asr_softc_t * Asr_softc;
 
 /* Externally callable routines */
 #if __FreeBSD_version >= 400000
-#define PROBE_ARGS  IN device_t tag
-#define PROBE_RET   int
-#define PROBE_SET() u_int32_t id = (pci_get_device(tag)<<16)|pci_get_vendor(tag)
-#define PROBE_RETURN(retval) if(retval){device_set_desc(tag,retval);return(0);}else{return(ENXIO);}
-#define ATTACH_ARGS IN device_t tag
-#define ATTACH_RET  int
-#define ATTACH_SET() int unit = device_get_unit(tag)
-#define ATTACH_RETURN(retval) return(retval)
+#define	PROBE_ARGS  IN device_t tag
+#define	PROBE_RET   int
+#define	PROBE_SET() u_int32_t id = (pci_get_device(tag)<<16)|pci_get_vendor(tag)
+#define	PROBE_RETURN(retval) if(retval){device_set_desc(tag,retval);return(0);}else{return(ENXIO);}
+#define	ATTACH_ARGS IN device_t tag
+#define	ATTACH_RET  int
+#define	ATTACH_SET() int unit = device_get_unit(tag)
+#define	ATTACH_RETURN(retval) return(retval)
 #else
-#define PROBE_ARGS  IN pcici_t tag, IN pcidi_t id
-#define PROBE_RET   const char *
-#define PROBE_SET()
-#define PROBE_RETURN(retval) return(retval)
-#define ATTACH_ARGS IN pcici_t tag, IN int unit
-#define ATTACH_RET  void
-#define ATTACH_SET()
-#define ATTACH_RETURN(retval) return
+#define	PROBE_ARGS  IN pcici_t tag, IN pcidi_t id
+#define	PROBE_RET   const char *
+#define	PROBE_SET()
+#define	PROBE_RETURN(retval) return(retval)
+#define	ATTACH_ARGS IN pcici_t tag, IN int unit
+#define	ATTACH_RET  void
+#define	ATTACH_SET()
+#define	ATTACH_RETURN(retval) return
 #endif
 /* I2O HDM interface */
 STATIC PROBE_RET      asr_probe(PROBE_ARGS);
@@ -575,7 +575,7 @@ DATA_SET (mode0_pciset, mode0_pcidev);
  *
  * only ioctl is used. the sd driver provides all other access.
  */
-#define CDEV_MAJOR 154   /* preferred default character major */
+#define	CDEV_MAJOR 154   /* preferred default character major */
 STATIC struct cdevsw asr_cdevsw = {
         asr_open,       /* open     */
         asr_close,      /* close    */
@@ -640,8 +640,8 @@ SYSINIT(asrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,asr_drvinit,NULL)
 #endif
 
 /* I2O support routines */
-#define defAlignLong(STRUCT,NAME) char NAME[sizeof(STRUCT)]
-#define getAlignLong(STRUCT,NAME) ((STRUCT *)(NAME))
+#define	defAlignLong(STRUCT,NAME) char NAME[sizeof(STRUCT)]
+#define	getAlignLong(STRUCT,NAME) ((STRUCT *)(NAME))
 
 /*
  *      Fill message with default.
@@ -662,7 +662,7 @@ ASR_fillMessage (
         return (Message_Ptr);
 } /* ASR_fillMessage */
 
-#define EMPTY_QUEUE ((U32)-1L)
+#define	EMPTY_QUEUE ((U32)-1L)
 
 STATIC INLINE U32
 ASR_getMessage(
@@ -1703,7 +1703,7 @@ ASR_queue(
 
 
 /* Simple Scatter Gather elements */
-#define SG(SGL,Index,Flags,Buffer,Size)                            \
+#define	SG(SGL,Index,Flags,Buffer,Size)                            \
         I2O_FLAGS_COUNT_setCount(                                  \
           &(((PI2O_SG_ELEMENT)(SGL))->u.Simple[Index].FlagsCount), \
           Size);                                                   \
@@ -3398,12 +3398,12 @@ asr_action(
 } /* asr_action */
 
 #ifdef ASR_MEASURE_PERFORMANCE
-#define WRITE_OP 1
-#define READ_OP 2
-#define min_submitR     sc->ha_performance.read_by_size_min_time[index]
-#define max_submitR     sc->ha_performance.read_by_size_max_time[index]
-#define min_submitW     sc->ha_performance.write_by_size_min_time[index]
-#define max_submitW     sc->ha_performance.write_by_size_max_time[index]
+#define	WRITE_OP 1
+#define	READ_OP 2
+#define	min_submitR     sc->ha_performance.read_by_size_min_time[index]
+#define	max_submitR     sc->ha_performance.read_by_size_max_time[index]
+#define	min_submitW     sc->ha_performance.write_by_size_min_time[index]
+#define	max_submitW     sc->ha_performance.write_by_size_max_time[index]
 
 STATIC INLINE void
 asr_IObySize(
@@ -3645,8 +3645,8 @@ asr_intr (
                                 submitted_time = 0xffffffff;
                         }
 
-#define maxctime sc->ha_performance.max_command_time[ccb->csio.cdb_io.cdb_bytes[0]]
-#define minctime sc->ha_performance.min_command_time[ccb->csio.cdb_io.cdb_bytes[0]]
+#define	maxctime sc->ha_performance.max_command_time[ccb->csio.cdb_io.cdb_bytes[0]]
+#define	minctime sc->ha_performance.min_command_time[ccb->csio.cdb_io.cdb_bytes[0]]
                         if (submitted_time != 0xffffffff) {
                                 if ( maxctime < submitted_time ) {
                                         maxctime = submitted_time;
@@ -3841,7 +3841,7 @@ typedef U32   DPT_RTN_T;
 #undef SCSI_RESET       /* Conflicts with "scsi/scsiconf.h" defintion */
 #include        "dev/asr/osd_unix.h"
 
-#define asr_unit(dev)     minor(dev)
+#define	asr_unit(dev)     minor(dev)
 
 STATIC INLINE Asr_softc_t *
 ASR_get_sc (
@@ -4443,9 +4443,9 @@ asr_ioctl(
                 CtlrInfo.blinkState = i;
                 CtlrInfo.pciBusNum = sc->ha_pciBusNum;
                 CtlrInfo.pciDeviceNum = sc->ha_pciDeviceNum;
-#define FLG_OSD_PCI_VALID 0x0001
-#define FLG_OSD_DMA       0x0002
-#define FLG_OSD_I2O       0x0004
+#define	FLG_OSD_PCI_VALID 0x0001
+#define	FLG_OSD_DMA       0x0002
+#define	FLG_OSD_I2O       0x0004
                 CtlrInfo.hbaFlags = FLG_OSD_PCI_VALID | FLG_OSD_DMA | FLG_OSD_I2O;
                 CtlrInfo.Interrupt = sc->ha_irq;
                 if (cmd & 0xFFFF0000) {
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index fb68896..7a3caf9 100644
--- a/sys/dev/asr/dptalign.h
+++ b/sys/dev/asr/dptalign.h
@@ -23,7 +23,7 @@
  * $FreeBSD$
  */
 #if (!defined(__DPTALIGN_H))
-#define       __DPTALIGN_H
+#define	      __DPTALIGN_H
 
 /*
  *      File -  DPTALIGN.H
@@ -170,25 +170,25 @@
 # endif
 #endif
 
-#define I2O_TID_MASK	((unsigned DPT_4_BYTES) ((1L<<I2O_TID_SZ)-1))
+#define	I2O_TID_MASK	((unsigned DPT_4_BYTES) ((1L<<I2O_TID_SZ)-1))
 
 /*
  *      Now the access macros used throughout in order to methodize the
  * active alignment.
  */
-#define getUP1(x,y)  (((unsigned char __FAR__ *)(x))+(unsigned DPT_4_BYTES)(y))
-#define getU1(x,y)   (*getUP1(x,y))
-#define setU1(x,y,z) (*((unsigned char *)getUP1(x,y)) = (unsigned char)(z))
-#define orU1(x,y,z)  (*getUP1(x,y) |= (unsigned char)(z))
-#define andU1(x,y,z) (*getUP1(x,y) &= (unsigned char)(z))
-#define getUP2(x,y)  ((unsigned short __FAR__ *)(((unsigned char __FAR__ *) \
+#define	getUP1(x,y)  (((unsigned char __FAR__ *)(x))+(unsigned DPT_4_BYTES)(y))
+#define	getU1(x,y)   (*getUP1(x,y))
+#define	setU1(x,y,z) (*((unsigned char *)getUP1(x,y)) = (unsigned char)(z))
+#define	orU1(x,y,z)  (*getUP1(x,y) |= (unsigned char)(z))
+#define	andU1(x,y,z) (*getUP1(x,y) &= (unsigned char)(z))
+#define	getUP2(x,y)  ((unsigned short __FAR__ *)(((unsigned char __FAR__ *) \
                                 (x))+(unsigned DPT_4_BYTES)(y)))
-#define getBU2(x,y)   ((unsigned short)osdLocal2((unsigned short __FAR__ *)  \
+#define	getBU2(x,y)   ((unsigned short)osdLocal2((unsigned short __FAR__ *)  \
                                 getUP1(x,y)))
-#define getLU2(x,y)  ((unsigned short)osdSLocal2((unsigned short __FAR__ *) \
+#define	getLU2(x,y)  ((unsigned short)osdSLocal2((unsigned short __FAR__ *) \
                                 getUP1(x,y)))
 /* to be deleted  */
-#define getU2(x,y)   ((unsigned short)osdLocal2((unsigned short __FAR__ *)  \
+#define	getU2(x,y)   ((unsigned short)osdLocal2((unsigned short __FAR__ *)  \
                                 getUP1(x,y)))
 #if (!defined(setU2))
 # define setU2(x,y,z) { unsigned short hold = (unsigned short)(z);  \
@@ -210,7 +210,7 @@
 #endif
 
 /* to be deleted */
-#define getU3(x,y)   ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
+#define	getU3(x,y)   ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
                                 getUP1(x,y)))
 #if (!defined(setU3))
 # if (defined(_DPT_BIG_ENDIAN))
@@ -231,7 +231,7 @@
 #endif
 /* up to here to be deleted */
 
-#define getBU3(x,y)   ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
+#define	getBU3(x,y)   ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
                                 getUP1(x,y)))
 #if (!defined(setBU3))
 # if (defined(_DPT_BIG_ENDIAN))
@@ -250,14 +250,14 @@
         }
 # endif
 #endif
-#define getUP4(x,y)  ((unsigned DPT_4_BYTES __FAR__ *)(((unsigned char __FAR__ *) \
+#define	getUP4(x,y)  ((unsigned DPT_4_BYTES __FAR__ *)(((unsigned char __FAR__ *) \
                                 (x))+(unsigned DPT_4_BYTES)(y)))
-#define getBU4(x,y)   ((unsigned DPT_4_BYTES)osdLocal4((unsigned DPT_4_BYTES __FAR__ *)   \
+#define	getBU4(x,y)   ((unsigned DPT_4_BYTES)osdLocal4((unsigned DPT_4_BYTES __FAR__ *)   \
                                 getUP1(x,y)))
-#define getLU4(x,y)  ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *)  \
+#define	getLU4(x,y)  ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *)  \
                                 getUP1(x,y)))
 /* to be deleted */
-#define getU4(x,y)  ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *)  \
+#define	getU4(x,y)  ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *)  \
                                 getUP1(x,y)))
 #if (!defined(setU4))
 # define setU4(x,y,z) { unsigned DPT_4_BYTES hold = z;                 \
@@ -280,7 +280,7 @@
 #endif
 
 	
-#define osdSwap16bit(x)	( (((unsigned short )x & 0xf000) >> 12) | \
+#define	osdSwap16bit(x)	( (((unsigned short )x & 0xf000) >> 12) | \
 			  (((unsigned short )x & 0x0f00) >> 4) | \
 			  (((unsigned short )x & 0x00f0) << 4)  | \
 			  (((unsigned short )x & 0x000f) << 12 )   )	
@@ -289,56 +289,56 @@
  * note that in big endian a 12 bit number (0x123) is stored as   1203
  */
 
-#define osdSwap12bit(x)	(( (((unsigned short )x & 0x0f00) >> 8) | \
+#define	osdSwap12bit(x)	(( (((unsigned short )x & 0x0f00) >> 8) | \
 			((unsigned short )x & 0x00f0)  | \
 			(((unsigned short )x & 0x000f) << 8 )  ) )	
 
-#define osdSwap8bit(x)	( (((unsigned char )x & 0x0f) << 4) | \
+#define	osdSwap8bit(x)	( (((unsigned char )x & 0x0f) << 4) | \
 			(((unsigned char )x &0xf0) >> 4 ) )
 
-#define getL24bit1(w,x,y)   ((unsigned DPT_4_BYTES)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
+#define	getL24bit1(w,x,y)   ((unsigned DPT_4_BYTES)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
 			+ ((((unsigned DPT_4_BYTES)((unsigned char __FAR__ *)(&w->x))[1+(y)]) << 8) & 0xFF00) \
 			+ ((((unsigned DPT_4_BYTES)((unsigned char __FAR__ *)(&w->x))[2+(y)]) << 16) & 0xFF0000))
 
-#define setL24bit1(w,x,y,z)  { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
+#define	setL24bit1(w,x,y,z)  { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
 			   ((unsigned char __FAR__ *)(&w->x))[1+(y)] = ((z) >> 8) & 0xFF; \
 			   ((unsigned char __FAR__ *)(&w->x))[2+(y)] = ((z) >> 16) & 0xFF; \
 			   }
 
-#define getL16bit(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
+#define	getL16bit(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
 			 + ((((unsigned short)((unsigned char __FAR__ *)(&w->x))[1+(y)]) << 8) & 0xFF00))
 
-#define setL16bit(w,x,y,z)  { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
+#define	setL16bit(w,x,y,z)  { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
 			   ((unsigned char __FAR__ *)(&w->x))[1+(y)] = ((z) >> 8) & 0xFF; \
 			   }
 
-#define getL16bit2(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
+#define	getL16bit2(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
 			 + ((((unsigned short)((unsigned char __FAR__ *)(&w->x))[3+(y)]) << 8) & 0xFF00))
 
-#define setL16bit2(w,x,y,z)  { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
+#define	setL16bit2(w,x,y,z)  { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
 			   ((unsigned char __FAR__ *)(&w->x))[3+(y)] = ((z) >> 8) & 0xFF; \
 			   }
 
 /* y is the number of bytes from beg of DPT_4_BYTES to get upper 4 bit of the addressed byte */
-#define getL4bit(w,x,y) \
+#define	getL4bit(w,x,y) \
 	((unsigned char)(((unsigned char __FAR__ *)(&w->x))[0+(y)] >> 4) & 0x0f)
 
-#define setL4bit(w,x,y,z) { \
+#define	setL4bit(w,x,y,z) { \
 			   ((unsigned char __FAR__ *)(&w->x))[0+(y)] &= 0xF0; \
 				((unsigned char __FAR__ *)(&w->x))[0+(y)] |= ((z) << 4) & 0xF0; \
 				}
 /* y is number of bytes from beg of DPT_4_BYTES */
-#define getL1bit(w,x,y) \
+#define	getL1bit(w,x,y) \
 	((unsigned char)(((unsigned char __FAR__ *)(&w->x))[0+(y)] ) & 0x01)
 
-#define setL1bit(w,x,y,z) { \
+#define	setL1bit(w,x,y,z) { \
 			   ((unsigned char __FAR__ *)(&w->x))[0+(y)] &= 0xFE; \
 				((unsigned char __FAR__ *)(&w->x))[0+(y)] |= (z) & 0x01; \
 				}
-#define getL1bit1(w,x,y) \
+#define	getL1bit1(w,x,y) \
 	((unsigned char)(((unsigned char __FAR__ *)(&w->x))[0+(y)] >> 1) & 0x01)
 
-#define setL1bit1(w,x,y,z) { \
+#define	setL1bit1(w,x,y,z) { \
 			   ((unsigned char __FAR__ *)(&w->x))[0+(y)] &= 0xFD; \
 				((unsigned char __FAR__ *)(&w->x))[0+(y)] |= (z << 1) & 0x02; \
 				}
@@ -346,37 +346,37 @@
 
 
 /* 12 bit at the first 12 bits of a DPT_4_BYTES word */
-#define getL12bit(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
+#define	getL12bit(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
 			 + ((((unsigned short)((unsigned char __FAR__ *)(&w->x))[1+(y)]) << 8) & 0xF00))
 
-#define setL12bit(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
+#define	setL12bit(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
 			   ((unsigned char __FAR__ *)(&w->x))[1+(y)] &= 0xF0; \
 			   ((unsigned char __FAR__ *)(&w->x))[1+(y)] |= ((z) >> 8) & 0xF; \
 			   }
 /* 12 bit after another 12 bit in DPT_4_BYTES word */
-#define getL12bit1(w,x,y)   (((unsigned short)((unsigned char __FAR__ *)(&w->x))[1+(y)]) >> 4 \
+#define	getL12bit1(w,x,y)   (((unsigned short)((unsigned char __FAR__ *)(&w->x))[1+(y)]) >> 4 \
 			 + ((((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)]) << 4) ))
 
-#define setL12bit1(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[1+(y)] &= 0x0F; \
+#define	setL12bit1(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[1+(y)] &= 0x0F; \
 			   ((unsigned char __FAR__ *)(&w->x))[1+(y)] |= ((z) & 0xF) << 4; \
 			   ((unsigned char __FAR__ *)(&w->x))[2+(y)] &= 0x00;\
 			   ((unsigned char __FAR__ *)(&w->x))[2+(y)] |= ((z) >> 8) & 0xff;\
 			   }
 
 /* 12 at the 3rd byte in a DPT_4_BYTES word */
-#define getL12bit2(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
+#define	getL12bit2(w,x,y)   ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
 			 + ((((unsigned short)((unsigned char __FAR__ *)(&w->x))[3+(y)]) << 8) & 0xF00))
 
-#define setL12bit2(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
+#define	setL12bit2(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
 			   ((unsigned char __FAR__ *)(&w->x))[3+(y)] &= 0xF0; \
 			   ((unsigned char __FAR__ *)(&w->x))[3+(y)] |= ((z) >> 8) & 0xF; \
 			   }
 
-#define getL8bit(w,x,y)    (\
+#define	getL8bit(w,x,y)    (\
 	(*(((unsigned char __FAR__ *)(&((w)->x)))\
 		+ y)) )
 
-#define setL8bit(w,x,y,z)  {\
+#define	setL8bit(w,x,y,z)  {\
 	(*(((unsigned char __FAR__ *)(&((w)->x)))\
 		+ y) = (z));\
 	}
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index d2d2690..cba360b 100644
--- a/sys/dev/asr/dptsig.h
+++ b/sys/dev/asr/dptsig.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef __DPTSIG_H_
-#define __DPTSIG_H_
+#define	__DPTSIG_H_
 #ifdef _SINIX_ADDON
 #include "dpt.h"
 #endif
@@ -83,238 +83,238 @@ typedef unsigned long sigLONG;
 
 /* Current Signature Version - sigBYTE dsSigVersion; */
 /* ------------------------------------------------------------------ */
-#define SIG_VERSION 1
+#define	SIG_VERSION 1
 
 /* Processor Family - sigBYTE dsProcessorFamily;  DISTINCT VALUES */
 /* ------------------------------------------------------------------ */
 /* What type of processor the file is meant to run on. */
 /* This will let us know whether to read sigWORDs as high/low or low/high. */
-#define PROC_INTEL      0x00    /* Intel 80x86 */
-#define PROC_MOTOROLA   0x01    /* Motorola 68K */
-#define PROC_MIPS4000   0x02    /* MIPS RISC 4000 */
-#define PROC_MIPS       PROC_MIPS4000 /* MIPS RISC */
-#define PROC_ALPHA      0x03    /* DEC Alpha */
-#define PROC_POWERPC    0x04    /* IBM Power PC */
-#define PROC_i960       0x05    /* Intel i960 */
-#define PROC_ULTRASPARC 0x06    /* SPARC processor */
+#define	PROC_INTEL      0x00    /* Intel 80x86 */
+#define	PROC_MOTOROLA   0x01    /* Motorola 68K */
+#define	PROC_MIPS4000   0x02    /* MIPS RISC 4000 */
+#define	PROC_MIPS       PROC_MIPS4000 /* MIPS RISC */
+#define	PROC_ALPHA      0x03    /* DEC Alpha */
+#define	PROC_POWERPC    0x04    /* IBM Power PC */
+#define	PROC_i960       0x05    /* Intel i960 */
+#define	PROC_ULTRASPARC 0x06    /* SPARC processor */
 
 /* Specific Minimim Processor - sigBYTE dsProcessor;    FLAG BITS */
 /* ------------------------------------------------------------------ */
 /* Different bit definitions dependent on processor_family */
 
 /* PROC_INTEL: */
-#define PROC_8086       0x01    /* Intel 8086 */
-#define PROC_286        0x02    /* Intel 80286 */
-#define PROC_386        0x04    /* Intel 80386 */
-#define PROC_486        0x08    /* Intel 80486 */
-#define PROC_PENTIUM    0x10    /* Intel 586 aka P5 aka Pentium */
-#define PROC_SEXIUM     0x20    /* Intel 686 aka P6 aka Pentium Pro or MMX */
-#define PROC_ITANIUM    0x40    /* Intel Itanium 64 bit */
+#define	PROC_8086       0x01    /* Intel 8086 */
+#define	PROC_286        0x02    /* Intel 80286 */
+#define	PROC_386        0x04    /* Intel 80386 */
+#define	PROC_486        0x08    /* Intel 80486 */
+#define	PROC_PENTIUM    0x10    /* Intel 586 aka P5 aka Pentium */
+#define	PROC_SEXIUM     0x20    /* Intel 686 aka P6 aka Pentium Pro or MMX */
+#define	PROC_ITANIUM    0x40    /* Intel Itanium 64 bit */
 
 /* PROC_i960: */
-#define PROC_960RX      0x01    /* Intel 80960RP/RD */
-#define PROC_960HX      0x02    /* Intel 80960HA/HD/HT */
-#define PROC_960RN      0x03    /* Intel 80960RN/RM */
-#define PROC_960RS      0x04    /* Intel 80960RS */
-#define PROC_80303      0x05    /* Intel 80303 (ZION) */
+#define	PROC_960RX      0x01    /* Intel 80960RP/RD */
+#define	PROC_960HX      0x02    /* Intel 80960HA/HD/HT */
+#define	PROC_960RN      0x03    /* Intel 80960RN/RM */
+#define	PROC_960RS      0x04    /* Intel 80960RS */
+#define	PROC_80303      0x05    /* Intel 80303 (ZION) */
 
 /* PROC_MOTOROLA: */
-#define PROC_68000      0x01    /* Motorola 68000 */
-#define PROC_68010      0x02    /* Motorola 68010 */
-#define PROC_68020      0x04    /* Motorola 68020 */
-#define PROC_68030      0x08    /* Motorola 68030 */
-#define PROC_68040      0x10    /* Motorola 68040 */
+#define	PROC_68000      0x01    /* Motorola 68000 */
+#define	PROC_68010      0x02    /* Motorola 68010 */
+#define	PROC_68020      0x04    /* Motorola 68020 */
+#define	PROC_68030      0x08    /* Motorola 68030 */
+#define	PROC_68040      0x10    /* Motorola 68040 */
 
 /* PROC_POWERPC */
-#define PROC_PPC601             0x01    /* PowerPC 601 */
-#define PROC_PPC603             0x02    /* PowerPC 603 */
-#define PROC_PPC604             0x04    /* PowerPC 604 */
+#define	PROC_PPC601             0x01    /* PowerPC 601 */
+#define	PROC_PPC603             0x02    /* PowerPC 603 */
+#define	PROC_PPC604             0x04    /* PowerPC 604 */
 
 /* PROC_MIPS */
-#define PROC_R4000      0x01    /* MIPS R4000 */
-#define PROC_RM7000     0x02    /* MIPS RM7000 */
+#define	PROC_R4000      0x01    /* MIPS R4000 */
+#define	PROC_RM7000     0x02    /* MIPS RM7000 */
 
 /* Filetype - sigBYTE dsFiletype;       DISTINCT VALUES */
 /* ------------------------------------------------------------------ */
-#define FT_EXECUTABLE   0       /* Executable Program */
-#define FT_SCRIPT       1       /* Script/Batch File??? */
-#define FT_HBADRVR      2       /* HBA Driver */
-#define FT_OTHERDRVR    3       /* Other Driver */
-#define FT_IFS          4       /* Installable Filesystem Driver */
-#define FT_ENGINE       5       /* DPT Engine */
-#define FT_COMPDRVR     6       /* Compressed Driver Disk */
-#define FT_LANGUAGE     7       /* Foreign Language file */
-#define FT_FIRMWARE     8       /* Downloadable or actual Firmware */
-#define FT_COMMMODL     9       /* Communications Module */
-#define FT_INT13        10      /* INT 13 style HBA Driver */
-#define FT_HELPFILE     11      /* Help file */
-#define FT_LOGGER       12      /* Event Logger */
-#define FT_INSTALL      13      /* An Install Program */
-#define FT_LIBRARY      14      /* Storage Manager Real-Mode Calls */
-#define FT_RESOURCE     15      /* Storage Manager Resource File */
-#define FT_MODEM_DB     16      /* Storage Manager Modem Database */
-#define FT_DMI          17      /* DMI component interface */
+#define	FT_EXECUTABLE   0       /* Executable Program */
+#define	FT_SCRIPT       1       /* Script/Batch File??? */
+#define	FT_HBADRVR      2       /* HBA Driver */
+#define	FT_OTHERDRVR    3       /* Other Driver */
+#define	FT_IFS          4       /* Installable Filesystem Driver */
+#define	FT_ENGINE       5       /* DPT Engine */
+#define	FT_COMPDRVR     6       /* Compressed Driver Disk */
+#define	FT_LANGUAGE     7       /* Foreign Language file */
+#define	FT_FIRMWARE     8       /* Downloadable or actual Firmware */
+#define	FT_COMMMODL     9       /* Communications Module */
+#define	FT_INT13        10      /* INT 13 style HBA Driver */
+#define	FT_HELPFILE     11      /* Help file */
+#define	FT_LOGGER       12      /* Event Logger */
+#define	FT_INSTALL      13      /* An Install Program */
+#define	FT_LIBRARY      14      /* Storage Manager Real-Mode Calls */
+#define	FT_RESOURCE     15      /* Storage Manager Resource File */
+#define	FT_MODEM_DB     16      /* Storage Manager Modem Database */
+#define	FT_DMI          17      /* DMI component interface */
 
 /* Filetype flags - sigBYTE dsFiletypeFlags;    FLAG BITS */
 /* ------------------------------------------------------------------ */
-#define FTF_DLL         0x01    /* Dynamic Link Library */
-#define FTF_NLM         0x02    /* Netware Loadable Module */
-#define FTF_OVERLAYS    0x04    /* Uses overlays */
-#define FTF_DEBUG       0x08    /* Debug version */
-#define FTF_TSR         0x10    /* TSR */
-#define FTF_SYS         0x20    /* DOS Loadable driver */
-#define FTF_PROTECTED   0x40    /* Runs in protected mode */
-#define FTF_APP_SPEC    0x80    /* Application Specific */
-#define FTF_ROM         (FTF_SYS|FTF_TSR)       /* Special Case */
+#define	FTF_DLL         0x01    /* Dynamic Link Library */
+#define	FTF_NLM         0x02    /* Netware Loadable Module */
+#define	FTF_OVERLAYS    0x04    /* Uses overlays */
+#define	FTF_DEBUG       0x08    /* Debug version */
+#define	FTF_TSR         0x10    /* TSR */
+#define	FTF_SYS         0x20    /* DOS Loadable driver */
+#define	FTF_PROTECTED   0x40    /* Runs in protected mode */
+#define	FTF_APP_SPEC    0x80    /* Application Specific */
+#define	FTF_ROM         (FTF_SYS|FTF_TSR)       /* Special Case */
 
 /* OEM - sigBYTE dsOEM;         DISTINCT VALUES */
 /* ------------------------------------------------------------------ */
-#define OEM_DPT         0       /* DPT */
-#define OEM_ATT         1       /* ATT */
-#define OEM_NEC         2       /* NEC */
-#define OEM_ALPHA       3       /* Alphatronix */
-#define OEM_AST         4       /* AST */
-#define OEM_OLIVETTI    5       /* Olivetti */
-#define OEM_SNI         6       /* Siemens/Nixdorf */
-#define OEM_SUN         7       /* SUN Microsystems */
-#define OEM_ADAPTEC     8       /* Adaptec */
+#define	OEM_DPT         0       /* DPT */
+#define	OEM_ATT         1       /* ATT */
+#define	OEM_NEC         2       /* NEC */
+#define	OEM_ALPHA       3       /* Alphatronix */
+#define	OEM_AST         4       /* AST */
+#define	OEM_OLIVETTI    5       /* Olivetti */
+#define	OEM_SNI         6       /* Siemens/Nixdorf */
+#define	OEM_SUN         7       /* SUN Microsystems */
+#define	OEM_ADAPTEC     8       /* Adaptec */
 
 /* Operating System  - sigLONG dsOS;    FLAG BITS */
 /* ------------------------------------------------------------------ */
-#define OS_DOS          0x00000001 /* PC/MS-DOS                         */
-#define OS_WINDOWS      0x00000002 /* Microsoft Windows 3.x             */
-#define OS_WINDOWS_NT   0x00000004 /* Microsoft Windows NT              */
-#define OS_OS2M         0x00000008 /* OS/2 1.2.x,MS 1.3.0,IBM 1.3.x - Monolithic */
-#define OS_OS2L         0x00000010 /* Microsoft OS/2 1.301 - LADDR      */
-#define OS_OS22x        0x00000020 /* IBM OS/2 2.x                      */
-#define OS_NW286        0x00000040 /* Novell NetWare 286                */
-#define OS_NW386        0x00000080 /* Novell NetWare 386                */
-#define OS_GEN_UNIX     0x00000100 /* Generic Unix                      */
-#define OS_SCO_UNIX     0x00000200 /* SCO Unix                          */
-#define OS_ATT_UNIX     0x00000400 /* ATT Unix                          */
-#define OS_UNIXWARE     0x00000800 /* USL Unix                          */
-#define OS_INT_UNIX     0x00001000 /* Interactive Unix                  */
-#define OS_SOLARIS      0x00002000 /* SunSoft Solaris                   */
-#define OS_QNX          0x00004000 /* QNX for Tom Moch                  */
-#define OS_NEXTSTEP     0x00008000 /* NeXTSTEP/OPENSTEP/MACH            */
-#define OS_BANYAN       0x00010000 /* Banyan Vines                      */
-#define OS_OLIVETTI_UNIX 0x00020000/* Olivetti Unix                     */
-#define OS_MAC_OS               0x00040000 /* Mac OS                            */
-#define OS_WINDOWS_95   0x00080000 /* Microsoft Windows '95             */
-#define OS_NW4x                 0x00100000 /* Novell Netware 4.x                */
-#define OS_BSDI_UNIX    0x00200000 /* BSDi Unix BSD/OS 2.0 and up       */
-#define OS_AIX_UNIX     0x00400000 /* AIX Unix                          */
-#define OS_FREE_BSD             0x00800000 /* FreeBSD Unix                      */
-#define OS_LINUX                0x01000000 /* Linux                             */
-#define OS_DGUX_UNIX    0x02000000 /* Data General Unix                 */
-#define OS_SINIX_N      0x04000000 /* SNI SINIX-N                       */
-#define OS_PLAN9                0x08000000 /* ATT Plan 9                        */
-#define OS_TSX                  0x10000000 /* SNH TSX-32                        */
-#define OS_WINDOWS_98   0x20000000 /* Microsoft Windows '98     */
-#define OS_NW5x                 0x40000000 /* Novell Netware 5x */
-
-#define OS_OTHER        0x80000000 /* Other                             */
+#define	OS_DOS          0x00000001 /* PC/MS-DOS                         */
+#define	OS_WINDOWS      0x00000002 /* Microsoft Windows 3.x             */
+#define	OS_WINDOWS_NT   0x00000004 /* Microsoft Windows NT              */
+#define	OS_OS2M         0x00000008 /* OS/2 1.2.x,MS 1.3.0,IBM 1.3.x - Monolithic */
+#define	OS_OS2L         0x00000010 /* Microsoft OS/2 1.301 - LADDR      */
+#define	OS_OS22x        0x00000020 /* IBM OS/2 2.x                      */
+#define	OS_NW286        0x00000040 /* Novell NetWare 286                */
+#define	OS_NW386        0x00000080 /* Novell NetWare 386                */
+#define	OS_GEN_UNIX     0x00000100 /* Generic Unix                      */
+#define	OS_SCO_UNIX     0x00000200 /* SCO Unix                          */
+#define	OS_ATT_UNIX     0x00000400 /* ATT Unix                          */
+#define	OS_UNIXWARE     0x00000800 /* USL Unix                          */
+#define	OS_INT_UNIX     0x00001000 /* Interactive Unix                  */
+#define	OS_SOLARIS      0x00002000 /* SunSoft Solaris                   */
+#define	OS_QNX          0x00004000 /* QNX for Tom Moch                  */
+#define	OS_NEXTSTEP     0x00008000 /* NeXTSTEP/OPENSTEP/MACH            */
+#define	OS_BANYAN       0x00010000 /* Banyan Vines                      */
+#define	OS_OLIVETTI_UNIX 0x00020000/* Olivetti Unix                     */
+#define	OS_MAC_OS               0x00040000 /* Mac OS                            */
+#define	OS_WINDOWS_95   0x00080000 /* Microsoft Windows '95             */
+#define	OS_NW4x                 0x00100000 /* Novell Netware 4.x                */
+#define	OS_BSDI_UNIX    0x00200000 /* BSDi Unix BSD/OS 2.0 and up       */
+#define	OS_AIX_UNIX     0x00400000 /* AIX Unix                          */
+#define	OS_FREE_BSD             0x00800000 /* FreeBSD Unix                      */
+#define	OS_LINUX                0x01000000 /* Linux                             */
+#define	OS_DGUX_UNIX    0x02000000 /* Data General Unix                 */
+#define	OS_SINIX_N      0x04000000 /* SNI SINIX-N                       */
+#define	OS_PLAN9                0x08000000 /* ATT Plan 9                        */
+#define	OS_TSX                  0x10000000 /* SNH TSX-32                        */
+#define	OS_WINDOWS_98   0x20000000 /* Microsoft Windows '98     */
+#define	OS_NW5x                 0x40000000 /* Novell Netware 5x */
+
+#define	OS_OTHER        0x80000000 /* Other                             */
 
 /* Capabilities - sigWORD dsCapabilities;        FLAG BITS */
 /* ------------------------------------------------------------------ */
-#define CAP_RAID0       0x0001  /* RAID-0 */
-#define CAP_RAID1       0x0002  /* RAID-1 */
-#define CAP_RAID3       0x0004  /* RAID-3 */
-#define CAP_RAID5       0x0008  /* RAID-5 */
-#define CAP_SPAN        0x0010  /* Spanning */
-#define CAP_PASS        0x0020  /* Provides passthrough */
-#define CAP_OVERLAP     0x0040  /* Passthrough supports overlapped commands */
-#define CAP_ASPI        0x0080  /* Supports ASPI Command Requests */
-#define CAP_ABOVE16MB   0x0100  /* ISA Driver supports greater than 16MB */
-#define CAP_EXTEND      0x8000  /* Extended info appears after description */
+#define	CAP_RAID0       0x0001  /* RAID-0 */
+#define	CAP_RAID1       0x0002  /* RAID-1 */
+#define	CAP_RAID3       0x0004  /* RAID-3 */
+#define	CAP_RAID5       0x0008  /* RAID-5 */
+#define	CAP_SPAN        0x0010  /* Spanning */
+#define	CAP_PASS        0x0020  /* Provides passthrough */
+#define	CAP_OVERLAP     0x0040  /* Passthrough supports overlapped commands */
+#define	CAP_ASPI        0x0080  /* Supports ASPI Command Requests */
+#define	CAP_ABOVE16MB   0x0100  /* ISA Driver supports greater than 16MB */
+#define	CAP_EXTEND      0x8000  /* Extended info appears after description */
 #ifdef SNI_MIPS
-#define CAP_CACHEMODE   0x1000  /* dpt_force_cache is set in driver */
+#define	CAP_CACHEMODE   0x1000  /* dpt_force_cache is set in driver */
 #endif
 
 /* Devices Supported - sigWORD dsDeviceSupp;    FLAG BITS */
 /* ------------------------------------------------------------------ */
-#define DEV_DASD        0x0001  /* DASD (hard drives) */
-#define DEV_TAPE        0x0002  /* Tape drives */
-#define DEV_PRINTER     0x0004  /* Printers */
-#define DEV_PROC        0x0008  /* Processors */
-#define DEV_WORM        0x0010  /* WORM drives */
-#define DEV_CDROM       0x0020  /* CD-ROM drives */
-#define DEV_SCANNER     0x0040  /* Scanners */
-#define DEV_OPTICAL     0x0080  /* Optical Drives */
-#define DEV_JUKEBOX     0x0100  /* Jukebox */
-#define DEV_COMM        0x0200  /* Communications Devices */
-#define DEV_OTHER       0x0400  /* Other Devices */
-#define DEV_ALL         0xFFFF  /* All SCSI Devices */
+#define	DEV_DASD        0x0001  /* DASD (hard drives) */
+#define	DEV_TAPE        0x0002  /* Tape drives */
+#define	DEV_PRINTER     0x0004  /* Printers */
+#define	DEV_PROC        0x0008  /* Processors */
+#define	DEV_WORM        0x0010  /* WORM drives */
+#define	DEV_CDROM       0x0020  /* CD-ROM drives */
+#define	DEV_SCANNER     0x0040  /* Scanners */
+#define	DEV_OPTICAL     0x0080  /* Optical Drives */
+#define	DEV_JUKEBOX     0x0100  /* Jukebox */
+#define	DEV_COMM        0x0200  /* Communications Devices */
+#define	DEV_OTHER       0x0400  /* Other Devices */
+#define	DEV_ALL         0xFFFF  /* All SCSI Devices */
 
 /* Adapters Families Supported - sigWORD dsAdapterSupp; FLAG BITS */
 /* ------------------------------------------------------------------ */
-#define ADF_2001        0x0001  /* PM2001           */
-#define ADF_2012A       0x0002  /* PM2012A          */
-#define ADF_PLUS_ISA    0x0004  /* PM2011,PM2021    */
-#define ADF_PLUS_EISA   0x0008  /* PM2012B,PM2022   */
-#define ADF_SC3_ISA     0x0010  /* PM2021           */
-#define ADF_SC3_EISA    0x0020  /* PM2022,PM2122, etc */
-#define ADF_SC3_PCI     0x0040  /* SmartCache III PCI */
-#define ADF_SC4_ISA     0x0080  /* SmartCache IV ISA */
-#define ADF_SC4_EISA    0x0100  /* SmartCache IV EISA */
-#define ADF_SC4_PCI     0x0200  /* SmartCache IV PCI */
-#define ADF_SC5_PCI     0x0400  /* Fifth Generation I2O products */
+#define	ADF_2001        0x0001  /* PM2001           */
+#define	ADF_2012A       0x0002  /* PM2012A          */
+#define	ADF_PLUS_ISA    0x0004  /* PM2011,PM2021    */
+#define	ADF_PLUS_EISA   0x0008  /* PM2012B,PM2022   */
+#define	ADF_SC3_ISA     0x0010  /* PM2021           */
+#define	ADF_SC3_EISA    0x0020  /* PM2022,PM2122, etc */
+#define	ADF_SC3_PCI     0x0040  /* SmartCache III PCI */
+#define	ADF_SC4_ISA     0x0080  /* SmartCache IV ISA */
+#define	ADF_SC4_EISA    0x0100  /* SmartCache IV EISA */
+#define	ADF_SC4_PCI     0x0200  /* SmartCache IV PCI */
+#define	ADF_SC5_PCI     0x0400  /* Fifth Generation I2O products */
 /*
  *      Combinations of products
  */
-#define ADF_ALL_2000    (ADF_2001|ADF_2012A)
-#define ADF_ALL_PLUS    (ADF_PLUS_ISA|ADF_PLUS_EISA)
-#define ADF_ALL_SC3     (ADF_SC3_ISA|ADF_SC3_EISA|ADF_SC3_PCI)
-#define ADF_ALL_SC4     (ADF_SC4_ISA|ADF_SC4_EISA|ADF_SC4_PCI)
-#define ADF_ALL_SC5     (ADF_SC5_PCI)
+#define	ADF_ALL_2000    (ADF_2001|ADF_2012A)
+#define	ADF_ALL_PLUS    (ADF_PLUS_ISA|ADF_PLUS_EISA)
+#define	ADF_ALL_SC3     (ADF_SC3_ISA|ADF_SC3_EISA|ADF_SC3_PCI)
+#define	ADF_ALL_SC4     (ADF_SC4_ISA|ADF_SC4_EISA|ADF_SC4_PCI)
+#define	ADF_ALL_SC5     (ADF_SC5_PCI)
 /* All EATA Cacheing Products */
-#define ADF_ALL_CACHE   (ADF_ALL_PLUS|ADF_ALL_SC3|ADF_ALL_SC4)
+#define	ADF_ALL_CACHE   (ADF_ALL_PLUS|ADF_ALL_SC3|ADF_ALL_SC4)
 /* All EATA Bus Mastering Products */
-#define ADF_ALL_MASTER  (ADF_2012A|ADF_ALL_CACHE)
+#define	ADF_ALL_MASTER  (ADF_2012A|ADF_ALL_CACHE)
 /* All EATA Adapter Products */
-#define ADF_ALL_EATA    (ADF_2001|ADF_ALL_MASTER)
-#define ADF_ALL         ADF_ALL_EATA
+#define	ADF_ALL_EATA    (ADF_2001|ADF_ALL_MASTER)
+#define	ADF_ALL         ADF_ALL_EATA
 
 /* Application - sigWORD dsApplication;         FLAG BITS */
 /* ------------------------------------------------------------------ */
-#define APP_DPTMGR      0x0001  /* DPT Storage Manager */
-#define APP_ENGINE      0x0002  /* DPT Engine */
-#define APP_SYTOS       0x0004  /* Sytron Sytos Plus */
-#define APP_CHEYENNE    0x0008  /* Cheyenne ARCServe + ARCSolo */
-#define APP_MSCDEX      0x0010  /* Microsoft CD-ROM extensions */
-#define APP_NOVABACK    0x0020  /* NovaStor Novaback */
-#define APP_AIM         0x0040  /* Archive Information Manager */
+#define	APP_DPTMGR      0x0001  /* DPT Storage Manager */
+#define	APP_ENGINE      0x0002  /* DPT Engine */
+#define	APP_SYTOS       0x0004  /* Sytron Sytos Plus */
+#define	APP_CHEYENNE    0x0008  /* Cheyenne ARCServe + ARCSolo */
+#define	APP_MSCDEX      0x0010  /* Microsoft CD-ROM extensions */
+#define	APP_NOVABACK    0x0020  /* NovaStor Novaback */
+#define	APP_AIM         0x0040  /* Archive Information Manager */
 
 /* Requirements - sigBYTE dsRequirements;         FLAG BITS             */
 /* ------------------------------------------------------------------   */
-#define REQ_SMARTROM    0x01    /* Requires SmartROM to be present      */
-#define REQ_DPTDDL      0x02    /* Requires DPTDDL.SYS to be loaded     */
-#define REQ_HBA_DRIVER  0x04    /* Requires an HBA driver to be loaded  */
-#define REQ_ASPI_TRAN   0x08    /* Requires an ASPI Transport Modules   */
-#define REQ_ENGINE      0x10    /* Requires a DPT Engine to be loaded   */
-#define REQ_COMM_ENG    0x20    /* Requires a DPT Communications Engine */
+#define	REQ_SMARTROM    0x01    /* Requires SmartROM to be present      */
+#define	REQ_DPTDDL      0x02    /* Requires DPTDDL.SYS to be loaded     */
+#define	REQ_HBA_DRIVER  0x04    /* Requires an HBA driver to be loaded  */
+#define	REQ_ASPI_TRAN   0x08    /* Requires an ASPI Transport Modules   */
+#define	REQ_ENGINE      0x10    /* Requires a DPT Engine to be loaded   */
+#define	REQ_COMM_ENG    0x20    /* Requires a DPT Communications Engine */
 
 /* ------------------------------------------------------------------   */
 /* Requirements - sigWORD dsFirmware;         FLAG BITS                 */
 /* ------------------------------------------------------------------   */
-#define dsFirmware dsApplication
-#define FW_DNLDSIZE16_OLD       0x0000    /* 0..3 DownLoader Size 16K - TO SUPPORT OLD IMAGES */
-#define FW_DNLDSIZE16k    0x0000    /* 0..3 DownLoader Size 16k             */
-#define FW_DNLDSIZE16     0x0001    /* 0..3 DownLoader Size 16K         */
-#define FW_DNLDSIZE32     0x0002    /* 0..3 DownLoader Size 32K         */
-#define FW_DNLDSIZE64     0x0004    /* 0..3 DownLoader Size 64K         */
-#define FW_DNLDSIZE0      0x000f    /* 0..3 DownLoader Size 0K - NONE   */
-#define FW_DNLDSIZE_NONE        0x000F    /* 0..3 DownLoader Size - NONE      */
+#define	dsFirmware dsApplication
+#define	FW_DNLDSIZE16_OLD       0x0000    /* 0..3 DownLoader Size 16K - TO SUPPORT OLD IMAGES */
+#define	FW_DNLDSIZE16k    0x0000    /* 0..3 DownLoader Size 16k             */
+#define	FW_DNLDSIZE16     0x0001    /* 0..3 DownLoader Size 16K         */
+#define	FW_DNLDSIZE32     0x0002    /* 0..3 DownLoader Size 32K         */
+#define	FW_DNLDSIZE64     0x0004    /* 0..3 DownLoader Size 64K         */
+#define	FW_DNLDSIZE0      0x000f    /* 0..3 DownLoader Size 0K - NONE   */
+#define	FW_DNLDSIZE_NONE        0x000F    /* 0..3 DownLoader Size - NONE      */
 
                 /* Code Offset is position of the code within the ROM CODE Segment */
-#define FW_DNLDR_TOP      0x0000        /* 12 DownLoader Position (0=Top, 1=Bottom) */
-#define FW_DNLDR_BTM      0x1000        /* 12 DownLoader Position (0=Top, 1=Bottom) Dominator */
+#define	FW_DNLDR_TOP      0x0000        /* 12 DownLoader Position (0=Top, 1=Bottom) */
+#define	FW_DNLDR_BTM      0x1000        /* 12 DownLoader Position (0=Top, 1=Bottom) Dominator */
 
-#define FW_LOAD_BTM               0x0000        /* 13 Code Offset (0=Btm, 1=Top) MIPS   */
-#define FW_LOAD_TOP               0x2000        /* 13 Code Offset (0=Btm, 1=Top) i960   */
+#define	FW_LOAD_BTM               0x0000        /* 13 Code Offset (0=Btm, 1=Top) MIPS   */
+#define	FW_LOAD_TOP               0x2000        /* 13 Code Offset (0=Btm, 1=Top) i960   */
 
-#define FW_SIG_VERSION1   0x0000    /* 15..14 Version Bits 0=Ver1               */
-#define FW_SIG_VERSION2   0x4000        /* 15..14 Version Bits 1=Ver2       */
+#define	FW_SIG_VERSION1   0x0000    /* 15..14 Version Bits 0=Ver1               */
+#define	FW_SIG_VERSION2   0x4000        /* 15..14 Version Bits 1=Ver2       */
 
 /*
                                 0..3   Downloader Size (Value * 16K)
@@ -338,42 +338,42 @@ typedef unsigned long sigLONG;
 /* Sub System Vendor IDs - The PCI Sub system and vendor IDs for each   */
 /* Adaptec Raid controller                                              */
 /* ------------------------------------------------------------------   */
-#define PM1554U2_SUB_ID          0xC0011044
-#define PM1654U2_SUB_ID          0xC0021044
-#define PM1564U3_1_SUB_ID    0xC0031044
-#define PM1564U3_2_SUB_ID    0xC0041044
-#define PM1554U2_NOACPI_SUB_ID      0xC0051044
-#define PM2554U2_SUB_ID      0xC00A1044
-#define PM2654U2_SUB_ID      0xC00B1044
-#define PM2664U3_1_SUB_ID    0xC00C1044
-#define PM2664U3_2_SUB_ID    0xC00D1044
-#define PM2554U2_NOACPI_SUB_ID      0xC00E1044
-#define PM2654U2_NOACPI_SUB_ID      0xC00F1044
-#define PM3754U2_SUB_ID      0xC0141044
-#define PM3755U2B_SUB_ID     0xC0151044
-#define PM3755F_SUB_ID       0xC0161044
-#define PM3757U2_1_SUB_ID    0xC01E1044
-#define PM3757U2_2_SUB_ID    0xC01F1044
-#define PM3767U3_2_SUB_ID    0xC0201044
-#define PM3767U3_4_SUB_ID    0xC0211044
-#define PM2865U3_1_SUB_ID    0xC0281044
-#define PM2865U3_2_SUB_ID    0xC0291044
-#define PM2865F_SUB_ID       0xC02A1044
-#define ADPT2000S_1_SUB_ID       0xC03C1044
-#define ADPT2000S_2_SUB_ID       0xC03D1044
-#define ADPT2000F_SUB_ID         0xC03E1044
-#define ADPT3000S_1_SUB_ID       0xC0461044
-#define ADPT3000S_2_SUB_ID       0xC0471044
-#define ADPT3000F_SUB_ID         0xC0481044
-#define ADPT5000S_1_SUB_ID       0xC0501044
-#define ADPT5000S_2_SUB_ID       0xC0511044
-#define ADPT5000F_SUB_ID         0xC0521044
-#define ADPT1000UDMA_SUB_ID      0xC05A1044
-#define ADPT1000UDMA_DAC_SUB_ID  0xC05B1044
-#define ADPTI2O_DEVICE_ID        0xa501
-#define ADPTDOMINATOR_DEVICE_ID  0xa511
-#define ADPTDOMINATOR_SUB_ID_START   0xC0321044
-#define ADPTDOMINATOR_SUB_ID_END     0xC03b1044
+#define	PM1554U2_SUB_ID          0xC0011044
+#define	PM1654U2_SUB_ID          0xC0021044
+#define	PM1564U3_1_SUB_ID    0xC0031044
+#define	PM1564U3_2_SUB_ID    0xC0041044
+#define	PM1554U2_NOACPI_SUB_ID      0xC0051044
+#define	PM2554U2_SUB_ID      0xC00A1044
+#define	PM2654U2_SUB_ID      0xC00B1044
+#define	PM2664U3_1_SUB_ID    0xC00C1044
+#define	PM2664U3_2_SUB_ID    0xC00D1044
+#define	PM2554U2_NOACPI_SUB_ID      0xC00E1044
+#define	PM2654U2_NOACPI_SUB_ID      0xC00F1044
+#define	PM3754U2_SUB_ID      0xC0141044
+#define	PM3755U2B_SUB_ID     0xC0151044
+#define	PM3755F_SUB_ID       0xC0161044
+#define	PM3757U2_1_SUB_ID    0xC01E1044
+#define	PM3757U2_2_SUB_ID    0xC01F1044
+#define	PM3767U3_2_SUB_ID    0xC0201044
+#define	PM3767U3_4_SUB_ID    0xC0211044
+#define	PM2865U3_1_SUB_ID    0xC0281044
+#define	PM2865U3_2_SUB_ID    0xC0291044
+#define	PM2865F_SUB_ID       0xC02A1044
+#define	ADPT2000S_1_SUB_ID       0xC03C1044
+#define	ADPT2000S_2_SUB_ID       0xC03D1044
+#define	ADPT2000F_SUB_ID         0xC03E1044
+#define	ADPT3000S_1_SUB_ID       0xC0461044
+#define	ADPT3000S_2_SUB_ID       0xC0471044
+#define	ADPT3000F_SUB_ID         0xC0481044
+#define	ADPT5000S_1_SUB_ID       0xC0501044
+#define	ADPT5000S_2_SUB_ID       0xC0511044
+#define	ADPT5000F_SUB_ID         0xC0521044
+#define	ADPT1000UDMA_SUB_ID      0xC05A1044
+#define	ADPT1000UDMA_DAC_SUB_ID  0xC05B1044
+#define	ADPTI2O_DEVICE_ID        0xa501
+#define	ADPTDOMINATOR_DEVICE_ID  0xa511
+#define	ADPTDOMINATOR_SUB_ID_START   0xC0321044
+#define	ADPTDOMINATOR_SUB_ID_END     0xC03b1044
 
 
 
@@ -417,7 +417,7 @@ typedef struct dpt_sig {
 
 #if defined __bsdi__
 #ifndef PACK
-#define PACK __attribute__ ((packed))
+#define	PACK __attribute__ ((packed))
 #endif
 typedef struct dpt_sig_Packed {
     char    dsSignature[6] PACK;      /* ALWAYS "dPtSiG" */
@@ -442,7 +442,7 @@ typedef struct dpt_sig_Packed {
     /* description (NULL terminated) */
     char  dsDescription[dsDescription_size] PACK;
 } dpt_sig_S_Packed;
-#define PACKED_SIG_SIZE sizeof(dpt_sig_S_Packed)
+#define	PACKED_SIG_SIZE sizeof(dpt_sig_S_Packed)
 #endif
 /* This line added at Roycroft's request */
 /* Microsoft's NT compiler gets confused if you do a pack and don't */
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index 36240b1..e117ed4 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -81,7 +81,7 @@
  ****************************************************************/
 
 #if !defined(I2O_ADPTR_HDR)
-#define I2O_ADPTR_HDR
+#define	I2O_ADPTR_HDR
 
 #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
 # if (KERN_VERSION < 3)
@@ -94,7 +94,7 @@
 #endif
 
 
-#define I2OADPTR_REV 1_5_1      /* Header file revision string */
+#define	I2OADPTR_REV 1_5_1      /* Header file revision string */
 
 
 /*****************************************************************************
@@ -144,10 +144,10 @@ PRAGMA_PACK_PUSH
     Bus Adapter Class specific functions
 */
 
-#define I2O_HBA_ADAPTER_RESET               0x85
-#define I2O_HBA_BUS_QUIESCE                 0x8b
-#define I2O_HBA_BUS_RESET                   0x87
-#define I2O_HBA_BUS_SCAN                    0x89
+#define	I2O_HBA_ADAPTER_RESET               0x85
+#define	I2O_HBA_BUS_QUIESCE                 0x8b
+#define	I2O_HBA_BUS_RESET                   0x87
+#define	I2O_HBA_BUS_SCAN                    0x89
 
 
 /*
@@ -167,31 +167,31 @@ PRAGMA_PACK_PUSH
 */  
 
 
-#define I2O_HBA_DSC_MASK                        0xFF00
-
-#define I2O_HBA_DSC_SUCCESS                     0x0000
-#define I2O_HBA_DSC_ADAPTER_BUSY                0x0500
-#define I2O_HBA_DSC_COMMAND_TIMEOUT             0x0B00
-#define I2O_HBA_DSC_COMPLETE_WITH_ERROR         0x0400
-#define I2O_HBA_DSC_FUNCTION_UNAVAILABLE        0x3A00
-#define I2O_HBA_DSC_NO_ADAPTER                  0x1100
-#define I2O_HBA_DSC_PARITY_ERROR_FAILURE        0x0F00
-#define I2O_HBA_DSC_PATH_INVALID                0x0700
-#define I2O_HBA_DSC_PROVIDE_FAILURE             0x1600
-#define I2O_HBA_DSC_QUEUE_FROZEN                0x4000
-#define I2O_HBA_DSC_REQUEST_ABORTED             0x0200
-#define I2O_HBA_DSC_REQUEST_INVALID             0x0600
-#define I2O_HBA_DSC_REQUEST_LENGTH_ERROR        0x1500
-#define I2O_HBA_DSC_REQUEST_TERMINATED          0x1800
-#define I2O_HBA_DSC_RESOURCE_UNAVAILABLE        0x3400
-#define I2O_HBA_DSC_BUS_BUSY                    0x3F00
-#define I2O_HBA_DSC_BUS_RESET                   0x0E00
-#define I2O_HBA_DSC_ID_INVALID                  0x3900
-#define I2O_HBA_DSC_SEQUENCE_FAILURE            0x1400
-#define I2O_HBA_DSC_UNABLE_TO_ABORT             0x0300
-#define I2O_HBA_DSC_UNABLE_TO_TERMINATE         0x0900
-#define I2O_HBA_DSC_UNACKNOWLEDGED_EVENT        0x3500
-#define I2O_HBA_DSC_UNEXPECTED_BUS_FREE         0x1300
+#define	I2O_HBA_DSC_MASK                        0xFF00
+
+#define	I2O_HBA_DSC_SUCCESS                     0x0000
+#define	I2O_HBA_DSC_ADAPTER_BUSY                0x0500
+#define	I2O_HBA_DSC_COMMAND_TIMEOUT             0x0B00
+#define	I2O_HBA_DSC_COMPLETE_WITH_ERROR         0x0400
+#define	I2O_HBA_DSC_FUNCTION_UNAVAILABLE        0x3A00
+#define	I2O_HBA_DSC_NO_ADAPTER                  0x1100
+#define	I2O_HBA_DSC_PARITY_ERROR_FAILURE        0x0F00
+#define	I2O_HBA_DSC_PATH_INVALID                0x0700
+#define	I2O_HBA_DSC_PROVIDE_FAILURE             0x1600
+#define	I2O_HBA_DSC_QUEUE_FROZEN                0x4000
+#define	I2O_HBA_DSC_REQUEST_ABORTED             0x0200
+#define	I2O_HBA_DSC_REQUEST_INVALID             0x0600
+#define	I2O_HBA_DSC_REQUEST_LENGTH_ERROR        0x1500
+#define	I2O_HBA_DSC_REQUEST_TERMINATED          0x1800
+#define	I2O_HBA_DSC_RESOURCE_UNAVAILABLE        0x3400
+#define	I2O_HBA_DSC_BUS_BUSY                    0x3F00
+#define	I2O_HBA_DSC_BUS_RESET                   0x0E00
+#define	I2O_HBA_DSC_ID_INVALID                  0x3900
+#define	I2O_HBA_DSC_SEQUENCE_FAILURE            0x1400
+#define	I2O_HBA_DSC_UNABLE_TO_ABORT             0x0300
+#define	I2O_HBA_DSC_UNABLE_TO_TERMINATE         0x0900
+#define	I2O_HBA_DSC_UNACKNOWLEDGED_EVENT        0x3500
+#define	I2O_HBA_DSC_UNEXPECTED_BUS_FREE         0x1300
 
 
 
@@ -202,21 +202,21 @@ PRAGMA_PACK_PUSH
 /****************************************************************************/
 
 
-#define     I2O_HBA_CONTROLLER_INFO_GROUP_NO            0x0000
-#define     I2O_HBA_HISTORICAL_STATS_GROUP_NO           0x0100
-#define     I2O_HBA_SCSI_CONTROLLER_INFO_GROUP_NO       0x0200
-#define     I2O_HBA_SCSI_BUS_PORT_INFO_GROUP_NO         0x0201
-#define     I2O_HBA_FCA_CONTROLLER_INFO_GROUP_NO        0x0300
-#define     I2O_HBA_FCA_PORT_INFO_GROUP_NO              0x0301
+#define	    I2O_HBA_CONTROLLER_INFO_GROUP_NO            0x0000
+#define	    I2O_HBA_HISTORICAL_STATS_GROUP_NO           0x0100
+#define	    I2O_HBA_SCSI_CONTROLLER_INFO_GROUP_NO       0x0200
+#define	    I2O_HBA_SCSI_BUS_PORT_INFO_GROUP_NO         0x0201
+#define	    I2O_HBA_FCA_CONTROLLER_INFO_GROUP_NO        0x0300
+#define	    I2O_HBA_FCA_PORT_INFO_GROUP_NO              0x0301
 
 
 /* - 0000h - HBA Controller Information Parameter Group */
 
 /* Bus Type */
 
-#define     I2O_HBA_BUS_TYPE_GENERIC        0x00
-#define     I2O_HBA_BUS_TYPE_SCSI           0x01
-#define     I2O_HBA_BUS_TYPE_FCA            0x10
+#define	    I2O_HBA_BUS_TYPE_GENERIC        0x00
+#define	    I2O_HBA_BUS_TYPE_SCSI           0x01
+#define	    I2O_HBA_BUS_TYPE_FCA            0x10
 
 
 typedef struct _I2O_HBA_CONTROLLER_INFO_SCALAR {
@@ -239,40 +239,40 @@ typedef struct _I2O_HBA_HIST_STATS_SCALAR {
 
 /* SCSI Type */
 
-#define I2O_SCSI_TYPE_UNKNOWN               0x00
-#define I2O_SCSI_TYPE_SCSI_1                0x01
-#define I2O_SCSI_TYPE_SCSI_2                0x02
-#define I2O_SCSI_TYPE_SCSI_3                0x03
+#define	I2O_SCSI_TYPE_UNKNOWN               0x00
+#define	I2O_SCSI_TYPE_SCSI_1                0x01
+#define	I2O_SCSI_TYPE_SCSI_2                0x02
+#define	I2O_SCSI_TYPE_SCSI_3                0x03
 
 /* Protection Management */
 
-#define     I2O_SCSI_PORT_PROT_OTHER        0x00
-#define     I2O_SCSI_PORT_PROT_UNKNOWN      0x01
-#define     I2O_SCSI_PORT_PROT_UNPROTECTED  0x02
-#define     I2O_SCSI_PORT_PROT_PROTECTED    0x03
-#define     I2O_SCSI_PORT_PROT_SCC          0x04
+#define	    I2O_SCSI_PORT_PROT_OTHER        0x00
+#define	    I2O_SCSI_PORT_PROT_UNKNOWN      0x01
+#define	    I2O_SCSI_PORT_PROT_UNPROTECTED  0x02
+#define	    I2O_SCSI_PORT_PROT_PROTECTED    0x03
+#define	    I2O_SCSI_PORT_PROT_SCC          0x04
 
 /* Settings */
 
-#define     I2O_SCSI_PORT_PARITY_FLAG       0x01
-#define     I2O_SCSI_PORT_PARITY_DISABLED   0x00
-#define     I2O_SCSI_PORT_PARITY_ENABLED    0x01
+#define	    I2O_SCSI_PORT_PARITY_FLAG       0x01
+#define	    I2O_SCSI_PORT_PARITY_DISABLED   0x00
+#define	    I2O_SCSI_PORT_PARITY_ENABLED    0x01
 
-#define     I2O_SCSI_PORT_SCAN_ORDER_FLAG   0x02
-#define     I2O_SCSI_PORT_SCAN_LOW_TO_HIGH  0x00
-#define     I2O_SCSI_PORT_SCAN_HIGH_TO_LOW  0x02
+#define	    I2O_SCSI_PORT_SCAN_ORDER_FLAG   0x02
+#define	    I2O_SCSI_PORT_SCAN_LOW_TO_HIGH  0x00
+#define	    I2O_SCSI_PORT_SCAN_HIGH_TO_LOW  0x02
 
-#define     I2O_SCSI_PORT_IID_FLAG          0x04
-#define     I2O_SCSI_PORT_IID_DEFAULT       0x00
-#define     I2O_SCSI_PORT_IID_SPECIFIED     0x04
+#define	    I2O_SCSI_PORT_IID_FLAG          0x04
+#define	    I2O_SCSI_PORT_IID_DEFAULT       0x00
+#define	    I2O_SCSI_PORT_IID_SPECIFIED     0x04
 
-#define     I2O_SCSI_PORT_SCAM_FLAG         0x08
-#define     I2O_SCSI_PORT_SCAM_DISABLED     0x00
-#define     I2O_SCSI_PORT_SCAM_ENABLED      0x08
+#define	    I2O_SCSI_PORT_SCAM_FLAG         0x08
+#define	    I2O_SCSI_PORT_SCAM_DISABLED     0x00
+#define	    I2O_SCSI_PORT_SCAM_ENABLED      0x08
 
-#define     I2O_SCSI_PORT_TYPE_FLAG         0x80
-#define     I2O_SCSI_PORT_TYPE_PARALLEL     0x00
-#define     I2O_SCSI_PORT_TYPE_SERIAL       0x80
+#define	    I2O_SCSI_PORT_TYPE_FLAG         0x80
+#define	    I2O_SCSI_PORT_TYPE_PARALLEL     0x00
+#define	    I2O_SCSI_PORT_TYPE_SERIAL       0x80
 
 typedef struct _I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR {
     U8          SCSIType;
@@ -314,8 +314,8 @@ typedef struct _I2O_HBA_SCSI_BUS_PORT_INFO_SCALAR {
 
 /* SCSI Type */
 
-#define I2O_FCA_TYPE_UNKNOWN                0x00
-#define I2O_FCA_TYPE_FCAL                   0x01
+#define	I2O_FCA_TYPE_UNKNOWN                0x00
+#define	I2O_FCA_TYPE_FCAL                   0x01
 
 typedef struct _I2O_HBA_FCA_CONTROLLER_INFO_SCALAR {
     U8          FcaType;
@@ -363,8 +363,8 @@ typedef struct _I2O_HBA_ADAPTER_RESET_MESSAGE {
 
 typedef U32     I2O_HBQ_FLAGS;
 
-#define I2O_HBQ_FLAG_NORMAL             0x0000
-#define I2O_HBQ_FLAG_QUIESCE            0x0001
+#define	I2O_HBQ_FLAG_NORMAL             0x0000
+#define	I2O_HBQ_FLAG_QUIESCE            0x0001
 
 typedef struct _I2O_HBA_BUS_QUIESCE_MESSAGE {
     I2O_MESSAGE_FRAME       StdMessageFrame;
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index c1e08a2..25d183b 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -81,7 +81,7 @@
  ****************************************************************/
 
 #if !defined(I2O_BASE_SCSI_HDR)
-#define I2O_BASE_SCSI_HDR
+#define	I2O_BASE_SCSI_HDR
 
 #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
 # if (KERN_VERSION < 3)
@@ -94,7 +94,7 @@
 #endif
 
 
-#define I2OBSCSI_REV 1_5_1      /* Header file revision string */
+#define	I2OBSCSI_REV 1_5_1      /* Header file revision string */
 
 
 
@@ -166,9 +166,9 @@ PRAGMA_PACK_PUSH
     assigned are common with other classes when applicable.
 */
 
-#define     I2O_SCSI_DEVICE_RESET           0x27
-#define     I2O_SCSI_SCB_ABORT              0x83
-#define     I2O_SCSI_SCB_EXEC               0x81
+#define	    I2O_SCSI_DEVICE_RESET           0x27
+#define	    I2O_SCSI_SCB_ABORT              0x83
+#define	    I2O_SCSI_SCB_EXEC               0x81
 
 /*
     Detailed Status Codes for SCSI operations
@@ -184,61 +184,61 @@ PRAGMA_PACK_PUSH
 
 /*  SCSI Device Completion Status Codes (defined by SCSI-2/3)*/
 
-#define I2O_SCSI_DEVICE_DSC_MASK                0x00FF
+#define	I2O_SCSI_DEVICE_DSC_MASK                0x00FF
 
-#define I2O_SCSI_DSC_SUCCESS                    0x0000
-#define I2O_SCSI_DSC_CHECK_CONDITION            0x0002
-#define I2O_SCSI_DSC_BUSY                       0x0008
-#define I2O_SCSI_DSC_RESERVATION_CONFLICT       0x0018
-#define I2O_SCSI_DSC_COMMAND_TERMINATED         0x0022
-#define I2O_SCSI_DSC_TASK_SET_FULL              0x0028
-#define I2O_SCSI_DSC_ACA_ACTIVE                 0x0030
+#define	I2O_SCSI_DSC_SUCCESS                    0x0000
+#define	I2O_SCSI_DSC_CHECK_CONDITION            0x0002
+#define	I2O_SCSI_DSC_BUSY                       0x0008
+#define	I2O_SCSI_DSC_RESERVATION_CONFLICT       0x0018
+#define	I2O_SCSI_DSC_COMMAND_TERMINATED         0x0022
+#define	I2O_SCSI_DSC_TASK_SET_FULL              0x0028
+#define	I2O_SCSI_DSC_ACA_ACTIVE                 0x0030
 
 /*  SCSI Adapter Status Codes (based on CAM-1) */
 
-#define I2O_SCSI_HBA_DSC_MASK                   0xFF00
-
-#define I2O_SCSI_HBA_DSC_SUCCESS                0x0000
-
-#define I2O_SCSI_HBA_DSC_REQUEST_ABORTED        0x0200
-#define I2O_SCSI_HBA_DSC_UNABLE_TO_ABORT        0x0300
-#define I2O_SCSI_HBA_DSC_COMPLETE_WITH_ERROR    0x0400
-#define I2O_SCSI_HBA_DSC_ADAPTER_BUSY           0x0500
-#define I2O_SCSI_HBA_DSC_REQUEST_INVALID        0x0600
-#define I2O_SCSI_HBA_DSC_PATH_INVALID           0x0700
-#define I2O_SCSI_HBA_DSC_DEVICE_NOT_PRESENT     0x0800
-#define I2O_SCSI_HBA_DSC_UNABLE_TO_TERMINATE    0x0900
-#define I2O_SCSI_HBA_DSC_SELECTION_TIMEOUT      0x0A00
-#define I2O_SCSI_HBA_DSC_COMMAND_TIMEOUT        0x0B00
-
-#define I2O_SCSI_HBA_DSC_MR_MESSAGE_RECEIVED    0x0D00
-#define I2O_SCSI_HBA_DSC_SCSI_BUS_RESET         0x0E00
-#define I2O_SCSI_HBA_DSC_PARITY_ERROR_FAILURE   0x0F00
-#define I2O_SCSI_HBA_DSC_AUTOSENSE_FAILED       0x1000
-#define I2O_SCSI_HBA_DSC_NO_ADAPTER             0x1100
-#define I2O_SCSI_HBA_DSC_DATA_OVERRUN           0x1200
-#define I2O_SCSI_HBA_DSC_UNEXPECTED_BUS_FREE    0x1300
-#define I2O_SCSI_HBA_DSC_SEQUENCE_FAILURE       0x1400
-#define I2O_SCSI_HBA_DSC_REQUEST_LENGTH_ERROR   0x1500
-#define I2O_SCSI_HBA_DSC_PROVIDE_FAILURE        0x1600
-#define I2O_SCSI_HBA_DSC_BDR_MESSAGE_SENT       0x1700
-#define I2O_SCSI_HBA_DSC_REQUEST_TERMINATED     0x1800
-
-#define I2O_SCSI_HBA_DSC_IDE_MESSAGE_SENT       0x3300
-#define I2O_SCSI_HBA_DSC_RESOURCE_UNAVAILABLE   0x3400
-#define I2O_SCSI_HBA_DSC_UNACKNOWLEDGED_EVENT   0x3500
-#define I2O_SCSI_HBA_DSC_MESSAGE_RECEIVED       0x3600
-#define I2O_SCSI_HBA_DSC_INVALID_CDB            0x3700
-#define I2O_SCSI_HBA_DSC_LUN_INVALID            0x3800
-#define I2O_SCSI_HBA_DSC_SCSI_TID_INVALID       0x3900
-#define I2O_SCSI_HBA_DSC_FUNCTION_UNAVAILABLE   0x3A00
-#define I2O_SCSI_HBA_DSC_NO_NEXUS               0x3B00
-#define I2O_SCSI_HBA_DSC_SCSI_IID_INVALID       0x3C00
-#define I2O_SCSI_HBA_DSC_CDB_RECEIVED           0x3D00
-#define I2O_SCSI_HBA_DSC_LUN_ALREADY_ENABLED    0x3E00
-#define I2O_SCSI_HBA_DSC_BUS_BUSY               0x3F00
-
-#define I2O_SCSI_HBA_DSC_QUEUE_FROZEN           0x4000
+#define	I2O_SCSI_HBA_DSC_MASK                   0xFF00
+
+#define	I2O_SCSI_HBA_DSC_SUCCESS                0x0000
+
+#define	I2O_SCSI_HBA_DSC_REQUEST_ABORTED        0x0200
+#define	I2O_SCSI_HBA_DSC_UNABLE_TO_ABORT        0x0300
+#define	I2O_SCSI_HBA_DSC_COMPLETE_WITH_ERROR    0x0400
+#define	I2O_SCSI_HBA_DSC_ADAPTER_BUSY           0x0500
+#define	I2O_SCSI_HBA_DSC_REQUEST_INVALID        0x0600
+#define	I2O_SCSI_HBA_DSC_PATH_INVALID           0x0700
+#define	I2O_SCSI_HBA_DSC_DEVICE_NOT_PRESENT     0x0800
+#define	I2O_SCSI_HBA_DSC_UNABLE_TO_TERMINATE    0x0900
+#define	I2O_SCSI_HBA_DSC_SELECTION_TIMEOUT      0x0A00
+#define	I2O_SCSI_HBA_DSC_COMMAND_TIMEOUT        0x0B00
+
+#define	I2O_SCSI_HBA_DSC_MR_MESSAGE_RECEIVED    0x0D00
+#define	I2O_SCSI_HBA_DSC_SCSI_BUS_RESET         0x0E00
+#define	I2O_SCSI_HBA_DSC_PARITY_ERROR_FAILURE   0x0F00
+#define	I2O_SCSI_HBA_DSC_AUTOSENSE_FAILED       0x1000
+#define	I2O_SCSI_HBA_DSC_NO_ADAPTER             0x1100
+#define	I2O_SCSI_HBA_DSC_DATA_OVERRUN           0x1200
+#define	I2O_SCSI_HBA_DSC_UNEXPECTED_BUS_FREE    0x1300
+#define	I2O_SCSI_HBA_DSC_SEQUENCE_FAILURE       0x1400
+#define	I2O_SCSI_HBA_DSC_REQUEST_LENGTH_ERROR   0x1500
+#define	I2O_SCSI_HBA_DSC_PROVIDE_FAILURE        0x1600
+#define	I2O_SCSI_HBA_DSC_BDR_MESSAGE_SENT       0x1700
+#define	I2O_SCSI_HBA_DSC_REQUEST_TERMINATED     0x1800
+
+#define	I2O_SCSI_HBA_DSC_IDE_MESSAGE_SENT       0x3300
+#define	I2O_SCSI_HBA_DSC_RESOURCE_UNAVAILABLE   0x3400
+#define	I2O_SCSI_HBA_DSC_UNACKNOWLEDGED_EVENT   0x3500
+#define	I2O_SCSI_HBA_DSC_MESSAGE_RECEIVED       0x3600
+#define	I2O_SCSI_HBA_DSC_INVALID_CDB            0x3700
+#define	I2O_SCSI_HBA_DSC_LUN_INVALID            0x3800
+#define	I2O_SCSI_HBA_DSC_SCSI_TID_INVALID       0x3900
+#define	I2O_SCSI_HBA_DSC_FUNCTION_UNAVAILABLE   0x3A00
+#define	I2O_SCSI_HBA_DSC_NO_NEXUS               0x3B00
+#define	I2O_SCSI_HBA_DSC_SCSI_IID_INVALID       0x3C00
+#define	I2O_SCSI_HBA_DSC_CDB_RECEIVED           0x3D00
+#define	I2O_SCSI_HBA_DSC_LUN_ALREADY_ENABLED    0x3E00
+#define	I2O_SCSI_HBA_DSC_BUS_BUSY               0x3F00
+
+#define	I2O_SCSI_HBA_DSC_QUEUE_FROZEN           0x4000
 
 
 /****************************************************************************/
@@ -251,108 +251,108 @@ PRAGMA_PACK_PUSH
 /* SCSI Configuration and Operating Structures and Defines */
 
 
-#define     I2O_SCSI_DEVICE_INFO_GROUP_NO               0x0000
-#define     I2O_SCSI_DEVICE_BUS_PORT_INFO_GROUP_NO      0x0001
+#define	    I2O_SCSI_DEVICE_INFO_GROUP_NO               0x0000
+#define	    I2O_SCSI_DEVICE_BUS_PORT_INFO_GROUP_NO      0x0001
 
 
 /* - 0000h - SCSI Device Information Parameters Group defines */
 
 /* Device Type */
 
-#define I2O_SCSI_DEVICE_TYPE_DIRECT         0x00
-#define I2O_SCSI_DEVICE_TYPE_SEQUENTIAL     0x01
-#define I2O_SCSI_DEVICE_TYPE_PRINTER        0x02
-#define I2O_SCSI_DEVICE_TYPE_PROCESSOR      0x03
-#define I2O_SCSI_DEVICE_TYPE_WORM           0x04
-#define I2O_SCSI_DEVICE_TYPE_CDROM          0x05
-#define I2O_SCSI_DEVICE_TYPE_SCANNER        0x06
-#define I2O_SCSI_DEVICE_TYPE_OPTICAL        0x07
-#define I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER  0x08
-#define I2O_SCSI_DEVICE_TYPE_COMM           0x09
-#define I2O_SCSI_DEVICE_GRAPHICS_1          0x0A
-#define I2O_SCSI_DEVICE_GRAPHICS_2          0x0B
-#define I2O_SCSI_DEVICE_TYPE_ARRAY_CONT     0x0C
-#define I2O_SCSI_DEVICE_TYPE_SES            0x0D
-#define I2O_SCSI_DEVICE_TYPE_UNKNOWN        0x1F
+#define	I2O_SCSI_DEVICE_TYPE_DIRECT         0x00
+#define	I2O_SCSI_DEVICE_TYPE_SEQUENTIAL     0x01
+#define	I2O_SCSI_DEVICE_TYPE_PRINTER        0x02
+#define	I2O_SCSI_DEVICE_TYPE_PROCESSOR      0x03
+#define	I2O_SCSI_DEVICE_TYPE_WORM           0x04
+#define	I2O_SCSI_DEVICE_TYPE_CDROM          0x05
+#define	I2O_SCSI_DEVICE_TYPE_SCANNER        0x06
+#define	I2O_SCSI_DEVICE_TYPE_OPTICAL        0x07
+#define	I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER  0x08
+#define	I2O_SCSI_DEVICE_TYPE_COMM           0x09
+#define	I2O_SCSI_DEVICE_GRAPHICS_1          0x0A
+#define	I2O_SCSI_DEVICE_GRAPHICS_2          0x0B
+#define	I2O_SCSI_DEVICE_TYPE_ARRAY_CONT     0x0C
+#define	I2O_SCSI_DEVICE_TYPE_SES            0x0D
+#define	I2O_SCSI_DEVICE_TYPE_UNKNOWN        0x1F
 
 /* Flags */
 
-#define I2O_SCSI_PERIPHERAL_TYPE_FLAG       0x01
-#define I2O_SCSI_PERIPHERAL_TYPE_PARALLEL   0x00
-#define I2O_SCSI_PERIPHERAL_TYPE_SERIAL     0x01
+#define	I2O_SCSI_PERIPHERAL_TYPE_FLAG       0x01
+#define	I2O_SCSI_PERIPHERAL_TYPE_PARALLEL   0x00
+#define	I2O_SCSI_PERIPHERAL_TYPE_SERIAL     0x01
 
-#define I2O_SCSI_RESERVED_FLAG              0x02
+#define	I2O_SCSI_RESERVED_FLAG              0x02
 
-#define I2O_SCSI_DISCONNECT_FLAG            0x04
-#define I2O_SCSI_DISABLE_DISCONNECT         0x00
-#define I2O_SCSI_ENABLE_DISCONNECT          0x04
+#define	I2O_SCSI_DISCONNECT_FLAG            0x04
+#define	I2O_SCSI_DISABLE_DISCONNECT         0x00
+#define	I2O_SCSI_ENABLE_DISCONNECT          0x04
 
-#define I2O_SCSI_MODE_MASK                  0x18
-#define I2O_SCSI_MODE_SET_DATA              0x00
-#define I2O_SCSI_MODE_SET_DEFAULT           0x08
-#define I2O_SCSI_MODE_SET_SAFEST            0x10
+#define	I2O_SCSI_MODE_MASK                  0x18
+#define	I2O_SCSI_MODE_SET_DATA              0x00
+#define	I2O_SCSI_MODE_SET_DEFAULT           0x08
+#define	I2O_SCSI_MODE_SET_SAFEST            0x10
 
-#define I2O_SCSI_DATA_WIDTH_MASK            0x60
-#define I2O_SCSI_DATA_WIDTH_8               0x00
-#define I2O_SCSI_DATA_WIDTH_16              0x20
-#define I2O_SCSI_DATA_WIDTH_32              0x40
+#define	I2O_SCSI_DATA_WIDTH_MASK            0x60
+#define	I2O_SCSI_DATA_WIDTH_8               0x00
+#define	I2O_SCSI_DATA_WIDTH_16              0x20
+#define	I2O_SCSI_DATA_WIDTH_32              0x40
 
-#define I2O_SCSI_SYNC_NEGOTIATION_FLAG      0x80
-#define I2O_SCSI_DISABLE_SYNC_NEGOTIATION   0x00
-#define I2O_SCSI_ENABLE_SYNC_NEGOTIATION    0x80
+#define	I2O_SCSI_SYNC_NEGOTIATION_FLAG      0x80
+#define	I2O_SCSI_DISABLE_SYNC_NEGOTIATION   0x00
+#define	I2O_SCSI_ENABLE_SYNC_NEGOTIATION    0x80
 
 
 /* - 0001h - SCSI Device Bus Port Info Parameters Group defines */
 
 /* Physical */
 
-#define I2O_SCSI_PORT_PHYS_OTHER            0x01
-#define I2O_SCSI_PORT_PHYS_UNKNOWN          0x02
-#define I2O_SCSI_PORT_PHYS_PARALLEL         0x03
-#define I2O_SCSI_PORT_PHYS_FIBRE_CHANNEL    0x04
-#define I2O_SCSI_PORT_PHYS_SERIAL_P1394     0x05
-#define I2O_SCSI_PORT_PHYS_SERIAL_SSA       0x06
+#define	I2O_SCSI_PORT_PHYS_OTHER            0x01
+#define	I2O_SCSI_PORT_PHYS_UNKNOWN          0x02
+#define	I2O_SCSI_PORT_PHYS_PARALLEL         0x03
+#define	I2O_SCSI_PORT_PHYS_FIBRE_CHANNEL    0x04
+#define	I2O_SCSI_PORT_PHYS_SERIAL_P1394     0x05
+#define	I2O_SCSI_PORT_PHYS_SERIAL_SSA       0x06
 
 /* Electrical */
 
-#define I2O_SCSI_PORT_ELEC_OTHER            0x01
-#define I2O_SCSI_PORT_ELEC_UNKNOWN          0x02
-#define I2O_SCSI_PORT_ELEC_SINGLE_ENDED     0x03
-#define I2O_SCSI_PORT_ELEC_DIFFERENTIAL     0x04
-#define I2O_SCSI_PORT_ELEC_LOW_VOLT_DIFF    0x05
-#define I2O_SCSI_PORT_ELEC_OPTICAL          0x06
+#define	I2O_SCSI_PORT_ELEC_OTHER            0x01
+#define	I2O_SCSI_PORT_ELEC_UNKNOWN          0x02
+#define	I2O_SCSI_PORT_ELEC_SINGLE_ENDED     0x03
+#define	I2O_SCSI_PORT_ELEC_DIFFERENTIAL     0x04
+#define	I2O_SCSI_PORT_ELEC_LOW_VOLT_DIFF    0x05
+#define	I2O_SCSI_PORT_ELEC_OPTICAL          0x06
 
 /* Isochronous */
 
-#define I2O_SCSI_PORT_ISOC_NO               0x00
-#define I2O_SCSI_PORT_ISOC_YES              0x01
-#define I2O_SCSI_PORT_ISOC_UNKNOWN          0x02
+#define	I2O_SCSI_PORT_ISOC_NO               0x00
+#define	I2O_SCSI_PORT_ISOC_YES              0x01
+#define	I2O_SCSI_PORT_ISOC_UNKNOWN          0x02
 
 /* Connector Type */
 
-#define I2O_SCSI_PORT_CONN_OTHER            0x01
-#define I2O_SCSI_PORT_CONN_UNKNOWN          0x02
-#define I2O_SCSI_PORT_CONN_NONE             0x03
-#define I2O_SCSI_PORT_CONN_SHIELDED_A_HD    0x04
-#define I2O_SCSI_PORT_CONN_UNSHIELDED_A_HD  0x05
-#define I2O_SCSI_PORT_CONN_SHIELDED_A_LD    0x06
-#define I2O_SCSI_PORT_CONN_UNSHIELDED_A_LD  0x07
-#define I2O_SCSI_PORT_CONN_SHIELDED_P_HD    0x08
-#define I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD  0x09
-#define I2O_SCSI_PORT_CONN_SCA_I            0x0A
-#define I2O_SCSI_PORT_CONN_SCA_II           0x0B
-#define I2O_SCSI_PORT_CONN_FC_DB9           0x0C
-#define I2O_SCSI_PORT_CONN_FC_FIBRE         0x0D
-#define I2O_SCSI_PORT_CONN_FC_SCA_II_40     0x0E
-#define I2O_SCSI_PORT_CONN_FC_SCA_II_20     0x0F
-#define I2O_SCSI_PORT_CONN_FC_BNC           0x10
+#define	I2O_SCSI_PORT_CONN_OTHER            0x01
+#define	I2O_SCSI_PORT_CONN_UNKNOWN          0x02
+#define	I2O_SCSI_PORT_CONN_NONE             0x03
+#define	I2O_SCSI_PORT_CONN_SHIELDED_A_HD    0x04
+#define	I2O_SCSI_PORT_CONN_UNSHIELDED_A_HD  0x05
+#define	I2O_SCSI_PORT_CONN_SHIELDED_A_LD    0x06
+#define	I2O_SCSI_PORT_CONN_UNSHIELDED_A_LD  0x07
+#define	I2O_SCSI_PORT_CONN_SHIELDED_P_HD    0x08
+#define	I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD  0x09
+#define	I2O_SCSI_PORT_CONN_SCA_I            0x0A
+#define	I2O_SCSI_PORT_CONN_SCA_II           0x0B
+#define	I2O_SCSI_PORT_CONN_FC_DB9           0x0C
+#define	I2O_SCSI_PORT_CONN_FC_FIBRE         0x0D
+#define	I2O_SCSI_PORT_CONN_FC_SCA_II_40     0x0E
+#define	I2O_SCSI_PORT_CONN_FC_SCA_II_20     0x0F
+#define	I2O_SCSI_PORT_CONN_FC_BNC           0x10
 
 /* Connector Gender */
 
-#define I2O_SCSI_PORT_CONN_GENDER_OTHER     0x01
-#define I2O_SCSI_PORT_CONN_GENDER_UNKOWN    0x02
-#define I2O_SCSI_PORT_CONN_GENDER_FEMALE    0x03
-#define I2O_SCSI_PORT_CONN_GENDER_MALE      0x04
+#define	I2O_SCSI_PORT_CONN_GENDER_OTHER     0x01
+#define	I2O_SCSI_PORT_CONN_GENDER_UNKOWN    0x02
+#define	I2O_SCSI_PORT_CONN_GENDER_FEMALE    0x03
+#define	I2O_SCSI_PORT_CONN_GENDER_MALE      0x04
 
 
 /* SCSI Device Group 0000h - Device Information Parameter Group */
@@ -392,7 +392,7 @@ typedef struct _I2O_SCSI_BUS_PORT_INFO_SCALAR {
 
 /* I2O SCSI Peripheral Event Indicator Assignment */
 
-#define I2O_SCSI_EVENT_SCSI_SMART               0x00000010
+#define	I2O_SCSI_EVENT_SCSI_SMART               0x00000010
 
 
 /****************************************************************************/
@@ -417,9 +417,9 @@ typedef struct _I2O_SCSI_SUCCESS_REPLY_MESSAGE_FRAME {
 /* I2O SCSI Peripheral Error Report Reply Message Frame */
 
 #ifdef _WIN64
-#define I2O_SCSI_SENSE_DATA_SZ      44
+#define	I2O_SCSI_SENSE_DATA_SZ      44
 #else
-#define I2O_SCSI_SENSE_DATA_SZ      40
+#define	I2O_SCSI_SENSE_DATA_SZ      40
 #endif
 
 typedef struct _I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME {
@@ -455,28 +455,28 @@ typedef struct _I2O_SCSI_SCB_ABORT_MESSAGE {
 
 /* I2O SCSI Control Block Execute Message Frame */
 
-#define  I2O_SCSI_CDB_LENGTH                16
+#define	 I2O_SCSI_CDB_LENGTH                16
 
 typedef U16     I2O_SCB_FLAGS;
 
-#define I2O_SCB_FLAG_XFER_DIR_MASK          0xC000
-#define I2O_SCB_FLAG_NO_DATA_XFER           0x0000
-#define I2O_SCB_FLAG_XFER_FROM_DEVICE       0x4000
-#define I2O_SCB_FLAG_XFER_TO_DEVICE         0x8000
+#define	I2O_SCB_FLAG_XFER_DIR_MASK          0xC000
+#define	I2O_SCB_FLAG_NO_DATA_XFER           0x0000
+#define	I2O_SCB_FLAG_XFER_FROM_DEVICE       0x4000
+#define	I2O_SCB_FLAG_XFER_TO_DEVICE         0x8000
 
-#define I2O_SCB_FLAG_ENABLE_DISCONNECT      0x2000
+#define	I2O_SCB_FLAG_ENABLE_DISCONNECT      0x2000
 
-#define I2O_SCB_FLAG_TAG_TYPE_MASK          0x0380
-#define I2O_SCB_FLAG_NO_TAG_QUEUEING        0x0000
-#define I2O_SCB_FLAG_SIMPLE_QUEUE_TAG       0x0080
-#define I2O_SCB_FLAG_HEAD_QUEUE_TAG         0x0100
-#define I2O_SCB_FLAG_ORDERED_QUEUE_TAG      0x0180
-#define I2O_SCB_FLAG_ACA_QUEUE_TAG          0x0200
+#define	I2O_SCB_FLAG_TAG_TYPE_MASK          0x0380
+#define	I2O_SCB_FLAG_NO_TAG_QUEUEING        0x0000
+#define	I2O_SCB_FLAG_SIMPLE_QUEUE_TAG       0x0080
+#define	I2O_SCB_FLAG_HEAD_QUEUE_TAG         0x0100
+#define	I2O_SCB_FLAG_ORDERED_QUEUE_TAG      0x0180
+#define	I2O_SCB_FLAG_ACA_QUEUE_TAG          0x0200
 
-#define I2O_SCB_FLAG_AUTOSENSE_MASK         0x0060
-#define I2O_SCB_FLAG_DISABLE_AUTOSENSE      0x0000
-#define I2O_SCB_FLAG_SENSE_DATA_IN_MESSAGE  0x0020
-#define I2O_SCB_FLAG_SENSE_DATA_IN_BUFFER   0x0060
+#define	I2O_SCB_FLAG_AUTOSENSE_MASK         0x0060
+#define	I2O_SCB_FLAG_DISABLE_AUTOSENSE      0x0000
+#define	I2O_SCB_FLAG_SENSE_DATA_IN_MESSAGE  0x0020
+#define	I2O_SCB_FLAG_SENSE_DATA_IN_BUFFER   0x0060
 
 typedef struct _I2O_SCSI_SCB_EXECUTE_MESSAGE {
     I2O_MESSAGE_FRAME       StdMessageFrame;
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index 724d39c..767b7b9 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -56,9 +56,9 @@
  */
 
 #ifndef __INCi2odeph
-#define __INCi2odeph
+#define	__INCi2odeph
 
-#define I2ODEP_REV 1_5_4
+#define	I2ODEP_REV 1_5_4
 
 /*
  * Pragma macros. These are to assure appropriate alignment between
@@ -66,10 +66,10 @@
  * header files includes these macros.
  */
 
-#define PRAGMA_ALIGN_PUSH
-#define PRAGMA_ALIGN_POP
-#define PRAGMA_PACK_PUSH
-#define PRAGMA_PACK_POP
+#define	PRAGMA_ALIGN_PUSH
+#define	PRAGMA_ALIGN_POP
+#define	PRAGMA_PACK_PUSH
+#define	PRAGMA_PACK_POP
 
 /* Setup the basics */
 
@@ -100,14 +100,14 @@ typedef    U32 BF;
 #else
  typedef    void  VOID;
 #endif
-#define __VOID
+#define	__VOID
 #endif
 
 
 /* Boolean */
 
 #ifndef __BOOL
-#define __BOOL
+#define	__BOOL
 
 typedef unsigned char BOOL;
 #endif
@@ -144,7 +144,7 @@ typedef unsigned long          UINT32;
 typedef unsigned long          *pUINT32;
 /* typedef SCSI_REQUEST_BLOCK     OS_REQUEST_T; */
 /* typedef PSCSI_REQUEST_BLOCK    pOS_REQUEST_T; */
-#define STATIC                 static
+#define	STATIC                 static
 #ifndef __NEAR__
 # if (defined(__BORLANDC__))
 #  define __NEAR__ near
@@ -152,8 +152,8 @@ typedef unsigned long          *pUINT32;
 #  define __NEAR__
 # endif
 #endif
-#define pVOID                  void *
-#define pBOOLEAN               BOOLEAN *
+#define	pVOID                  void *
+#define	pBOOLEAN               BOOLEAN *
 #endif
 
 
@@ -289,250 +289,250 @@ typedef unsigned long          *pUINT32;
 /*
  * General SGE
  */
-#define I2O_FLAGS_COUNT_getCount(x)   _F_getCount(x,Count,Count)
-#define I2O_FLAGS_COUNT_setCount(x,y) _F_setCount(x,Count,Count,y)
-#define I2O_FLAGS_COUNT_getFlags(x)   _F_getFlags(x,Count,Flags)
-#define I2O_FLAGS_COUNT_setFlags(x,y) _F_setFlags(x,Count,Flags,y)
+#define	I2O_FLAGS_COUNT_getCount(x)   _F_getCount(x,Count,Count)
+#define	I2O_FLAGS_COUNT_setCount(x,y) _F_setCount(x,Count,Count,y)
+#define	I2O_FLAGS_COUNT_getFlags(x)   _F_getFlags(x,Count,Flags)
+#define	I2O_FLAGS_COUNT_setFlags(x,y) _F_setFlags(x,Count,Flags,y)
 
 /*
  * I2O_SGE_SIMPLE_ELEMENT
  */
-#define I2O_SGE_SIMPLE_ELEMENT_getPhysicalAddress(x) \
+#define	I2O_SGE_SIMPLE_ELEMENT_getPhysicalAddress(x) \
         getLU4((&(x)->PhysicalAddress),0)
-#define I2O_SGE_SIMPLE_ELEMENT_setPhysicalAddress(x,y) \
+#define	I2O_SGE_SIMPLE_ELEMENT_setPhysicalAddress(x,y) \
         setLU4((&(x)->PhysicalAddress),0,y)
 /*
  * I2O_SGE_LONG_TRANSACTION_ELEMENT
  */
-#define I2O_SGE_LONG_TRANSACTION_ELEMENT_getLongElementLength(x)\
+#define	I2O_SGE_LONG_TRANSACTION_ELEMENT_getLongElementLength(x)\
         _F_getCount(x,LongElementLength,LongElementLength)
-#define I2O_SGE_LONG_TRANSACTION_ELEMENT_setLongElementLength(x,y)\
+#define	I2O_SGE_LONG_TRANSACTION_ELEMENT_setLongElementLength(x,y)\
         _F_setCount(x,LongElementLength,LongElementLength,y)
-#define I2O_SGE_LONG_TRANSACTION_ELEMENT_getFlags(x)\
+#define	I2O_SGE_LONG_TRANSACTION_ELEMENT_getFlags(x)\
         _F_getFlags(x,LongElementLength,Flags)
-#define I2O_SGE_LONG_TRANSACTION_ELEMENT_setFlags(x,y)\
+#define	I2O_SGE_LONG_TRANSACTION_ELEMENT_setFlags(x,y)\
         _F_setFlags(x,LongElementLength,Flags,y)
 
 /*
  * I2O_SGE_LONG_TRANSPORT_ELEMENT
  */
-#define I2O_SGE_LONG_TRANSPORT_ELEMENT_getLongElementLength(x)\
+#define	I2O_SGE_LONG_TRANSPORT_ELEMENT_getLongElementLength(x)\
         _F_getCount(x,LongElementLength,LongElementLength)
-#define I2O_SGE_LONG_TRANSPORT_ELEMENT_setLongElementLength(x,y)\
+#define	I2O_SGE_LONG_TRANSPORT_ELEMENT_setLongElementLength(x,y)\
         _F_setCount(x,LongElementLength,LongElementLength,y)
-#define I2O_SGE_LONG_TRANSPORT_ELEMENT_getFlags(x)\
+#define	I2O_SGE_LONG_TRANSPORT_ELEMENT_getFlags(x)\
         _F_getFlags(x,LongElementLength,Flags)
-#define I2O_SGE_LONG_TRANSPORT_ELEMENT_setFlags(x,y)\
+#define	I2O_SGE_LONG_TRANSPORT_ELEMENT_setFlags(x,y)\
         _F_setFlags(x,LongElementLength,Flags,y)
 
 /*
  * I2O_EXEC_ADAPTER_ASSIGN_MESSAGE
  */
-#define I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_getDdmTID(x)\
+#define	I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_getDdmTID(x)\
         _F_getTID(x,DdmTID,DdmTID)
-#define I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_setDdmTID(x,y)\
+#define	I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_setDdmTID(x,y)\
         _F_setTID(x,DDdmTID,DdmTID,y)
-#define I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_getOperationFlags(x)\
+#define	I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_getOperationFlags(x)\
         _F_getFunc(x,DdmTID,OperationFlags)
-#define I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_setOperationFlags(x,y)\
+#define	I2O_EXEC_ADAPTER_ASSIGN_MESSAGE_setOperationFlags(x,y)\
         _F_setFunc(x,DdmTID,OperationFlags,y)
 
 /*
  * I2O_EXEC_BIOS_INFO_SET_MESSAGE
  */
-#define I2O_EXEC_BIOS_INFO_SET_MESSAGE_getDeviceTID(x)\
+#define	I2O_EXEC_BIOS_INFO_SET_MESSAGE_getDeviceTID(x)\
         _F_getTID(x,DeviceTID,DeviceTID)
-#define I2O_EXEC_BIOS_INFO_SET_MESSAGE_setDeviceTID(x,y)\
+#define	I2O_EXEC_BIOS_INFO_SET_MESSAGE_setDeviceTID(x,y)\
         _F_setTID(x,DeviceTID,DeviceTID,y)
-#define I2O_EXEC_BIOS_INFO_SET_MESSAGE_getBiosInfo(x)\
+#define	I2O_EXEC_BIOS_INFO_SET_MESSAGE_getBiosInfo(x)\
         _F_getFunc(x,DeviceTID,BiosInfo)
-#define I2O_EXEC_BIOS_INFO_SET_MESSAGE_setBiosInfo(x,y)  \
+#define	I2O_EXEC_BIOS_INFO_SET_MESSAGE_setBiosInfo(x,y)  \
         _F_setFunc(x,DeviceTID,BiosInfo,y)
 
 /*
  * I2O_ALIAS_CONNECT_SETUP
  */
-#define I2O_ALIAS_CONNECT_SETUP_getIOP1AliasForTargetDevice(x)\
+#define	I2O_ALIAS_CONNECT_SETUP_getIOP1AliasForTargetDevice(x)\
         _F_getTID(x,IOP1AliasForTargetDevice,IOP1AliasForTargetDevice)
-#define I2O_ALIAS_CONNECT_SETUP_setIOP1AliasForTargetDevice(x,y)\
+#define	I2O_ALIAS_CONNECT_SETUP_setIOP1AliasForTargetDevice(x,y)\
         _F_setTID(x,IOP1AliasForTargetDevice,IOP1AliasForTargetDevice,y)
-#define I2O_ALIAS_CONNECT_SETUP_getIOP2AliasForInitiatorDevice(x)\
+#define	I2O_ALIAS_CONNECT_SETUP_getIOP2AliasForInitiatorDevice(x)\
         _F_getTID1(x,IOP1AliasForTargetDevice,IOP2AliasForInitiatorDevice)
-#define I2O_ALIAS_CONNECT_SETUP_setIOP2AliasForInitiatorDevice(x,y)\
+#define	I2O_ALIAS_CONNECT_SETUP_setIOP2AliasForInitiatorDevice(x,y)\
         _F_setTID1(x,IOP1AliasForTargetDevice,IOP2AliasForInitiatorDevice,y)
 
 /*
  * I2O_OBJECT_CONNECT_SETUP
  */
-#define I2O_OBJECT_CONNECT_SETUP_getTargetDevice(x)\
+#define	I2O_OBJECT_CONNECT_SETUP_getTargetDevice(x)\
         _F_getTID(x,TargetDevice,TargetDevice)
-#define I2O_OBJECT_CONNECT_SETUP_setTargetDevice(x,y)\
+#define	I2O_OBJECT_CONNECT_SETUP_setTargetDevice(x,y)\
         _F_setTID(x,TargetDevice,TargetDevice,y)
-#define I2O_OBJECT_CONNECT_SETUP_getInitiatorDevice(x)\
+#define	I2O_OBJECT_CONNECT_SETUP_getInitiatorDevice(x)\
         _F_getTID1(x,TargetDevice,InitiatorDevice)
-#define I2O_OBJECT_CONNECT_SETUP_setInitiatorDevice(x,y)\
+#define	I2O_OBJECT_CONNECT_SETUP_setInitiatorDevice(x,y)\
         _F_setTID1(x,TargetDevice,InitiatorDevice,y)
-#define I2O_OBJECT_CONNECT_SETUP_getOperationFlags(x)\
+#define	I2O_OBJECT_CONNECT_SETUP_getOperationFlags(x)\
         _F_getFunc(x,TargetDevice,OperationFlags)
-#define I2O_OBJECT_CONNECT_SETUP_setOperationFlags(x,y)\
+#define	I2O_OBJECT_CONNECT_SETUP_setOperationFlags(x,y)\
         _F_setFunc(x,TargetDevice,OperationFlags,y)
 
 /*
  * I2O_OBJECT_CONNECT_REPLY
  */
-#define I2O_OBJECT_CONNECT_REPLY_getTargetDevice(x)\
+#define	I2O_OBJECT_CONNECT_REPLY_getTargetDevice(x)\
         _F_getTID(x,TargetDevice,TargetDevice)
-#define I2O_OBJECT_CONNECT_REPLY_setTargetDevice(x,y)\
+#define	I2O_OBJECT_CONNECT_REPLY_setTargetDevice(x,y)\
         _F_setTID(x,TargetDevice,TargetDevice,y)
-#define I2O_OBJECT_CONNECT_REPLY_getInitiatorDevice(x)\
+#define	I2O_OBJECT_CONNECT_REPLY_getInitiatorDevice(x)\
         _F_getTID1(x,TargetDevice,InitiatorDevice)
-#define I2O_OBJECT_CONNECT_REPLY_setInitiatorDevice(x,y)\
+#define	I2O_OBJECT_CONNECT_REPLY_setInitiatorDevice(x,y)\
         _F_setTID1(x,TargetDevice,InitiatorDevice,y)
-#define I2O_OBJECT_CONNECT_REPLY_getReplyStatusCode(x)\
+#define	I2O_OBJECT_CONNECT_REPLY_getReplyStatusCode(x)\
         _F_getFunc(x,TargetDevice,ReplyStatusCode)
-#define I2O_OBJECT_CONNECT_REPLY_setReplyStatusCode(x,y)\
+#define	I2O_OBJECT_CONNECT_REPLY_setReplyStatusCode(x,y)\
         _F_setFunc(x,TargetDevice,ReplyStatusCode,y)
 
 /*
  * I2O_EXEC_DEVICE_ASSIGN_MESSAGE
  */
-#define I2O_EXEC_DEVICE_ASSIGN_MESSAGE_getDeviceTID(x)\
+#define	I2O_EXEC_DEVICE_ASSIGN_MESSAGE_getDeviceTID(x)\
         _F_getTID(x,Object.DeviceTID,Object.DeviceTID)
-#define I2O_EXEC_DEVICE_ASSIGN_MESSAGE_setDeviceTID(x,y)\
+#define	I2O_EXEC_DEVICE_ASSIGN_MESSAGE_setDeviceTID(x,y)\
         _F_setTID(x,Object.DeviceTID,Object.DeviceTID,y)
-#define I2O_EXEC_DEVICE_ASSIGN_MESSAGE_getIOP_ID(x)\
+#define	I2O_EXEC_DEVICE_ASSIGN_MESSAGE_getIOP_ID(x)\
         _F_getTID1(x,Object.DeviceTID,Object.IOP_ID)
-#define I2O_EXEC_DEVICE_ASSIGN_MESSAGE_setIOP_ID(x,y)\
+#define	I2O_EXEC_DEVICE_ASSIGN_MESSAGE_setIOP_ID(x,y)\
         _F_setTID1(x,Object.DeviceTID,Object.IOP_ID,y)
-#define I2O_EXEC_DEVICE_ASSIGN_MESSAGE_getOperationFlags(x)\
+#define	I2O_EXEC_DEVICE_ASSIGN_MESSAGE_getOperationFlags(x)\
         _F_getFunc(x,Object.DeviceTID,Object.OperationFlags)
-#define I2O_EXEC_DEVICE_ASSIGN_MESSAGE_setOperationFlags(x,y)\
+#define	I2O_EXEC_DEVICE_ASSIGN_MESSAGE_setOperationFlags(x,y)\
         _F_setFunc(x,Object.DeviceTID,Object.OperationFlags,y)
 
 /*
  * I2O_EXEC_DEVICE_RELEASE_MESSAGE
  */
-#define I2O_EXEC_DEVICE_RELEASE_MESSAGE_getDeviceTID(x)\
+#define	I2O_EXEC_DEVICE_RELEASE_MESSAGE_getDeviceTID(x)\
         _F_getTID(x,Object.DeviceTID,Object.DeviceTID)
-#define I2O_EXEC_DEVICE_RELEASE_MESSAGE_setDeviceTID(x,y)\
+#define	I2O_EXEC_DEVICE_RELEASE_MESSAGE_setDeviceTID(x,y)\
         _F_setTID(x,Object.DeviceTID,Object.DeviceTID,y)
-#define I2O_EXEC_DEVICE_RELEASE_MESSAGE_getIOP_ID(x)\
+#define	I2O_EXEC_DEVICE_RELEASE_MESSAGE_getIOP_ID(x)\
         _F_getTID1(x,Object.DeviceTID,Object.IOP_ID)
-#define I2O_EXEC_DEVICE_RELEASE_MESSAGE_setIOP_ID(x,y)\
+#define	I2O_EXEC_DEVICE_RELEASE_MESSAGE_setIOP_ID(x,y)\
         _F_setTID1(x,Object.DeviceTID,Object.IOP_ID,y)
-#define I2O_EXEC_DEVICE_RELEASE_MESSAGE_getOperationFlags(x)\
+#define	I2O_EXEC_DEVICE_RELEASE_MESSAGE_getOperationFlags(x)\
         _F_getFunc(x,Object.DeviceTID,Object.OperationFlags)
-#define I2O_EXEC_DEVICE_RELEASE_MESSAGE_setOperationFlags(x,y)\
+#define	I2O_EXEC_DEVICE_RELEASE_MESSAGE_setOperationFlags(x,y)\
         _F_setFunc(x,Object.DeviceTID,Object.OperationFlags,y)
 
 /*
  * I2O_EXEC_IOP_RESET_MESSAGE
  */
-#define I2O_EXEC_IOP_RESET_MESSAGE_getTargetAddress(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getTargetAddress(x)\
         _F_getTID(x,TargetAddress,TargetAddress)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setTargetAddress(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setTargetAddress(x,y)\
         _F_setTID(x,TargetAddress,TargetAddress,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getInitiatorAddress(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getInitiatorAddress(x)\
         _F_getTID1(x,TargetAddress,InitiatorAddress)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setInitiatorAddress(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setInitiatorAddress(x,y)\
         _F_setTID1(x,TargetAddress,InitiatorAddress,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getFunction(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getFunction(x)\
         _F_getFunc(x,TargetAddress,Function)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setFunction(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setFunction(x,y)\
         _F_setFunc(x,TargetAddress,Function,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getVersionOffset(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getVersionOffset(x)\
                 getU1((&(x)->VersionOffset),0)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setVersionOffset(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setVersionOffset(x,y)\
                 setU1((&(x)->VersionOffset),0,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getMsgFlags(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getMsgFlags(x)\
                 getU1((&(x)->VersionOffset),1)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setMsgFlags(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setMsgFlags(x,y)\
                 setU1((&(x)->VersionOffset),1,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getMessageSize(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getMessageSize(x)\
                 getLU2((&(x)->VersionOffset),2)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setMessageSize(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setMessageSize(x,y)\
                 setLU2((&(x)->VersionOffset),2,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getStatusWordLowAddress(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getStatusWordLowAddress(x)\
                 getLU4((&(x)->StatusWordLowAddress),0)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setStatusWordLowAddress(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setStatusWordLowAddress(x,y)\
                 setLU4((&(x)->StatusWordLowAddress),0,y)
-#define I2O_EXEC_IOP_RESET_MESSAGE_getStatusWordHighAddress(x)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_getStatusWordHighAddress(x)\
                 getLU4((&(x)->StatusWordHighAddress),0)
-#define I2O_EXEC_IOP_RESET_MESSAGE_setStatusWordHighAddress(x,y)\
+#define	I2O_EXEC_IOP_RESET_MESSAGE_setStatusWordHighAddress(x,y)\
                 setLU4((&(x)->StatusWordHighAddress),0,y)
 
 
 /*
  * I2O_EXEC_STATUS_GET_MESSAGE
  */
-#define I2O_EXEC_STATUS_GET_MESSAGE_getVersionOffset(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getVersionOffset(x)\
                 getU1((&(x)->VersionOffset),0)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setVersionOffset(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setVersionOffset(x,y)\
                 setU1((&(x)->VersionOffset),0,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getMsgFlags(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getMsgFlags(x)\
                 getU1((&(x)->VersionOffset),1)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setMsgFlags(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setMsgFlags(x,y)\
                 setU1((&(x)->VersionOffset),1,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getMessageSize(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getMessageSize(x)\
                 getLU2((&(x)->VersionOffset),2)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setMessageSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setMessageSize(x,y)\
                 setLU2((&(x)->VersionOffset),2,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getReplyBufferAddressLow(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getReplyBufferAddressLow(x)\
                 getLU4((&(x)->ReplyBufferAddressLow),0)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setReplyBufferAddressLow(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setReplyBufferAddressLow(x,y)\
                 setLU4((&(x)->ReplyBufferAddressLow),0,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getReplyBufferAddressHigh(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getReplyBufferAddressHigh(x)\
                 getLU4((&(x)->ReplyBufferAddressHigh),0)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setReplyBufferAddressHigh(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setReplyBufferAddressHigh(x,y)\
                 setLU4((&(x)->ReplyBufferAddressHigh),0,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getReplyBufferLength(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getReplyBufferLength(x)\
                 getLU4((&(x)->ReplyBufferLength),0)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setReplyBufferLength(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setReplyBufferLength(x,y)\
                 setLU4((&(x)->ReplyBufferLength),0,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getTargetAddress(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getTargetAddress(x)\
                 _F_getTID(x,TargetAddress,TargetAddress)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setTargetAddress(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setTargetAddress(x,y)\
                 _F_setTID(x,TargetAddress,TargetAddress,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getInitiatorAddress(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getInitiatorAddress(x)\
                 _F_getTID1(x,TargetAddress,InitiatorAddress)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setInitiatorAddress(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setInitiatorAddress(x,y)\
                 _F_setTID1(x,TargetAddress,InitiatorAddress,y)
-#define I2O_EXEC_STATUS_GET_MESSAGE_getFunction(x)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_getFunction(x)\
                 _F_getFunc(x,TargetAddress,Function)
-#define I2O_EXEC_STATUS_GET_MESSAGE_setFunction(x,y)\
+#define	I2O_EXEC_STATUS_GET_MESSAGE_setFunction(x,y)\
                 _F_setFunc(x,TargetAddress,Function,y)
 
 /*
  * I2O_MESSAGE_FRAME
  */
-#define I2O_MESSAGE_FRAME_getVersionOffset(x)\
+#define	I2O_MESSAGE_FRAME_getVersionOffset(x)\
                 getU1((&((x)->VersionOffset)),0)
-#define I2O_MESSAGE_FRAME_setVersionOffset(x,y)\
+#define	I2O_MESSAGE_FRAME_setVersionOffset(x,y)\
                 setU1(((&(x)->VersionOffset)),0,y)
-#define I2O_MESSAGE_FRAME_getMsgFlags(x)\
+#define	I2O_MESSAGE_FRAME_getMsgFlags(x)\
                 getU1((&((x)->VersionOffset)),1)
-#define I2O_MESSAGE_FRAME_setMsgFlags(x,y)\
+#define	I2O_MESSAGE_FRAME_setMsgFlags(x,y)\
                 setU1((&((x)->VersionOffset)),1,y)
-#define I2O_MESSAGE_FRAME_getMessageSize(x)\
+#define	I2O_MESSAGE_FRAME_getMessageSize(x)\
                 getLU2((&((x)->VersionOffset)),2)
-#define I2O_MESSAGE_FRAME_setMessageSize(x,y)\
+#define	I2O_MESSAGE_FRAME_setMessageSize(x,y)\
                 setLU2((&((x)->VersionOffset)),2,y)
-#define I2O_MESSAGE_FRAME_getTargetAddress(x)\
+#define	I2O_MESSAGE_FRAME_getTargetAddress(x)\
                 _F_getTID(x,TargetAddress,TargetAddress)
-#define I2O_MESSAGE_FRAME_setTargetAddress(x,y)\
+#define	I2O_MESSAGE_FRAME_setTargetAddress(x,y)\
                 _F_setTID(x,TargetAddress,TargetAddress,y)
-#define I2O_MESSAGE_FRAME_getInitiatorAddress(x)\
+#define	I2O_MESSAGE_FRAME_getInitiatorAddress(x)\
                 _F_getTID1(x,TargetAddress,InitiatorAddress)
-#define I2O_MESSAGE_FRAME_setInitiatorAddress(x,y)\
+#define	I2O_MESSAGE_FRAME_setInitiatorAddress(x,y)\
                 _F_setTID1(x,TargetAddress,InitiatorAddress,y)
-#define I2O_MESSAGE_FRAME_getFunction(x)\
+#define	I2O_MESSAGE_FRAME_getFunction(x)\
                 _F_getFunc(x,TargetAddress,Function)
-#define I2O_MESSAGE_FRAME_setFunction(x,y)\
+#define	I2O_MESSAGE_FRAME_setFunction(x,y)\
                 _F_setFunc(x,TargetAddress,Function,y)
 /* 32 bit only for now */
-#define I2O_MESSAGE_FRAME_getInitiatorContext(x)\
+#define	I2O_MESSAGE_FRAME_getInitiatorContext(x)\
                 (x)->InitiatorContext
-#define I2O_MESSAGE_FRAME_setInitiatorContext(x,y)\
+#define	I2O_MESSAGE_FRAME_setInitiatorContext(x,y)\
                 ((x)->InitiatorContext = (y))
 /*
  *	We are spilling the 64 bit Context field into the Transaction
@@ -545,49 +545,49 @@ typedef unsigned long          *pUINT32;
  */
 #if defined(_MSC_VER) && _MSC_VER >= 800
 #ifndef u_int64_t
-#define u_int64_t unsigned __int64
+#define	u_int64_t unsigned __int64
 #endif
 #endif
-#define I2O_MESSAGE_FRAME_getInitiatorContext64(x)\
+#define	I2O_MESSAGE_FRAME_getInitiatorContext64(x)\
 		(*((u_int64_t *)(&((x)->InitiatorContext))))
-#define I2O_MESSAGE_FRAME_setInitiatorContext64(x,y)\
+#define	I2O_MESSAGE_FRAME_setInitiatorContext64(x,y)\
 		((*((u_int64_t *)(&((x)->InitiatorContext))))=(y))
 
 /*
  * I2O_EXEC_OUTBOUND_INIT_MESSAGE
  */
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_getHostPageFrameSize(x)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_getHostPageFrameSize(x)\
                 getLU4((&(x)->HostPageFrameSize),0)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_setHostPageFrameSize(x,y)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_setHostPageFrameSize(x,y)\
                 setLU4((&(x)->HostPageFrameSize),0,y)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_getInitCode(x)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_getInitCode(x)\
                 getU1((&(x)->InitCode),0)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_setInitCode(x,y)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_setInitCode(x,y)\
                 setU1((&(x)->InitCode),0,y)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_getreserved(x)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_getreserved(x)\
                 getU1((&(x)->reserved),0)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_setreserved(x,y)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_setreserved(x,y)\
                 setU1((&(x)->reserved),0,y)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_getOutboundMFrameSize(x)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_getOutboundMFrameSize(x)\
                 getLU2((&(x)->OutboundMFrameSize),0)
-#define I2O_EXEC_OUTBOUND_INIT_MESSAGE_setOutboundMFrameSize(x,y)\
+#define	I2O_EXEC_OUTBOUND_INIT_MESSAGE_setOutboundMFrameSize(x,y)\
                 setLU2((&(x)->OutboundMFrameSize),0,y)
 
 /*
  * I2O_EXEC_SYS_TAB_SET_MESSAGE
  */
-#define I2O_EXEC_SYS_TAB_SET_MESSAGE_getIOP_ID(x)\
+#define	I2O_EXEC_SYS_TAB_SET_MESSAGE_getIOP_ID(x)\
                 _F_get12bit(x,IOP_ID,IOP_ID)
-#define I2O_EXEC_SYS_TAB_SET_MESSAGE_setIOP_ID(x,y)\
+#define	I2O_EXEC_SYS_TAB_SET_MESSAGE_setIOP_ID(x,y)\
                 _F_set12bit(x,IOP_ID,IOP_ID,y)
-/* #define I2O_EXEC_SYS_TAB_SET_MESSAGE_getreserved1(x) */
-#define I2O_EXEC_SYS_TAB_SET_MESSAGE_getHostUnitID(x)\
+/* #define	I2O_EXEC_SYS_TAB_SET_MESSAGE_getreserved1(x) */
+#define	I2O_EXEC_SYS_TAB_SET_MESSAGE_getHostUnitID(x)\
                 _F_get16bit(x,IOP_ID,2,HostUnitID)
-#define I2O_EXEC_SYS_TAB_SET_MESSAGE_setHostUnitID(x,y)\
+#define	I2O_EXEC_SYS_TAB_SET_MESSAGE_setHostUnitID(x,y)\
                 _F_set16bit(x,IOP_ID,2,HostUnitID,y)
-#define I2O_EXEC_SYS_TAB_SET_MESSAGE_getSegmentNumber(x)\
+#define	I2O_EXEC_SYS_TAB_SET_MESSAGE_getSegmentNumber(x)\
                 _F_get12bit(x,SegmentNumber,SegmentNumber)
-#define I2O_EXEC_SYS_TAB_SET_MESSAGE_setSegmentNumber(x,y)\
+#define	I2O_EXEC_SYS_TAB_SET_MESSAGE_setSegmentNumber(x,y)\
                 _F_get12bit(x,SegmentNumber,SegmentNumber,y)
 
 /*      later
@@ -597,29 +597,29 @@ typedef unsigned long          *pUINT32;
 /*
  * I2O_CLASS_ID
  */
-#define I2O_CLASS_ID_getClass(x)\
+#define	I2O_CLASS_ID_getClass(x)\
                 _F_get12bit(x,Class,0,Class)
-#define I2O_CLASS_ID_setClass(x,y)\
+#define	I2O_CLASS_ID_setClass(x,y)\
                 _F_set12bit(x,Class,0,Class,y)
-#define I2O_CLASS_ID_getVersion(x)\
+#define	I2O_CLASS_ID_getVersion(x)\
                 _F_get4bit4(x,Class,1,Version)
-#define I2O_CLASS_ID_setVersion(x,y)\
+#define	I2O_CLASS_ID_setVersion(x,y)\
                 _F_set4bit4(x,Class,1,Version,y)
-#define I2O_CLASS_ID_getOrganizationID(x)\
+#define	I2O_CLASS_ID_getOrganizationID(x)\
                 _F_get16bit(x,Class,2,OrganizationID)
-#define I2O_CLASS_ID_setOrganizationID(x,y)\
+#define	I2O_CLASS_ID_setOrganizationID(x,y)\
                 _F_set16bit(x,Class,2,OrganizationID,y)
 
 /*
  * I2O_SET_SYSTAB_HEADER
  */
-#define I2O_SET_SYSTAB_HEADER_getNumberEntries(x)\
+#define	I2O_SET_SYSTAB_HEADER_getNumberEntries(x)\
                 getU1((&((x)->NumberEntries)),0)
-#define I2O_SET_SYSTAB_HEADER_setNumberEntries(x,y)\
+#define	I2O_SET_SYSTAB_HEADER_setNumberEntries(x,y)\
                 setU1((&(x)->NumberEntries),0,y)
-#define I2O_SET_SYSTAB_HEADER_getSysTabVersion(x)\
+#define	I2O_SET_SYSTAB_HEADER_getSysTabVersion(x)\
                 getU1((&((x)->SysTabVersion)),0)
-#define I2O_SET_SYSTAB_HEADER_setSysTabVersion(x,y)\
+#define	I2O_SET_SYSTAB_HEADER_setSysTabVersion(x,y)\
                 setU1((&(x)->SysTabVersion),0,y)
 /*  U16 reserved		*/
 /*  U32 CurrentChangeIndicator	*/
@@ -630,218 +630,218 @@ typedef unsigned long          *pUINT32;
 /*
  * I2O_IOP_ENTRY
  */
-#define I2O_IOP_ENTRY_getOrganizationID(x)\
+#define	I2O_IOP_ENTRY_getOrganizationID(x)\
                 getLU2((&((x)->OrganizationID)),0)
-#define I2O_IOP_ENTRY_setOrganizationID(x,y)\
+#define	I2O_IOP_ENTRY_setOrganizationID(x,y)\
                 setLU2((&((x)->OrganizationID)),0,y)
-/* #define I2O_IOP_ENTRY_getreserved U16; */
-#define I2O_IOP_ENTRY_getIOP_ID(x)\
+/* #define	I2O_IOP_ENTRY_getreserved U16; */
+#define	I2O_IOP_ENTRY_getIOP_ID(x)\
                 _F_get12bit(x,IOP_ID,0,IOP_ID)
-#define I2O_IOP_ENTRY_setIOP_ID(x,y)\
+#define	I2O_IOP_ENTRY_setIOP_ID(x,y)\
                 _F_set12bit(x,IOP_ID,0,IOP_ID,y)
 /*   BF                          reserved3:I2O_RESERVED_4BITS;	*/
 /*   BF                          reserved1:I2O_RESERVED_16BITS;	*/
-#define I2O_IOP_ENTRY_getSegmentNumber(x)\
+#define	I2O_IOP_ENTRY_getSegmentNumber(x)\
                 _F_get12bit(x,SegmentNumber,0,SegmentNumber)
-#define I2O_IOP_ENTRY_setSegmentNumber(x,y)\
+#define	I2O_IOP_ENTRY_setSegmentNumber(x,y)\
                 _F_set12bit(x,SegmentNumber,0,SegmentNumber,y)
-#define I2O_IOP_ENTRY_getI2oVersion(x)\
+#define	I2O_IOP_ENTRY_getI2oVersion(x)\
                 _F_get4bit4(x,SegmentNumber,1,I2oVersion)
-#define I2O_IOP_ENTRY_setI2oVersion(x,y)\
+#define	I2O_IOP_ENTRY_setI2oVersion(x,y)\
                 _F_set4bit4(x,SegmentNumber,1,I2oVersion,y)
-#define I2O_IOP_ENTRY_getIopState(x)\
+#define	I2O_IOP_ENTRY_getIopState(x)\
                 _F_get8bit(x,SegmentNumber,2,IopState)
-#define I2O_IOP_ENTRY_setIopState(x,y)\
+#define	I2O_IOP_ENTRY_setIopState(x,y)\
                 _F_set8bit(x,SegmentNumber,2,IopState,y)
-#define I2O_IOP_ENTRY_getMessengerType(x)\
+#define	I2O_IOP_ENTRY_getMessengerType(x)\
                 _F_get8bit(x,SegmentNumber,3,MessengerType)
-#define I2O_IOP_ENTRY_setMessengerType(x,y)\
+#define	I2O_IOP_ENTRY_setMessengerType(x,y)\
                 _F_set8bit(x,SegmentNumber,3,MessengerType,y)
-#define I2O_IOP_ENTRY_getInboundMessageFrameSize(x)\
+#define	I2O_IOP_ENTRY_getInboundMessageFrameSize(x)\
                 getLU2((&((x)->InboundMessageFrameSize)),0)
-#define I2O_IOP_ENTRY_setInboundMessageFrameSize(x,y)\
+#define	I2O_IOP_ENTRY_setInboundMessageFrameSize(x,y)\
                 setLU2((&((x)->InboundMessageFrameSize)),0,y)
-#define I2O_IOP_ENTRY_getreserved2(x)\
+#define	I2O_IOP_ENTRY_getreserved2(x)\
                 getLU2((&((x)->reserved2)),0)
-#define I2O_IOP_ENTRY_setreserved2(x,y)\
+#define	I2O_IOP_ENTRY_setreserved2(x,y)\
                 setLU2((&((x)->reserved2)),0,y)
-#define I2O_IOP_ENTRY_getLastChanged(x)\
+#define	I2O_IOP_ENTRY_getLastChanged(x)\
                 getLU4((&((x)->LastChanged)),0)
-#define I2O_IOP_ENTRY_setLastChanged(x,y)\
+#define	I2O_IOP_ENTRY_setLastChanged(x,y)\
                 setLU4((&((x)->LastChanged)),0,y)
-#define I2O_IOP_ENTRY_getIopCapabilities(x)\
+#define	I2O_IOP_ENTRY_getIopCapabilities(x)\
                 getLU4((&((x)->IopCapabilities)),0)
-#define I2O_IOP_ENTRY_setIopCapabilities(x,y)\
+#define	I2O_IOP_ENTRY_setIopCapabilities(x,y)\
                 setLU4((&((x)->IopCapabilities)),0,y)
 
 /* might want to declare I2O_MESSENGER_INFO struct */
 
-#define I2O_IOP_ENTRY_getInboundMessagePortAddressLow(x)\
+#define	I2O_IOP_ENTRY_getInboundMessagePortAddressLow(x)\
                 getLU4((&((x)->MessengerInfo.InboundMessagePortAddressLow)),0)
-#define I2O_IOP_ENTRY_setInboundMessagePortAddressLow(x,y)\
+#define	I2O_IOP_ENTRY_setInboundMessagePortAddressLow(x,y)\
                 setLU4((&((x)->MessengerInfo.InboundMessagePortAddressLow)),0,y)
 
-#define I2O_IOP_ENTRY_getInboundMessagePortAddressHigh(x)\
+#define	I2O_IOP_ENTRY_getInboundMessagePortAddressHigh(x)\
                 getLU4((&((x)->MessengerInfo.InboundMessagePortAddressHigh)),0)
-#define I2O_IOP_ENTRY_setInboundMessagePortAddressHigh(x,y)\
+#define	I2O_IOP_ENTRY_setInboundMessagePortAddressHigh(x,y)\
                 setLU4((&((x)->MessengerInfo.InboundMessagePortAddressHigh)),0,y)
 
 /*
  *  I2O_HRT
  */
-#define I2O_HRT_getNumberEntries(x)\
+#define	I2O_HRT_getNumberEntries(x)\
                 getLU2((&((x)->NumberEntries)),0)
-#define I2O_HRT_setNumberEntries(x,y)\
+#define	I2O_HRT_setNumberEntries(x,y)\
                 setLU2((&(x)->NumberEntries),0,y)
-#define I2O_HRT_getEntryLength(x)\
+#define	I2O_HRT_getEntryLength(x)\
                 getU1((&(x)->EntryLength),0)
-#define I2O_HRT_setEntryLength(x,y)\
+#define	I2O_HRT_setEntryLength(x,y)\
                 setU1((&(x)->EntryLength),0,y)
-#define I2O_HRT_getHRTVersion(x)\
+#define	I2O_HRT_getHRTVersion(x)\
                 getU1((&(x)->HRTVersion),0)
-#define I2O_HRT_setHRTVersion(x,y)\
+#define	I2O_HRT_setHRTVersion(x,y)\
                 setU1((&(x)->HRTVersion),0,y)
-#define I2O_HRT_getCurrentChangeIndicator(x)\
+#define	I2O_HRT_getCurrentChangeIndicator(x)\
                 getLU4((&(x)->CurrentChangeIndicator),0)
-#define I2O_HRT_setCurrentChangeIndicator(x,y)\
+#define	I2O_HRT_setCurrentChangeIndicator(x,y)\
                 setLU4((&(x)->CurrentChangeIndicator),0,y)
-#define I2O_HRT_getHRTEntryPtr(x,y)\
+#define	I2O_HRT_getHRTEntryPtr(x,y)\
                 ((&((x)->HRTEntry[0+y])))
 
 /*
  *  I2O_HRT_ENTRY
  */
-#define I2O_HRT_ENTRY_getAdapterID(x)\
+#define	I2O_HRT_ENTRY_getAdapterID(x)\
                 getLU4((&((x)->AdapterID)),0)
-#define I2O_HRT_ENTRY_setAdapterID(x,y)\
+#define	I2O_HRT_ENTRY_setAdapterID(x,y)\
                 setLU4((&(x)->AdapterID),0,y)
-#define I2O_HRT_ENTRY_getControllingTID(x)\
+#define	I2O_HRT_ENTRY_getControllingTID(x)\
                 _F_get12bit(x,ControllingTID,ControllingTID)
-#define I2O_HRT_ENTRY_setControllingTID(x,y)\
+#define	I2O_HRT_ENTRY_setControllingTID(x,y)\
                 _F_set12bit(x,ControllingTID,ControllingTID,y)
-#define I2O_HRT_ENTRY_getAdapterState(x)\
+#define	I2O_HRT_ENTRY_getAdapterState(x)\
                 _F_get4bit4(x,ControllingTID,1,AdapterState)
-#define I2O_HRT_ENTRY_setIAdapterState(x,y)\
+#define	I2O_HRT_ENTRY_setIAdapterState(x,y)\
                 _F_set4bit4(x,ControllingTID,1,AdapterState,y)
-#define I2O_HRT_ENTRY_getBusNumber(x)\
+#define	I2O_HRT_ENTRY_getBusNumber(x)\
                 _F_get8bit(x,ControllingTID,2,BusNumber)
-#define I2O_HRT_ENTRY_setBusNumber(x,y)\
+#define	I2O_HRT_ENTRY_setBusNumber(x,y)\
                 _F_set8bit(x,ControllingTID,2,BusNumber,y)
-#define I2O_HRT_ENTRY_getBusType(x)\
+#define	I2O_HRT_ENTRY_getBusType(x)\
                 _F_get8bit(x,ControllingTID,3,BusType)
-#define I2O_HRT_ENTRY_setBusType(x,y)\
+#define	I2O_HRT_ENTRY_setBusType(x,y)\
                 _F_set8bit(x,ControllingTID,3,BusType,y)
-#define I2O_HRT_ENTRY_getPCIBusPtr(x,y)\
+#define	I2O_HRT_ENTRY_getPCIBusPtr(x,y)\
                 (&((x)->uBus.PCIBus))
 
 /*
  *  I2O_LCT
  */
-#define I2O_LCT_getTableSize(x)\
+#define	I2O_LCT_getTableSize(x)\
                 _F_get16bit(x,TableSize,0,TableSize)
-#define I2O_LCT_setTableSize(x,y)\
+#define	I2O_LCT_setTableSize(x,y)\
                 _F_set16bit(x,TableSize,0,TableSize,y)
-#define I2O_LCT_getBootDeviceTID(x)\
+#define	I2O_LCT_getBootDeviceTID(x)\
                 _F_get12bit(x,TableSize,2,BootDeviceTID)
-#define I2O_LCT_setBootDeviceTID(x,y)\
+#define	I2O_LCT_setBootDeviceTID(x,y)\
                 _F_set12bit(x,TableSize,2,BootDeviceTID,y)
-#define I2O_LCT_getLctVer(x)\
+#define	I2O_LCT_getLctVer(x)\
                 _F_get4bit4(x,TableSize,3,LctVer)
-#define I2O_LCT_setLctVer(x,y)\
+#define	I2O_LCT_setLctVer(x,y)\
                 _F_set4bit4(x,TableSize,3,LctVer,y)
-#define I2O_LCT_getIopFlags(x)\
+#define	I2O_LCT_getIopFlags(x)\
                 getLU4((&(x)->IopFlags),0)
-#define I2O_LCT_setIopFlags(x,y)\
+#define	I2O_LCT_setIopFlags(x,y)\
                 setLU4((&(x)->IopFlags),0,y)
-#define I2O_LCT_getCurrentChangeIndicator(x)\
+#define	I2O_LCT_getCurrentChangeIndicator(x)\
                 getLU4((&(x)->CurrentChangeIndicator),0)
-#define I2O_LCT_setCurrentChangeIndicator(x,y)\
+#define	I2O_LCT_setCurrentChangeIndicator(x,y)\
                 setLU4((&(x)->CurrentChangeIndicator),0,y)
-#define I2O_LCT_getLCTEntryPtr(x,y)\
+#define	I2O_LCT_getLCTEntryPtr(x,y)\
                 (&((x)->LCTEntry[0+y]))
 
 /*
  *  I2O_LCT_ENTRY
  */
-#define I2O_LCT_ENTRY_getTableEntrySize(x)\
+#define	I2O_LCT_ENTRY_getTableEntrySize(x)\
                 _F_get16bit(x,TableEntrySize,0,TableEntrySize)
-#define I2O_LCT_ENTRY_setTableEntrySize(x,y)\
+#define	I2O_LCT_ENTRY_setTableEntrySize(x,y)\
                 _F_set16bit(x,TableEntrySize,0,TableEntrySize,y)
-#define I2O_LCT_ENTRY_getLocalTID(x)\
+#define	I2O_LCT_ENTRY_getLocalTID(x)\
                 _F_get12bit(x,TableEntrySize,2,LocalTID)
-#define I2O_LCT_ENTRY_setLocalTID(x,y)\
+#define	I2O_LCT_ENTRY_setLocalTID(x,y)\
                 _F_set12bit(x,TableEntrySize,2,LocalTID,y)
 /*    BF                  4        reserved:I2O_4BIT_VERSION_SZ; */
-#define I2O_LCT_ENTRY_getChangeIndicator(x)\
+#define	I2O_LCT_ENTRY_getChangeIndicator(x)\
                 getLU4((&(x)->ChangeIndicator),0)
-#define I2O_LCT_ENTRY_setChangeIndicator(x,y)\
+#define	I2O_LCT_ENTRY_setChangeIndicator(x,y)\
                 setLU4((&(x)->ChangeIndicator),0,y)
-#define I2O_LCT_ENTRY_getDeviceFlags(x)\
+#define	I2O_LCT_ENTRY_getDeviceFlags(x)\
                 getLU4((&(x)->DeviceFlags),0)
-#define I2O_LCT_ENTRY_setDeviceFlags(x,y)\
+#define	I2O_LCT_ENTRY_setDeviceFlags(x,y)\
                 setLU4((&(x)->DeviceFlags),0,y)
-#define I2O_LCT_ENTRY_getClassIDPtr(x)\
+#define	I2O_LCT_ENTRY_getClassIDPtr(x)\
                 (&((x)->ClassID))
-#define I2O_LCT_ENTRY_getSubClassInfo(x)\
+#define	I2O_LCT_ENTRY_getSubClassInfo(x)\
                 getLU4((&(x)->SubClassInfo),0)
-#define I2O_LCT_ENTRY_setSubClassInfo(x,y)\
+#define	I2O_LCT_ENTRY_setSubClassInfo(x,y)\
                 setLU4((&(x)->SubClassInfo),0,y)
-#define I2O_LCT_ENTRY_getUserTID(x)\
+#define	I2O_LCT_ENTRY_getUserTID(x)\
                 _F_getTID(x,UserTID,UserTID)
-#define I2O_LCT_ENTRY_setUserTID(x,y)\
+#define	I2O_LCT_ENTRY_setUserTID(x,y)\
                 _F_setTID(x,UserTID,UserTID,y)
-#define I2O_LCT_ENTRY_getParentTID(x)\
+#define	I2O_LCT_ENTRY_getParentTID(x)\
                 _F_getTID1(x,UserTID,ParentTID)
-#define I2O_LCT_ENTRY_setParentTID(x,y)\
+#define	I2O_LCT_ENTRY_setParentTID(x,y)\
                 _F_getTID1(x,UserTID,ParentTID,y)
-#define I2O_LCT_ENTRY_getBiosInfo(x)\
+#define	I2O_LCT_ENTRY_getBiosInfo(x)\
                 _F_getFunc(x,UserTID,BiosInfo)
-#define I2O_LCT_ENTRY_setBiosInfo(x,y)\
+#define	I2O_LCT_ENTRY_setBiosInfo(x,y)\
                 _F_setFunc(x,UserTID,BiosInfo,y)
 /*  2 ulong   U8                    8      IdentityTag[I2O_IDENTITY_TAG_SZ]; */
-#define I2O_LCT_ENTRY_getEventCapabilities(x)\
+#define	I2O_LCT_ENTRY_getEventCapabilities(x)\
                 getLU4((&(x)->EventCapabilities),0)
-#define I2O_LCT_ENTRY_setEventCapabilities(x,y)\
+#define	I2O_LCT_ENTRY_setEventCapabilities(x,y)\
                 setLU4((&(x)->EventCapabilities),0,y)
 
 /*
  *  I2O_PARAM_OPERATIONS_LIST_HEADER
  */
-#define I2O_PARAM_OPERATIONS_LIST_HEADER_getOperationCount(x)\
+#define	I2O_PARAM_OPERATIONS_LIST_HEADER_getOperationCount(x)\
                 getLU2((&(x)->OperationCount),0)
-#define I2O_PARAM_OPERATIONS_LIST_HEADER_setOperationCount(x,y)\
+#define	I2O_PARAM_OPERATIONS_LIST_HEADER_setOperationCount(x,y)\
                 setLU2((&(x)->OperationCount),0,y)
-#define I2O_PARAM_OPERATIONS_LIST_HEADER_getReserved(x)\
+#define	I2O_PARAM_OPERATIONS_LIST_HEADER_getReserved(x)\
                 getLU2((&(x)->Reserved),0)
-#define I2O_PARAM_OPERATIONS_LIST_HEADER_setReserved(x,y)\
+#define	I2O_PARAM_OPERATIONS_LIST_HEADER_setReserved(x,y)\
                 setLU2((&(x)->Reserved),0,y)
 
 /*
  *  I2O_PARAM_OPERATION_ALL_TEMPLATE
  */
-#define I2O_PARAM_OPERATION_ALL_TEMPLATE_getOperation(x)\
+#define	I2O_PARAM_OPERATION_ALL_TEMPLATE_getOperation(x)\
                 getLU2((&(x)->Operation),0)
-#define I2O_PARAM_OPERATION_ALL_TEMPLATE_setOperation(x,y)\
+#define	I2O_PARAM_OPERATION_ALL_TEMPLATE_setOperation(x,y)\
                 setLU2((&(x)->Operation),0,y)
-#define I2O_PARAM_OPERATION_ALL_TEMPLATE_getGroupNumber(x)\
+#define	I2O_PARAM_OPERATION_ALL_TEMPLATE_getGroupNumber(x)\
                 getLU2((&(x)->GroupNumber),0)
-#define I2O_PARAM_OPERATION_ALL_TEMPLATE_setGroupNumber(x,y)\
+#define	I2O_PARAM_OPERATION_ALL_TEMPLATE_setGroupNumber(x,y)\
                 setLU2((&(x)->GroupNumber),0,y)
-#define I2O_PARAM_OPERATION_ALL_TEMPLATE_getFieldCount(x)\
+#define	I2O_PARAM_OPERATION_ALL_TEMPLATE_getFieldCount(x)\
                 getLU2((&(x)->FieldCount),0)
-#define I2O_PARAM_OPERATION_ALL_TEMPLATE_setFieldCount(x,y)\
+#define	I2O_PARAM_OPERATION_ALL_TEMPLATE_setFieldCount(x,y)\
                 setLU2((&(x)->FieldCount),0,y)
 
 /*
  *  I2O_PARAM_RESULTS_LIST_HEADER
  */
-#define I2O_PARAM_RESULTS_LIST_HEADER_getResultCount(x)\
+#define	I2O_PARAM_RESULTS_LIST_HEADER_getResultCount(x)\
                 getLU2((&(x)->ResultCount),0)
-#define I2O_PARAM_RESULTS_LIST_HEADER_setResultCount(x,y)\
+#define	I2O_PARAM_RESULTS_LIST_HEADER_setResultCount(x,y)\
                 setLU2((&(x)->ResultCount),0,y)
-#define I2O_PARAM_RESULTS_LIST_HEADER_getReserved(x)\
+#define	I2O_PARAM_RESULTS_LIST_HEADER_getReserved(x)\
                 getLU2((&(x)->Reserved),0)
-#define I2O_PARAM_RESULTS_LIST_HEADER_setReserved(x,y)\
+#define	I2O_PARAM_RESULTS_LIST_HEADER_setReserved(x,y)\
                 setLU2((&(x)->Reserved),0,y)
 
 /*  later
@@ -864,13 +864,13 @@ typedef unsigned long          *pUINT32;
  */
 /*    I2O_MESSAGE_FRAME           StdMessageFrame; */
 /*    I2O_TRANSACTION_CONTEXT     TransactionContext; */
-#define I2O_EXEC_LCT_NOTIFY_MESSAGE_getClassIdentifier(x)\
+#define	I2O_EXEC_LCT_NOTIFY_MESSAGE_getClassIdentifier(x)\
                 getLU4((&(x)->ClassIdentifier),0)
-#define I2O_EXEC_LCT_NOTIFY_MESSAGE_setClassIdentifier(x,y)\
+#define	I2O_EXEC_LCT_NOTIFY_MESSAGE_setClassIdentifier(x,y)\
                 setLU4((&(x)->ClassIdentifier),0,y)
-#define I2O_EXEC_LCT_NOTIFY_MESSAGE_getLastReportedChangeIndicator(x)\
+#define	I2O_EXEC_LCT_NOTIFY_MESSAGE_getLastReportedChangeIndicator(x)\
                 getLU4((&(x)->LastReportedChangeIndicator),0)
-#define I2O_EXEC_LCT_NOTIFY_MESSAGE_setLastReportedChangeIndicator(x,y)\
+#define	I2O_EXEC_LCT_NOTIFY_MESSAGE_setLastReportedChangeIndicator(x,y)\
                 setLU4((&(x)->LastReportedChangeIndicator),0,y)
 /*    I2O_SG_ELEMENT              SGL; */
 
@@ -881,9 +881,9 @@ typedef unsigned long          *pUINT32;
  */
 /*     I2O_MESSAGE_FRAME          StdMessageFrame;	*/
 /*     I2O_TRANSACTION_CONTEXT    TransactionContext;	*/
-#define I2O_UTIL_PARAMS_GET_MESSAGE_getOperationFlags(x)\
+#define	I2O_UTIL_PARAMS_GET_MESSAGE_getOperationFlags(x)\
                 getLU4((&(x)->OperationFlags),0)
-#define I2O_UTIL_PARAMS_GET_MESSAGE_setOperationFlags(x,y)\
+#define	I2O_UTIL_PARAMS_GET_MESSAGE_setOperationFlags(x,y)\
                 setLU4((&(x)->OperationFlags),0,y)
 /*     I2O_SG_ELEMENT             SGL;			*/
 
@@ -891,53 +891,53 @@ typedef unsigned long          *pUINT32;
 /*
  *  I2O_SCSI_SCB_ABORT_MESSAGE
  */
-#define I2O_SCSI_SCB_ABORT_MESSAGE_getStdMessageFramePtr(x)\
+#define	I2O_SCSI_SCB_ABORT_MESSAGE_getStdMessageFramePtr(x)\
                 (&((x)->StdMessageFrame))
-#define I2O_SCSI_SCB_ABORT_MESSAGE_getTransactionContext(x)\
+#define	I2O_SCSI_SCB_ABORT_MESSAGE_getTransactionContext(x)\
                 (x)->TransactionContext
-#define I2O_SCSI_SCB_ABORT_MESSAGE_setTransactionContext(x,y)\
+#define	I2O_SCSI_SCB_ABORT_MESSAGE_setTransactionContext(x,y)\
                 ((x)->TransactionContext = (y))
-#define I2O_SCSI_SCB_ABORT_MESSAGE_getTransactionContextToAbort(x)\
+#define	I2O_SCSI_SCB_ABORT_MESSAGE_getTransactionContextToAbort(x)\
                 (x)->TransactionContextToAbort
-#define I2O_SCSI_SCB_ABORT_MESSAGE_setTransactionContextToAbort(x,y)\
+#define	I2O_SCSI_SCB_ABORT_MESSAGE_setTransactionContextToAbort(x,y)\
                 ((x)->TransactionContextToAbort = (y))
 
 
 /*
  *  I2O_DPT_DEVICE_INFO_SCALAR
  */
-#define I2O_DPT_DEVICE_INFO_SCALAR_getDeviceType(x)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_getDeviceType(x)\
                 getU1((&(x)->DeviceType),0)
-#define I2O_DPT_DEVICE_INFO_SCALAR_setDeviceType(x,y)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_setDeviceType(x,y)\
                 setU1((&(x)->DeviceType),0,y)
-#define I2O_DPT_DEVICE_INFO_SCALAR_getFlags(x)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_getFlags(x)\
                 getU1((&(x)->Flags),0)
-#define I2O_DPT_DEVICE_INFO_SCALAR_setFlags(x,y)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_setFlags(x,y)\
                 setU1((&(x)->Flags),0,y)
-#define I2O_DPT_DEVICE_INFO_SCALAR_getBus(x)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_getBus(x)\
                 getLU2((&(x)->Bus),0)
-#define I2O_DPT_DEVICE_INFO_SCALAR_setBus(x,y)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_setBus(x,y)\
                 setLU2((&(x)->Bus),0,y)
-#define I2O_DPT_DEVICE_INFO_SCALAR_getIdentifier(x)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_getIdentifier(x)\
                 getLU4((&(x)->Identifier),0)
-#define I2O_DPT_DEVICE_INFO_SCALAR_setIdentifier(x,y)\
+#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 */
-#define I2O_DPT_DEVICE_INFO_SCALAR_getLunInfo(x)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_getLunInfo(x)\
                 getU1((&(x)->LunInfo[0]),1)
-#define I2O_DPT_DEVICE_INFO_SCALAR_setLunInfo(x,y)\
+#define	I2O_DPT_DEVICE_INFO_SCALAR_setLunInfo(x,y)\
                 setU1((&(x)->LunInfo[0]),1,y)
 
 /*
  *       I2O_DPT_EXEC_IOP_BUFFERS_SCALAR
  */
-#define I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialOutputOffset(x)\
+#define	I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialOutputOffset(x)\
                 getLU4((&(x)->SerialOutputOffset),0)
-#define I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialOutputSizet(x)\
+#define	I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialOutputSizet(x)\
                 getLU4((&(x)->SerialOutputSize),0)
-#define I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialHeaderSize(x)\
+#define	I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialHeaderSize(x)\
                 getLU4((&(x)->SerialHeaderSize),0)
-#define I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialFlagsSupported(x)\
+#define	I2O_DPT_EXEC_IOP_BUFFERS_SCALAR_getSerialFlagsSupported(x)\
                 getLU4((&(x)->SerialFlagsSupported),0)
 
 /*
@@ -950,17 +950,17 @@ typedef unsigned long          *pUINT32;
 /*    U16                         OrganizationID; */
 /*                                PrivatePayload[]; */
 /* } I2O_PRIVATE_MESSAGE_FRAME, *PI2O_PRIVATE_MESSAGE_FRAME; */
-#define I2O_PRIVATE_MESSAGE_FRAME_getTransactionContext(x) \
+#define	I2O_PRIVATE_MESSAGE_FRAME_getTransactionContext(x) \
                 (x)->TransactionContext
-#define I2O_PRIVATE_MESSAGE_FRAME_setTransactionContext(x,y) \
+#define	I2O_PRIVATE_MESSAGE_FRAME_setTransactionContext(x,y) \
                 ((x)->TransactionContext = (y))
-#define I2O_PRIVATE_MESSAGE_FRAME_getXFunctionCode(x) \
+#define	I2O_PRIVATE_MESSAGE_FRAME_getXFunctionCode(x) \
                 getLU2((&(x)->XFunctionCode),0)
-#define I2O_PRIVATE_MESSAGE_FRAME_setXFunctionCode(x,y) \
+#define	I2O_PRIVATE_MESSAGE_FRAME_setXFunctionCode(x,y) \
                 setLU2((&(x)->XFunctionCode),0,y)
-#define I2O_PRIVATE_MESSAGE_FRAME_getOrganizationID(x) \
+#define	I2O_PRIVATE_MESSAGE_FRAME_getOrganizationID(x) \
                 getLU2((&(x)->OrganizationID),0)
-#define I2O_PRIVATE_MESSAGE_FRAME_setOrganizationID(x,y) \
+#define	I2O_PRIVATE_MESSAGE_FRAME_setOrganizationID(x,y) \
                 setLU2((&(x)->OrganizationID),0,y)
 #if 0
 typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
@@ -982,161 +982,161 @@ typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
 /*
  *       PRIVATE_SCSI_SCB_EXECUTE_MESSAGE
  */
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getPRIVATE_SCSI_SCB_EXECUTE_MESSAGEPtr(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getPRIVATE_SCSI_SCB_EXECUTE_MESSAGEPtr(x)\
                 (&((x)->PRIVATE_SCSI_SCB_EXECUTE_MESSAGE))
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getCDBLength(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getCDBLength(x)\
                 getU1((&(x)->CDBLength),0)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setCDBLength(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setCDBLength(x,y)\
                 setU1((&(x)->CDBLength),0,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getReserved(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getReserved(x)\
                 getU1((&(x)->Reserved),0)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setReserved(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setReserved(x,y)\
                 setU1((&(x)->Reserved),0,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getSCBFlags(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getSCBFlags(x)\
                 getLU2((&(x)->SCBFlags),0)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setSCBFlags(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setSCBFlags(x,y)\
                 setLU2((&(x)->SCBFlags),0,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getByteCount(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getByteCount(x)\
                 getLU4((&((x)->ByteCount)),0)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setByteCount(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setByteCount(x,y)\
                 setLU4((&((x)->ByteCount)),0,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getTID(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getTID(x)\
                 _F_get16bit(x,TID,0,TID)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setTID(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setTID(x,y)\
                 _F_set16bit(x,TID,0,TID,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getInterpret(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getInterpret(x)\
                 _F_get1bit(x,TID,2,Interpret)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setInterpret(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setInterpret(x,y)\
                 _F_set1bit(x,TID,2,Interpret,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getPhysical(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getPhysical(x)\
                 _F_get1bit1(x,TID,2,Physical)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setPhysical(x,y)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_setPhysical(x,y)\
                 _F_set1bit1(x,TID,2,Physical,y)
-#define PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getCDBPtr(x)\
+#define	PRIVATE_SCSI_SCB_EXECUTE_MESSAGE_getCDBPtr(x)\
                 (&((x)->CDB[0]))
 
 
 /*
  *  PRIVATE_FLASH_REGION_MESSAGE
  */
-#define PRIVATE_FLASH_REGION_MESSAGE_getFlashRegion(x) \
+#define	PRIVATE_FLASH_REGION_MESSAGE_getFlashRegion(x) \
                 getLU4((&((x)->FlashRegion)),0)
-#define PRIVATE_FLASH_REGION_MESSAGE_setFlashRegion(x,y) \
+#define	PRIVATE_FLASH_REGION_MESSAGE_setFlashRegion(x,y) \
                 setLU4((&((x)->FlashRegion)),0,y)
-#define PRIVATE_FLASH_REGION_MESSAGE_getRegionOffset(x) \
+#define	PRIVATE_FLASH_REGION_MESSAGE_getRegionOffset(x) \
                 getLU4((&((x)->RegionOffset)),0)
-#define PRIVATE_FLASH_REGION_MESSAGE_setRegionOffset(x,y) \
+#define	PRIVATE_FLASH_REGION_MESSAGE_setRegionOffset(x,y) \
                 setLU4((&((x)->RegionOffset)),0,y)
-#define PRIVATE_FLASH_REGION_MESSAGE_getByteCount(x) \
+#define	PRIVATE_FLASH_REGION_MESSAGE_getByteCount(x) \
                 getLU4((&((x)->ByteCount)),0)
-#define PRIVATE_FLASH_REGION_MESSAGE_setByteCount(x,y) \
+#define	PRIVATE_FLASH_REGION_MESSAGE_setByteCount(x,y) \
                 setLU4((&((x)->ByteCount)),0,y)
 
 /*
  *  I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR
  */
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getSCSIType(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getSCSIType(x)\
                 getU1((&(x)->SCSIType),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setSCSIType(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setSCSIType(x,y)\
                 setU1((&(x)->SCSIType),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getProtectionManagement(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getProtectionManagement(x)\
                 getU1((&(x)->ProtectionManagement),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setProtectionManagement(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setProtectionManagement(x,y)\
                 setU1((&(x)->ProtectionManagement),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getSettings(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getSettings(x)\
                 getU1((&(x)->Settings),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setSettings(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setSettings(x,y)\
                 setU1((&(x)->Settings),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getReserved1(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getReserved1(x)\
                 getU1((&(x)->Reserved1),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setReserved1(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setReserved1(x,y)\
                 setU1((&(x)->Reserved1),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getInitiatorID(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getInitiatorID(x)\
                 getLU4((&(x)->InitiatorID),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setInitiatorID(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setInitiatorID(x,y)\
                 setLU4((&(x)->InitiatorID),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getScanLun0Only(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getScanLun0Only(x)\
                 getLU4((&(x)->ScanLun0Only),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setScanLun0Only(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setScanLun0Only(x,y)\
                 setLU4((&(x)->ScanLun0Only),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getDisableDevice(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getDisableDevice(x)\
                 getLU2((&(x)->DisableDevice),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setDisableDevice(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setDisableDevice(x,y)\
                 setLU2((&(x)->DisableDevice),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getMaxOffset(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getMaxOffset(x)\
                 getU1((&(x)->MaxOffset),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setMaxOffset(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setMaxOffset(x,y)\
                 setU1((&(x)->MaxOffset),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getMaxDataWidth(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getMaxDataWidth(x)\
                 getU1((&(x)->MaxDataWidth),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setMaxDataWidth(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setMaxDataWidth(x,y)\
                 setU1((&(x)->MaxDataWidth),0,y)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getMaxSyncRate(x)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_getMaxSyncRate(x)\
                 getLU4((&(x)->MaxSyncRate),0)
-#define I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setMaxSyncRate(x,y)\
+#define	I2O_HBA_SCSI_CONTROLLER_INFO_SCALAR_setMaxSyncRate(x,y)\
                 setLU4((&(x)->MaxSyncRate),0,y)
 
 /*
  *  I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME
  */
-#define I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_getStdReplyFramePtr(x)\
+#define	I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_getStdReplyFramePtr(x)\
                 (&((x)->StdReplyFrame))
-#define I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_getTransferCount(x)\
+#define	I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_getTransferCount(x)\
                 getLU4((&(x)->TransferCount),0)
-#define I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setTransferCount(x,y)\
+#define	I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setTransferCount(x,y)\
                 setLU4((&(x)->TransferCount),0,y)
-#define I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_getAutoSenseTransferCount(x)\
+#define	I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_getAutoSenseTransferCount(x)\
                 getLU4((&(x)->AutoSenseTransferCount),0)
-#define I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setAutoSenseTransferCount(x,y)\
+#define	I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setAutoSenseTransferCount(x,y)\
                 setLU4((&(x)->AutoSenseTransferCount),0,y)
 
 /*
  *  I2O_SINGLE_REPLY_MESSAGE_FRAME
  */
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_getStdMessageFramePtr(x)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_getStdMessageFramePtr(x)\
                 (&((x)->StdMessageFrame))
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_getTransactionContext(x)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_getTransactionContext(x)\
                 (x)->TransactionContext
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_setTransactionContext(x,y)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_setTransactionContext(x,y)\
                 ((x)->TransactionContext = (y))
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_getDetailedStatusCode(x)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_getDetailedStatusCode(x)\
                 getLU2((&((x)->DetailedStatusCode)),0)
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_setDetailedStatusCode(x,y)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_setDetailedStatusCode(x,y)\
                 setLU2((&((x)->DetailedStatusCode)),0,y)
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_getreserved(x)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_getreserved(x)\
                 getU1((&((x)->reserved)),0)
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_setreserved(x,y)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_setreserved(x,y)\
                 setU1((&((x)->reserved)),0,y)
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_getReqStatus(x)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_getReqStatus(x)\
                 getU1((&((x)->ReqStatus)),0)
-#define I2O_SINGLE_REPLY_MESSAGE_FRAME_setReqStatus(x,y)\
+#define	I2O_SINGLE_REPLY_MESSAGE_FRAME_setReqStatus(x,y)\
                 setU1((&((x)->ReqStatus)),0,y)
 
 
 /*
  *  I2O_SCSI_SCB_EXECUTE_MESSAGE
  */
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_getStdMessageFramePtr(x)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_getStdMessageFramePtr(x)\
                 (&((x)->StdMessageFrame))
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_getTransactionContext(x)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_getTransactionContext(x)\
                 (x)->TransactionContext
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_setTransactionContext(x,y)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_setTransactionContext(x,y)\
                 ((x)->TransactionContext = (y))
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_getCDBLength(x)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_getCDBLength(x)\
                 getU1((&((x)->CDBLength)),0)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_setCDBLength(x,y)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_setCDBLength(x,y)\
                 setU1((&((x)->CDBLength)),0,y)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_getReserved(x)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_getReserved(x)\
                 getU1((&((x)->Reserved)),0)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_setReserved(x,y)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_setReserved(x,y)\
                 setU1((&((x)->Reserved)),0,y)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_getSCBFlags(x)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_getSCBFlags(x)\
                 getLU2((&((x)->SCBFlags)),0)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_setSCBFlags(x,y)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_setSCBFlags(x,y)\
                 setLU2((&((x)->SCBFlags)),0,y)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_getByteCount(x)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_getByteCount(x)\
                 getLU2((&((x)->ByteCount)),0)
-#define I2O_SCSI_SCB_EXECUTE_MESSAGE_setByteCount(x,y)\
+#define	I2O_SCSI_SCB_EXECUTE_MESSAGE_setByteCount(x,y)\
                 setLU2((&((x)->ByteCount)),0,y)
 /*  define for these */
 /*     U8                      CDB[16];	*/
@@ -1146,41 +1146,41 @@ typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
 /*
  *  I2O_FAILURE_REPLY_MESSAGE_FRAME
  */
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getStdMessageFramePtr(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getStdMessageFramePtr(x)\
                 (&((x)->StdMessageFrame))
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getTransactionContext(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getTransactionContext(x)\
                 (x)->TransactionContext
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setTransactionContext(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setTransactionContext(x,y)\
                 ((x)->TransactionContext = (y))
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getLowestVersion(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getLowestVersion(x)\
                 getU1((&((x)->LowestVersion)),0)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setLowestVersion(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setLowestVersion(x,y)\
                 setU1((&((x)->LowestVersion)),0,y)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getHighestVersion(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getHighestVersion(x)\
                 getU1((&((x)->HighestVersion)),0)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setHighestVersion(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setHighestVersion(x,y)\
                 setU1((&((x)->HighestVersion)),0,y)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getAgeLimit(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getAgeLimit(x)\
                 getLU4((&((x)->AgeLimit)),0)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setAgeLimit(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setAgeLimit(x,y)\
                 setLU4((&((x)->AgeLimit)),0,y)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getSeverity(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getSeverity(x)\
                 _F_get8bit(x,Severity,0,Severity)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setSeverity(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setSeverity(x,y)\
                 _F_set8bit(x,Severity,0,Severity,y)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getFailureCode(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getFailureCode(x)\
                 _F_get8bit(x,Severity,1,FailureCode)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setFailureCode(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setFailureCode(x,y)\
                 _F_get8bit(x,Severity,1,FailureCode,y)
 /*
- * #define I2O_FAILURE_REPLY_MESSAGE_FRAME_getFailingHostUnitID(x)\
+ * #define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getFailingHostUnitID(x)\
  *               _F_get16bit(x,reserved,1,FailingHostUnitID)
- * #define I2O_FAILURE_REPLY_MESSAGE_FRAME_setFailingHostUnitID(x,y)\
+ * #define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setFailingHostUnitID(x,y)\
  *               _F_set16bit(x,reserved,1,FailingHostUnitID,y)
  */
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_getPreservedMFA(x)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_getPreservedMFA(x)\
                 getLU4((&((x)->PreservedMFA)),0)
-#define I2O_FAILURE_REPLY_MESSAGE_FRAME_setPreservedMFA(x,y)\
+#define	I2O_FAILURE_REPLY_MESSAGE_FRAME_setPreservedMFA(x,y)\
                 setLU4((&((x)->PreservedMFA)),0,y)
 
 
@@ -1188,94 +1188,94 @@ typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
 /*
  *  I2O_EXEC_STATUS_GET_REPLY
  */
-#define I2O_EXEC_STATUS_GET_REPLY_getOrganizationID(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getOrganizationID(x)\
                 getLU2((&(x)->OrganizationID),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setOrganizationID(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setOrganizationID(x,y)\
                 setLU2((&(x)->OrganizationID),0,y)
-/* #define I2O_EXEC_STATUS_GET_REPLY_getreserved; */
-#define I2O_EXEC_STATUS_GET_REPLY_getIOP_ID(x)\
+/* #define	I2O_EXEC_STATUS_GET_REPLY_getreserved; */
+#define	I2O_EXEC_STATUS_GET_REPLY_getIOP_ID(x)\
                 _F_get12bit(x,IOP_ID,0,IOP_ID)
-#define I2O_EXEC_STATUS_GET_REPLY_setIOP_ID(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setIOP_ID(x,y)\
                 _F_set12bit(x,IOP_ID,0,IOP_ID,y)
-/* #define I2O_EXEC_STATUS_GET_REPLY_getreserved1(x) */
-#define I2O_EXEC_STATUS_GET_REPLY_getHostUnitID(x)\
+/* #define	I2O_EXEC_STATUS_GET_REPLY_getreserved1(x) */
+#define	I2O_EXEC_STATUS_GET_REPLY_getHostUnitID(x)\
                 _F_get16bit(x,IOP_ID,2,HostUnitID)
-#define I2O_EXEC_STATUS_GET_REPLY_setHostUnitID(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setHostUnitID(x,y)\
                 _F_set16bit(x,IOP_ID,2,HostUnitID,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getSegmentNumber(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getSegmentNumber(x)\
                 _F_get12bit(x,SegmentNumber,0,SegmentNumber)
-#define I2O_EXEC_STATUS_GET_REPLY_setSegmentNumber(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setSegmentNumber(x,y)\
                 _F_set12bit(x,SegmentNumber,0,SegmentNumber,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getI2oVersion(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getI2oVersion(x)\
                 _F_get4bit4(x,SegmentNumber,1,I2oVersion)
-#define I2O_EXEC_STATUS_GET_REPLY_setI2oVersion(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setI2oVersion(x,y)\
                 _F_set4bit4(x,SegmentNumber,1,I2oVersion,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getIopState(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getIopState(x)\
                 _F_get8bit(x,SegmentNumver,2,IopState)
-#define I2O_EXEC_STATUS_GET_REPLY_setIopState(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setIopState(x,y)\
                 _F_set8bit(x,SegmentNumver,2,IopState,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getMessengerType(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getMessengerType(x)\
                 _F_get8bit(x,SegmentNumber,3,MessengerType)
-#define I2O_EXEC_STATUS_GET_REPLY_setMessengerType(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setMessengerType(x,y)\
                 _F_get8bit(x,SegmentNumber,3,MessengerType,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getInboundMFrameSize(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getInboundMFrameSize(x)\
                 getLU2((&(x)->InboundMFrameSize),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setInboundMFrameSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setInboundMFrameSize(x,y)\
                 setLU2((&(x)->InboundMFrameSize),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getInitCode(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getInitCode(x)\
                 getU1((&(x)->InitCode),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setInitCode(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setInitCode(x,y)\
                 setU1((&(x)->InitCode),0,y)
-/* #define I2O_EXEC_STATUS_GET_REPLY_getreserved2(x) */
-#define I2O_EXEC_STATUS_GET_REPLY_getMaxInboundMFrames(x)\
+/* #define	I2O_EXEC_STATUS_GET_REPLY_getreserved2(x) */
+#define	I2O_EXEC_STATUS_GET_REPLY_getMaxInboundMFrames(x)\
                 getLU4((&(x)->MaxInboundMFrames),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setMaxInboundMFrames(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setMaxInboundMFrames(x,y)\
                 setLU4((&(x)->MaxInboundMFrames),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getCurrentInboundMFrames(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getCurrentInboundMFrames(x)\
                 getLU4((&(x)->CurrentInboundMFrames),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setCurrentInboundMFrames(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setCurrentInboundMFrames(x,y)\
                 setLU4((&(x)->CurrentInboundMFrames),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getMaxOutboundMFrames(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getMaxOutboundMFrames(x)\
                 getLU4((&(x)->MaxOutboundMFrames),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setMaxOutboundMFrames(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setMaxOutboundMFrames(x,y)\
                 setLU4((&(x)->MaxOutboundMFrames),0,y)
-/* #define I2O_EXEC_STATUS_GET_REPLY_getProductIDString(x) */
-#define I2O_EXEC_STATUS_GET_REPLY_getExpectedLCTSize(x)\
+/* #define	I2O_EXEC_STATUS_GET_REPLY_getProductIDString(x) */
+#define	I2O_EXEC_STATUS_GET_REPLY_getExpectedLCTSize(x)\
                 getLU4((&(x)->ExpectedLCTSize),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setExpectedLCTSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setExpectedLCTSize(x,y)\
                 setLU4((&(x)->ExpectedLCTSize),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getIopCapabilities(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getIopCapabilities(x)\
                 getLU4((&(x)->IopCapabilities),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setIopCapabilities(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setIopCapabilities(x,y)\
                 setLU4((&(x)->IopCapabilities),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getDesiredPrivateMemSize(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getDesiredPrivateMemSize(x)\
                 getLU4((&(x)->DesiredPrivateMemSize),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setDesiredPrivateMemSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setDesiredPrivateMemSize(x,y)\
                 setLU4((&(x)->DesiredPrivateMemSize),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateMemSize(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateMemSize(x)\
                 getLU4((&(x)->CurrentPrivateMemSize),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateMemSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateMemSize(x,y)\
                 setLU4((&(x)->CurrentPrivateMemSize),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateMemBase(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateMemBase(x)\
                 getLU4((&(x)->CurrentPrivateMemBase),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateMemBase(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateMemBase(x,y)\
                 setLU4((&(x)->CurrentPrivateMemBase),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getDesiredPrivateIOSize(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getDesiredPrivateIOSize(x)\
                 getLU4((&(x)->DesiredPrivateIOSize),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setDesiredPrivateIOSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setDesiredPrivateIOSize(x,y)\
                 setLU4((&(x)->DesiredPrivateIOSize),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateIOSize(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateIOSize(x)\
                 getLU4((&(x)->CurrentPrivateIOSize),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateIOSize(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateIOSize(x,y)\
                 setLU4((&(x)->CurrentPrivateIOSize),0,y)
-#define I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateIOBase(x)\
+#define	I2O_EXEC_STATUS_GET_REPLY_getCurrentPrivateIOBase(x)\
                 getLU4((&(x)->CurrentPrivateIOBase),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateIOBase(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setCurrentPrivateIOBase(x,y)\
                 setLU4((&(x)->CurrentPrivateIOBase),0,y)
-/* #define I2O_EXEC_STATUS_GET_REPLY_getreserved3(x) */
-#define I2O_EXEC_STATUS_GET_REPLY_getSyncByte(x)\
+/* #define	I2O_EXEC_STATUS_GET_REPLY_getreserved3(x) */
+#define	I2O_EXEC_STATUS_GET_REPLY_getSyncByte(x)\
                 getU1((&(x)->SyncByte),0)
-#define I2O_EXEC_STATUS_GET_REPLY_setSyncByte(x,y)\
+#define	I2O_EXEC_STATUS_GET_REPLY_setSyncByte(x,y)\
                 setU1((&(x)->SyncByte),0,y)
 
 
@@ -1283,15 +1283,15 @@ typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
 /*
  *  I2O_HBA_BUS_QUIESCE_MESSAGE
  */
-#define I2O_HBA_BUS_QUIESCE_MESSAGE_getStdMessageFramePtr(x)\
+#define	I2O_HBA_BUS_QUIESCE_MESSAGE_getStdMessageFramePtr(x)\
                 (&((x)->StdMessageFrame))
-#define I2O_HBA_BUS_QUIESCE_MESSAGE_getTransactionContext(x)\
+#define	I2O_HBA_BUS_QUIESCE_MESSAGE_getTransactionContext(x)\
                 getBU4((&((x)->TransactionContext)),0)
-#define I2O_HBA_BUS_QUIESCE_MESSAGE_setTransactionContext(x,y)\
+#define	I2O_HBA_BUS_QUIESCE_MESSAGE_setTransactionContext(x,y)\
                 setBU4((&((x)->TransactionContext)),0,y)
-#define I2O_HBA_BUS_QUIESCE_MESSAGE_getFlags(x)\
+#define	I2O_HBA_BUS_QUIESCE_MESSAGE_getFlags(x)\
                 getLU4((&(x)->Flags),0)
-#define I2O_HBA_BUS_QUIESCE_MESSAGE_setFlags(x,y)\
+#define	I2O_HBA_BUS_QUIESCE_MESSAGE_setFlags(x,y)\
                 setLU4((&(x)->Flags),0,y)
 
 
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 9db07cb..e95bd52 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -8,9 +8,9 @@
  ****************************************************************/
 
 #if !defined(I2O_DPT_HDR)
-#define I2O_DPT_HDR
+#define	I2O_DPT_HDR
 
-#define DPT_ORGANIZATION_ID 0x1B        /* For Private Messages */
+#define	DPT_ORGANIZATION_ID 0x1B        /* For Private Messages */
 
 /*
  *      PrivateMessageFrame.StdMessageFrame.Function = I2O_PRIVATE_MESSAGE
@@ -62,10 +62,10 @@ typedef struct _PRIVATE_SCSI_SCB_EXECUTE_MESSAGE {
  * Flash messages should be targeted to the Executive TID 0x000
  */
 
-#define PRIVATE_FLASH_REGION_SIZE       0x0100
-#define PRIVATE_FLASH_REGION_READ       0x0101
-#define PRIVATE_FLASH_REGION_WRITE      0x0102
-#define PRIVATE_FLASH_REGION_CRC        0x0103
+#define	PRIVATE_FLASH_REGION_SIZE       0x0100
+#define	PRIVATE_FLASH_REGION_READ       0x0101
+#define	PRIVATE_FLASH_REGION_WRITE      0x0102
+#define	PRIVATE_FLASH_REGION_CRC        0x0103
 
 typedef struct _PRIVATE_FLASH_REGION_MESSAGE {
     I2O_PRIVATE_MESSAGE_FRAME PrivateMessageFrame;
@@ -77,10 +77,10 @@ typedef struct _PRIVATE_FLASH_REGION_MESSAGE {
 
 /* DPT Driver Printf message */
 
-#define PRIVATE_DRIVER_PRINTF 0x0200
+#define	PRIVATE_DRIVER_PRINTF 0x0200
 
 /* FwPrintFlags */
-#define FW_FIRMWARE_FLAGS_NO_HEADER_B   0x00000001 /* Remove date header */
+#define	FW_FIRMWARE_FLAGS_NO_HEADER_B   0x00000001 /* Remove date header */
 
 typedef struct _PRIVATE_DRIVER_PRINTF_MESSAGE {
 
@@ -95,7 +95,7 @@ typedef struct _PRIVATE_DRIVER_PRINTF_MESSAGE {
 
 /* DPT Enable Diagnostics message 0x0201 */
 
-#define PRIVATE_DIAG_ENABLE 0x0201
+#define	PRIVATE_DIAG_ENABLE 0x0201
 
 typedef struct _PRIVATE_DIAG_ENABLE_MESSAGE {
         I2O_PRIVATE_MESSAGE_FRAME       PrivateMessageFrame;
@@ -103,8 +103,8 @@ typedef struct _PRIVATE_DIAG_ENABLE_MESSAGE {
 
 /* DPT Driver Get/Put message */
 
-#define PRIVATE_DRIVER_GET      0x300
-#define PRIVATE_DRIVER_PUT      0x301
+#define	PRIVATE_DRIVER_GET      0x300
+#define	PRIVATE_DRIVER_PUT      0x301
 
 typedef struct _PRIVATE_DRIVER_GETPUT_MESSAGE
 {
@@ -122,52 +122,52 @@ typedef struct _PRIVATE_DRIVER_GETPUT_MESSAGE
 
 /* DPT Configuration and Operating Structures and Defines */
 
-#define     I2O_DPT_DEVICE_INFO_GROUP_NO               0x8000
+#define	    I2O_DPT_DEVICE_INFO_GROUP_NO               0x8000
 
 /* - 8000h - DPT Device Information Parameters Group defines */
 
 /* Device Type */
 
-#define I2O_DPT_DEVICE_TYPE_DIRECT        I2O_SCSI_DEVICE_TYPE_DIRECT
-#define I2O_DPT_DEVICE_TYPE_SEQUENTIAL    I2O_SCSI_DEVICE_TYPE_SEQUENTIAL
-#define I2O_DPT_DEVICE_TYPE_PRINTER       I2O_SCSI_DEVICE_TYPE_PRINTER
-#define I2O_DPT_DEVICE_TYPE_PROCESSOR     I2O_SCSI_DEVICE_TYPE_PROCESSOR
-#define I2O_DPT_DEVICE_TYPE_WORM          I2O_SCSI_DEVICE_TYPE_WORM
-#define I2O_DPT_DEVICE_TYPE_CDROM         I2O_SCSI_DEVICE_TYPE_CDROM
-#define I2O_DPT_DEVICE_TYPE_SCANNER       I2O_SCSI_DEVICE_TYPE_SCANNER
-#define I2O_DPT_DEVICE_TYPE_OPTICAL       I2O_SCSI_DEVICE_TYPE_OPTICAL
-#define I2O_DPT_DEVICE_TYPE_MEDIA_CHANGER I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER
-#define I2O_DPT_DEVICE_TYPE_COMM          I2O_SCSI_DEVICE_TYPE_COMM
-#define I2O_DPT_DEVICE_GRAPHICS_1         I2O_SCSI_DEVICE_GRAPHICS_1
-#define I2O_DPT_DEVICE_GRAPHICS_2         I2O_SCSI_DEVICE_GRAPHICS_2
-#define I2O_DPT_DEVICE_TYPE_ARRAY_CONT    I2O_SCSI_DEVICE_TYPE_ARRAY_CONT
-#define I2O_DPT_DEVICE_TYPE_UNKNOWN       I2O_SCSI_DEVICE_TYPE_UNKNOWN
+#define	I2O_DPT_DEVICE_TYPE_DIRECT        I2O_SCSI_DEVICE_TYPE_DIRECT
+#define	I2O_DPT_DEVICE_TYPE_SEQUENTIAL    I2O_SCSI_DEVICE_TYPE_SEQUENTIAL
+#define	I2O_DPT_DEVICE_TYPE_PRINTER       I2O_SCSI_DEVICE_TYPE_PRINTER
+#define	I2O_DPT_DEVICE_TYPE_PROCESSOR     I2O_SCSI_DEVICE_TYPE_PROCESSOR
+#define	I2O_DPT_DEVICE_TYPE_WORM          I2O_SCSI_DEVICE_TYPE_WORM
+#define	I2O_DPT_DEVICE_TYPE_CDROM         I2O_SCSI_DEVICE_TYPE_CDROM
+#define	I2O_DPT_DEVICE_TYPE_SCANNER       I2O_SCSI_DEVICE_TYPE_SCANNER
+#define	I2O_DPT_DEVICE_TYPE_OPTICAL       I2O_SCSI_DEVICE_TYPE_OPTICAL
+#define	I2O_DPT_DEVICE_TYPE_MEDIA_CHANGER I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER
+#define	I2O_DPT_DEVICE_TYPE_COMM          I2O_SCSI_DEVICE_TYPE_COMM
+#define	I2O_DPT_DEVICE_GRAPHICS_1         I2O_SCSI_DEVICE_GRAPHICS_1
+#define	I2O_DPT_DEVICE_GRAPHICS_2         I2O_SCSI_DEVICE_GRAPHICS_2
+#define	I2O_DPT_DEVICE_TYPE_ARRAY_CONT    I2O_SCSI_DEVICE_TYPE_ARRAY_CONT
+#define	I2O_DPT_DEVICE_TYPE_UNKNOWN       I2O_SCSI_DEVICE_TYPE_UNKNOWN
 
 /* Flags */
 
-#define I2O_DPT_PERIPHERAL_TYPE_FLAG      I2O_SCSI_PERIPHERAL_TYPE_FLAG
-#define I2O_DPT_PERIPHERAL_TYPE_PARALLEL  I2O_SCSI_PERIPHERAL_TYPE_PARALLEL
-#define I2O_DPT_PERIPHERAL_TYPE_SERIAL    I2O_SCSI_PERIPHERAL_TYPE_SERIAL
+#define	I2O_DPT_PERIPHERAL_TYPE_FLAG      I2O_SCSI_PERIPHERAL_TYPE_FLAG
+#define	I2O_DPT_PERIPHERAL_TYPE_PARALLEL  I2O_SCSI_PERIPHERAL_TYPE_PARALLEL
+#define	I2O_DPT_PERIPHERAL_TYPE_SERIAL    I2O_SCSI_PERIPHERAL_TYPE_SERIAL
 
-#define I2O_DPT_RESERVED_FLAG             I2O_SCSI_RESERVED_FLAG
+#define	I2O_DPT_RESERVED_FLAG             I2O_SCSI_RESERVED_FLAG
 
-#define I2O_DPT_DISCONNECT_FLAG           I2O_SCSI_DISCONNECT_FLAG
-#define I2O_DPT_DISABLE_DISCONNECT        I2O_SCSI_DISABLE_DISCONNECT
-#define I2O_DPT_ENABLE_DISCONNECT         I2O_SCSI_ENABLE_DISCONNECT
+#define	I2O_DPT_DISCONNECT_FLAG           I2O_SCSI_DISCONNECT_FLAG
+#define	I2O_DPT_DISABLE_DISCONNECT        I2O_SCSI_DISABLE_DISCONNECT
+#define	I2O_DPT_ENABLE_DISCONNECT         I2O_SCSI_ENABLE_DISCONNECT
 
-#define I2O_DPT_MODE_MASK                 I2O_SCSI_MODE_MASK
-#define I2O_DPT_MODE_SET_DATA             I2O_SCSI_MODE_SET_DATA
-#define I2O_DPT_MODE_SET_DEFAULT          I2O_SCSI_MODE_SET_DEFAULT
-#define I2O_DPT_MODE_SET_SAFEST           I2O_SCSI_MODE_SET_SAFEST
+#define	I2O_DPT_MODE_MASK                 I2O_SCSI_MODE_MASK
+#define	I2O_DPT_MODE_SET_DATA             I2O_SCSI_MODE_SET_DATA
+#define	I2O_DPT_MODE_SET_DEFAULT          I2O_SCSI_MODE_SET_DEFAULT
+#define	I2O_DPT_MODE_SET_SAFEST           I2O_SCSI_MODE_SET_SAFEST
 
-#define I2O_DPT_DATA_WIDTH_MASK           I2O_SCSI_DATA_WIDTH_MASK
-#define I2O_DPT_DATA_WIDTH_8              I2O_SCSI_DATA_WIDTH_8
-#define I2O_DPT_DATA_WIDTH_16             I2O_SCSI_DATA_WIDTH_16
-#define I2O_DPT_DATA_WIDTH_32             I2O_SCSI_DATA_WIDTH_32
+#define	I2O_DPT_DATA_WIDTH_MASK           I2O_SCSI_DATA_WIDTH_MASK
+#define	I2O_DPT_DATA_WIDTH_8              I2O_SCSI_DATA_WIDTH_8
+#define	I2O_DPT_DATA_WIDTH_16             I2O_SCSI_DATA_WIDTH_16
+#define	I2O_DPT_DATA_WIDTH_32             I2O_SCSI_DATA_WIDTH_32
 
-#define I2O_DPT_SYNC_NEGOTIATION_FLAG     I2O_SCSI_SYNC_NEGOTIATION_FLAG
-#define I2O_DPT_DISABLE_SYNC_NEGOTIATION  I2O_SCSI_DISABLE_SYNC_NEGOTIATION
-#define I2O_DPT_ENABLE_SYNC_NEGOTIATION   I2O_SCSI_ENABLE_SYNC_NEGOTIATION
+#define	I2O_DPT_SYNC_NEGOTIATION_FLAG     I2O_SCSI_SYNC_NEGOTIATION_FLAG
+#define	I2O_DPT_DISABLE_SYNC_NEGOTIATION  I2O_SCSI_DISABLE_SYNC_NEGOTIATION
+#define	I2O_DPT_ENABLE_SYNC_NEGOTIATION   I2O_SCSI_ENABLE_SYNC_NEGOTIATION
 
 /* DPT Device Group 8000h - Device Information Parameter Group */
 
@@ -180,7 +180,7 @@ typedef struct _I2O_DPT_DEVICE_INFO_SCALAR {
 
 } I2O_DPT_DEVICE_INFO_SCALAR, *PI2O_DPT_DEVICE_INFO_SCALAR;
 
-#define I2O_DPT_EXEC_IOP_BUFFERS_GROUP_NO    0x8000
+#define	I2O_DPT_EXEC_IOP_BUFFERS_GROUP_NO    0x8000
 
 /* DPT Exec Iop Buffers Group 8000h */
 
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index 331de69..7255d14 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -88,9 +88,9 @@
  **********************************************************************/
 
 #if !defined(I2O_EXECUTIVE_HDR)
-#define I2O_EXECUTIVE_HDR
+#define	I2O_EXECUTIVE_HDR
 
-#define I2OEXEC_REV 1_5_4  /* I2OExec header file revision string */
+#define	I2OEXEC_REV 1_5_4  /* I2OExec header file revision string */
 
 #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
 # if (!defined(KERN_VERSION))
@@ -134,111 +134,111 @@ PRAGMA_PACK_PUSH
 
 /*  I2O Executive Function Codes.  */
 
-#define    I2O_EXEC_ADAPTER_ASSIGN                     0xB3
-#define    I2O_EXEC_ADAPTER_READ                       0xB2
-#define    I2O_EXEC_ADAPTER_RELEASE                    0xB5
-#define    I2O_EXEC_BIOS_INFO_SET                      0xA5
-#define    I2O_EXEC_BOOT_DEVICE_SET                    0xA7
-#define    I2O_EXEC_CONFIG_VALIDATE                    0xBB
-#define    I2O_EXEC_CONN_SETUP                         0xCA
-#define    I2O_EXEC_DDM_DESTROY                        0xB1
-#define    I2O_EXEC_DDM_ENABLE                         0xD5
-#define    I2O_EXEC_DDM_QUIESCE                        0xC7
-#define    I2O_EXEC_DDM_RESET                          0xD9
-#define    I2O_EXEC_DDM_SUSPEND                        0xAF
-#define    I2O_EXEC_DEVICE_ASSIGN                      0xB7
-#define    I2O_EXEC_DEVICE_RELEASE                     0xB9
-#define    I2O_EXEC_HRT_GET                            0xA8
-#define    I2O_EXEC_IOP_CLEAR                          0xBE
-#define    I2O_EXEC_IOP_CONNECT                        0xC9
-#define    I2O_EXEC_IOP_RESET                          0xBD
-#define    I2O_EXEC_LCT_NOTIFY                         0xA2
-#define    I2O_EXEC_OUTBOUND_INIT                      0xA1
-#define    I2O_EXEC_PATH_ENABLE                        0xD3
-#define    I2O_EXEC_PATH_QUIESCE                       0xC5
-#define    I2O_EXEC_PATH_RESET                         0xD7
-#define    I2O_EXEC_STATIC_MF_CREATE                   0xDD
-#define    I2O_EXEC_STATIC_MF_RELEASE                  0xDF
-#define    I2O_EXEC_STATUS_GET                         0xA0
-#define    I2O_EXEC_SW_DOWNLOAD                        0xA9
-#define    I2O_EXEC_SW_UPLOAD                          0xAB
-#define    I2O_EXEC_SW_REMOVE                          0xAD
-#define    I2O_EXEC_SYS_ENABLE                         0xD1
-#define    I2O_EXEC_SYS_MODIFY                         0xC1
-#define    I2O_EXEC_SYS_QUIESCE                        0xC3
-#define    I2O_EXEC_SYS_TAB_SET                        0xA3
+#define	   I2O_EXEC_ADAPTER_ASSIGN                     0xB3
+#define	   I2O_EXEC_ADAPTER_READ                       0xB2
+#define	   I2O_EXEC_ADAPTER_RELEASE                    0xB5
+#define	   I2O_EXEC_BIOS_INFO_SET                      0xA5
+#define	   I2O_EXEC_BOOT_DEVICE_SET                    0xA7
+#define	   I2O_EXEC_CONFIG_VALIDATE                    0xBB
+#define	   I2O_EXEC_CONN_SETUP                         0xCA
+#define	   I2O_EXEC_DDM_DESTROY                        0xB1
+#define	   I2O_EXEC_DDM_ENABLE                         0xD5
+#define	   I2O_EXEC_DDM_QUIESCE                        0xC7
+#define	   I2O_EXEC_DDM_RESET                          0xD9
+#define	   I2O_EXEC_DDM_SUSPEND                        0xAF
+#define	   I2O_EXEC_DEVICE_ASSIGN                      0xB7
+#define	   I2O_EXEC_DEVICE_RELEASE                     0xB9
+#define	   I2O_EXEC_HRT_GET                            0xA8
+#define	   I2O_EXEC_IOP_CLEAR                          0xBE
+#define	   I2O_EXEC_IOP_CONNECT                        0xC9
+#define	   I2O_EXEC_IOP_RESET                          0xBD
+#define	   I2O_EXEC_LCT_NOTIFY                         0xA2
+#define	   I2O_EXEC_OUTBOUND_INIT                      0xA1
+#define	   I2O_EXEC_PATH_ENABLE                        0xD3
+#define	   I2O_EXEC_PATH_QUIESCE                       0xC5
+#define	   I2O_EXEC_PATH_RESET                         0xD7
+#define	   I2O_EXEC_STATIC_MF_CREATE                   0xDD
+#define	   I2O_EXEC_STATIC_MF_RELEASE                  0xDF
+#define	   I2O_EXEC_STATUS_GET                         0xA0
+#define	   I2O_EXEC_SW_DOWNLOAD                        0xA9
+#define	   I2O_EXEC_SW_UPLOAD                          0xAB
+#define	   I2O_EXEC_SW_REMOVE                          0xAD
+#define	   I2O_EXEC_SYS_ENABLE                         0xD1
+#define	   I2O_EXEC_SYS_MODIFY                         0xC1
+#define	   I2O_EXEC_SYS_QUIESCE                        0xC3
+#define	   I2O_EXEC_SYS_TAB_SET                        0xA3
 
 
 /* I2O Get Status State values */
 
-#define    I2O_IOP_STATE_INITIALIZING                  0x01
-#define    I2O_IOP_STATE_RESET                         0x02
-#define    I2O_IOP_STATE_HOLD                          0x04
-#define    I2O_IOP_STATE_READY                         0x05
-#define    I2O_IOP_STATE_OPERATIONAL                   0x08
-#define    I2O_IOP_STATE_FAILED                        0x10
-#define    I2O_IOP_STATE_FAULTED                       0x11
+#define	   I2O_IOP_STATE_INITIALIZING                  0x01
+#define	   I2O_IOP_STATE_RESET                         0x02
+#define	   I2O_IOP_STATE_HOLD                          0x04
+#define	   I2O_IOP_STATE_READY                         0x05
+#define	   I2O_IOP_STATE_OPERATIONAL                   0x08
+#define	   I2O_IOP_STATE_FAILED                        0x10
+#define	   I2O_IOP_STATE_FAULTED                       0x11
 
 
 /* Event Indicator Assignments for the Executive Class. */
 
-#define    I2O_EVENT_IND_RESOURCE_LIMIT                0x00000001
-#define    I2O_EVENT_IND_CONNECTION_FAIL               0x00000002
-#define    I2O_EVENT_IND_ADAPTER_FAULT                 0x00000004
-#define    I2O_EVENT_IND_POWER_FAIL                    0x00000008
-#define    I2O_EVENT_IND_RESET_PENDING                 0x00000010
-#define    I2O_EVENT_IND_RESET_IMMINENT                0x00000020
-#define    I2O_EVENT_IND_HARDWARE_FAIL                 0x00000040
-#define    I2O_EVENT_IND_XCT_CHANGE                    0x00000080
-#define    I2O_EVENT_IND_NEW_LCT_ENTRY                 0x00000100
-#define    I2O_EVENT_IND_MODIFIED_LCT                  0x00000200
-#define    I2O_EVENT_IND_DDM_AVAILABILITY              0x00000400
+#define	   I2O_EVENT_IND_RESOURCE_LIMIT                0x00000001
+#define	   I2O_EVENT_IND_CONNECTION_FAIL               0x00000002
+#define	   I2O_EVENT_IND_ADAPTER_FAULT                 0x00000004
+#define	   I2O_EVENT_IND_POWER_FAIL                    0x00000008
+#define	   I2O_EVENT_IND_RESET_PENDING                 0x00000010
+#define	   I2O_EVENT_IND_RESET_IMMINENT                0x00000020
+#define	   I2O_EVENT_IND_HARDWARE_FAIL                 0x00000040
+#define	   I2O_EVENT_IND_XCT_CHANGE                    0x00000080
+#define	   I2O_EVENT_IND_NEW_LCT_ENTRY                 0x00000100
+#define	   I2O_EVENT_IND_MODIFIED_LCT                  0x00000200
+#define	   I2O_EVENT_IND_DDM_AVAILABILITY              0x00000400
 
 /* Resource Limit Event Data */
 
-#define    I2O_EVENT_RESOURCE_LIMIT_LOW_MEMORY         0x00000001
-#define    I2O_EVENT_RESOURCE_LIMIT_INBOUND_POOL_LOW   0x00000002
-#define    I2O_EVENT_RESOURCE_LIMIT_OUTBOUND_POOL_LOW  0x00000004
+#define	   I2O_EVENT_RESOURCE_LIMIT_LOW_MEMORY         0x00000001
+#define	   I2O_EVENT_RESOURCE_LIMIT_INBOUND_POOL_LOW   0x00000002
+#define	   I2O_EVENT_RESOURCE_LIMIT_OUTBOUND_POOL_LOW  0x00000004
 
 /* Connection Fail Event Data */
 
-#define    I2O_EVENT_CONNECTION_FAIL_REPOND_NORMAL     0x00000000
-#define    I2O_EVENT_CONNECTION_FAIL_NOT_REPONDING     0x00000001
-#define    I2O_EVENT_CONNECTION_FAIL_NO_AVAILABLE_FRAMES 0x00000002
+#define	   I2O_EVENT_CONNECTION_FAIL_REPOND_NORMAL     0x00000000
+#define	   I2O_EVENT_CONNECTION_FAIL_NOT_REPONDING     0x00000001
+#define	   I2O_EVENT_CONNECTION_FAIL_NO_AVAILABLE_FRAMES 0x00000002
 
 /* Reset Pending Event Data */
 
-#define    I2O_EVENT_RESET_PENDING_POWER_LOSS          0x00000001
-#define    I2O_EVENT_RESET_PENDING_CODE_VIOLATION      0x00000002
+#define	   I2O_EVENT_RESET_PENDING_POWER_LOSS          0x00000001
+#define	   I2O_EVENT_RESET_PENDING_CODE_VIOLATION      0x00000002
 
 /* Reset Imminent Event Data */
 
-#define    I2O_EVENT_RESET_IMMINENT_UNKNOWN_CAUSE      0x00000000
-#define    I2O_EVENT_RESET_IMMINENT_POWER_LOSS         0x00000001
-#define    I2O_EVENT_RESET_IMMINENT_CODE_VIOLATION     0x00000002
-#define    I2O_EVENT_RESET_IMMINENT_PARITY_ERROR       0x00000003
-#define    I2O_EVENT_RESET_IMMINENT_CODE_EXCEPTION     0x00000004
-#define    I2O_EVENT_RESET_IMMINENT_WATCHDOG_TIMEOUT   0x00000005
+#define	   I2O_EVENT_RESET_IMMINENT_UNKNOWN_CAUSE      0x00000000
+#define	   I2O_EVENT_RESET_IMMINENT_POWER_LOSS         0x00000001
+#define	   I2O_EVENT_RESET_IMMINENT_CODE_VIOLATION     0x00000002
+#define	   I2O_EVENT_RESET_IMMINENT_PARITY_ERROR       0x00000003
+#define	   I2O_EVENT_RESET_IMMINENT_CODE_EXCEPTION     0x00000004
+#define	   I2O_EVENT_RESET_IMMINENT_WATCHDOG_TIMEOUT   0x00000005
 
 /* Hardware Fail Event Data */
 
-#define    I2O_EVENT_HARDWARE_FAIL_UNKNOWN_CAUSE       0x00000000
-#define    I2O_EVENT_HARDWARE_FAIL_CPU_FAILURE         0x00000001
-#define    I2O_EVENT_HARDWARE_FAIL_MEMORY_FAULT        0x00000002
-#define    I2O_EVENT_HARDWARE_FAIL_DMA_FAILURE         0x00000003
-#define    I2O_EVENT_HARDWARE_FAIL_IO_BUS_FAILURE      0x00000004
+#define	   I2O_EVENT_HARDWARE_FAIL_UNKNOWN_CAUSE       0x00000000
+#define	   I2O_EVENT_HARDWARE_FAIL_CPU_FAILURE         0x00000001
+#define	   I2O_EVENT_HARDWARE_FAIL_MEMORY_FAULT        0x00000002
+#define	   I2O_EVENT_HARDWARE_FAIL_DMA_FAILURE         0x00000003
+#define	   I2O_EVENT_HARDWARE_FAIL_IO_BUS_FAILURE      0x00000004
 
 /* DDM Availability Event Data */
 
-#define    I2O_EVENT_DDM_AVAILIBILITY_RESPOND_NORMAL   0x00000000
-#define    I2O_EVENT_DDM_AVAILIBILITY_CONGESTED        0x00000001
-#define    I2O_EVENT_DDM_AVAILIBILITY_NOT_RESPONDING   0x00000002
-#define    I2O_EVENT_DDM_AVAILIBILITY_PROTECTION_VIOLATION 0x00000003
-#define    I2O_EVENT_DDM_AVAILIBILITY_CODE_VIOLATION   0x00000004
+#define	   I2O_EVENT_DDM_AVAILIBILITY_RESPOND_NORMAL   0x00000000
+#define	   I2O_EVENT_DDM_AVAILIBILITY_CONGESTED        0x00000001
+#define	   I2O_EVENT_DDM_AVAILIBILITY_NOT_RESPONDING   0x00000002
+#define	   I2O_EVENT_DDM_AVAILIBILITY_PROTECTION_VIOLATION 0x00000003
+#define	   I2O_EVENT_DDM_AVAILIBILITY_CODE_VIOLATION   0x00000004
 
 /****************************************************************************/
 
-#define    I2O_OPERATION_FLAG_ASSIGN_PERMANENT         0x01
+#define	   I2O_OPERATION_FLAG_ASSIGN_PERMANENT         0x01
 
 /* ExecAdapterAssign Function Message Frame structure. */
 
@@ -258,9 +258,9 @@ typedef struct _I2O_EXEC_ADAPTER_ASSIGN_MESSAGE {
 
 /****************************************************************************/
 
-#define    I2O_REQUEST_FLAG_CONFIG_REGISTER            0x00000000
-#define    I2O_REQUEST_FLAG_IO_REGISTER                0x00000001
-#define    I2O_REQUEST_FLAG_ADAPTER_MEMORY             0x00000002
+#define	   I2O_REQUEST_FLAG_CONFIG_REGISTER            0x00000000
+#define	   I2O_REQUEST_FLAG_IO_REGISTER                0x00000001
+#define	   I2O_REQUEST_FLAG_ADAPTER_MEMORY             0x00000002
 
 /* ExecAdapterRead Function Message Frame structure. */
 
@@ -277,7 +277,7 @@ typedef struct _I2O_EXEC_ADAPTER_READ_MESSAGE {
 
 /****************************************************************************/
 
-#define    I2O_OPERATION_FLAG_RELEASE_PERMANENT        0x01
+#define	   I2O_OPERATION_FLAG_RELEASE_PERMANENT        0x01
 
 /* ExecAdapterRelease Function Message Frame structure. */
 
@@ -344,7 +344,7 @@ typedef struct _I2O_ALIAS_CONNECT_SETUP {
 #endif
 } I2O_ALIAS_CONNECT_SETUP, *PI2O_ALIAS_CONNECT_SETUP;
 
-#define    I2O_OPERATION_FLAG_PEER_TO_PEER_BIDIRECTIONAL   0x01
+#define	   I2O_OPERATION_FLAG_PEER_TO_PEER_BIDIRECTIONAL   0x01
 
 /* ExecConnSetup Object  */
 
@@ -473,7 +473,7 @@ typedef struct _I2O_EXEC_DDM_SUSPEND_MESSAGE {
 
 /****************************************************************************/
 
-#define    I2O_OPERATION_FLAG_ASSIGN_PERMANENT         0x01
+#define	   I2O_OPERATION_FLAG_ASSIGN_PERMANENT         0x01
 
 /* ExecDeviceAssign Function Message Frame structure. */
 
@@ -495,7 +495,7 @@ typedef struct _I2O_EXEC_DEVICE_ASSIGN_MESSAGE {
 
 /****************************************************************************/
 
-#define    I2O_OPERATION_FLAG_RELEASE_PERMANENT        0x01
+#define	   I2O_OPERATION_FLAG_RELEASE_PERMANENT        0x01
 
 /* ExecDeviceRelease Function Message Frame structure. */
 
@@ -579,12 +579,12 @@ typedef struct _I2O_EXEC_IOP_CONNECT_IOP_REPLY {
 /****************************************************************************/
 
 
-#define    I2O_EXEC_IOP_RESET_RESERVED_SZ              16
+#define	   I2O_EXEC_IOP_RESET_RESERVED_SZ              16
 
-#define    I2O_EXEC_IOP_RESET_IN_PROGRESS              0x01
-#define    I2O_EXEC_IOP_RESET_REJECTED                 0x02
+#define	   I2O_EXEC_IOP_RESET_IN_PROGRESS              0x01
+#define	   I2O_EXEC_IOP_RESET_REJECTED                 0x02
 
-#define    I2O_EXEC_IOP_RESET_STATUS_RESERVED_SZ       3
+#define	   I2O_EXEC_IOP_RESET_STATUS_RESERVED_SZ       3
 
 typedef struct _I2O_EXEC_IOP_RESET_STATUS {
 #   if (defined(_DPT_BIG_ENDIAN) || defined(sparc))
@@ -646,12 +646,12 @@ typedef struct _I2O_EXEC_OUTBOUND_INIT_MESSAGE {
 } I2O_EXEC_OUTBOUND_INIT_MESSAGE, *PI2O_EXEC_OUTBOUND_INIT_MESSAGE;
 
 
-#define    I2O_EXEC_OUTBOUND_INIT_IN_PROGRESS          0x01
-#define    I2O_EXEC_OUTBOUND_INIT_REJECTED             0x02
-#define    I2O_EXEC_OUTBOUND_INIT_FAILED               0x03
-#define    I2O_EXEC_OUTBOUND_INIT_COMPLETE             0x04
+#define	   I2O_EXEC_OUTBOUND_INIT_IN_PROGRESS          0x01
+#define	   I2O_EXEC_OUTBOUND_INIT_REJECTED             0x02
+#define	   I2O_EXEC_OUTBOUND_INIT_FAILED               0x03
+#define	   I2O_EXEC_OUTBOUND_INIT_COMPLETE             0x04
 
-#define    I2O_EXEC_OUTBOUND_INIT_RESERVED_SZ          3
+#define	   I2O_EXEC_OUTBOUND_INIT_RESERVED_SZ          3
 
 
 typedef struct _I2O_EXEC_OUTBOUND_INIT_STATUS {
@@ -708,7 +708,7 @@ typedef struct _I2O_EXEC_PATH_RESET_MESSAGE {
 
 /****************************************************************************/
 
-#define    I2O_EXEC_STATIC_MF_CREATE_RESERVED_SZ        3
+#define	   I2O_EXEC_STATIC_MF_CREATE_RESERVED_SZ        3
 
 /* ExecStaticMfCreate Message Frame  structure */
 
@@ -740,7 +740,7 @@ typedef struct _I2O_EXEC_STATIC_MF_RELEASE_MESSAGE {
 
 /****************************************************************************/
 
-#define    I2O_EXEC_STATUS_GET_RESERVED_SZ             16
+#define	   I2O_EXEC_STATUS_GET_RESERVED_SZ             16
 
 /* ExecStatusGet Function Message Frame structure. */
 
@@ -762,22 +762,22 @@ typedef struct _I2O_EXEC_STATUS_GET_MESSAGE {
 } I2O_EXEC_STATUS_GET_MESSAGE, *PI2O_EXEC_STATUS_GET_MESSAGE;
 
 
-#define    I2O_IOP_STATUS_PROD_ID_STR_SZ               24
-#define    I2O_EXEC_STATUS_GET_REPLY_RESERVED_SZ       6
+#define	   I2O_IOP_STATUS_PROD_ID_STR_SZ               24
+#define	   I2O_EXEC_STATUS_GET_REPLY_RESERVED_SZ       6
 
 /* ExecStatusGet reply Structure */
 
-#define    I2O_IOP_CAP_CONTEXT_32_ONLY                 0x00000000
-#define    I2O_IOP_CAP_CONTEXT_64_ONLY                 0x00000001
-#define    I2O_IOP_CAP_CONTEXT_32_64_NOT_CURRENTLY     0x00000002
-#define    I2O_IOP_CAP_CONTEXT_32_64_CURRENTLY         0x00000003
-#define    I2O_IOP_CAP_CURRENT_CONTEXT_NOT_CONFIG      0x00000000
-#define    I2O_IOP_CAP_CURRENT_CONTEXT_32_ONLY         0x00000004
-#define    I2O_IOP_CAP_CURRENT_CONTEXT_64_ONLY         0x00000008
-#define    I2O_IOP_CAP_CURRENT_CONTEXT_32_64           0x0000000C
-#define    I2O_IOP_CAP_INBOUND_PEER_SUPPORT            0x00000010
-#define    I2O_IOP_CAP_OUTBOUND_PEER_SUPPORT           0x00000020
-#define    I2O_IOP_CAP_PEER_TO_PEER_SUPPORT            0x00000040
+#define	   I2O_IOP_CAP_CONTEXT_32_ONLY                 0x00000000
+#define	   I2O_IOP_CAP_CONTEXT_64_ONLY                 0x00000001
+#define	   I2O_IOP_CAP_CONTEXT_32_64_NOT_CURRENTLY     0x00000002
+#define	   I2O_IOP_CAP_CONTEXT_32_64_CURRENTLY         0x00000003
+#define	   I2O_IOP_CAP_CURRENT_CONTEXT_NOT_CONFIG      0x00000000
+#define	   I2O_IOP_CAP_CURRENT_CONTEXT_32_ONLY         0x00000004
+#define	   I2O_IOP_CAP_CURRENT_CONTEXT_64_ONLY         0x00000008
+#define	   I2O_IOP_CAP_CURRENT_CONTEXT_32_64           0x0000000C
+#define	   I2O_IOP_CAP_INBOUND_PEER_SUPPORT            0x00000010
+#define	   I2O_IOP_CAP_OUTBOUND_PEER_SUPPORT           0x00000020
+#define	   I2O_IOP_CAP_PEER_TO_PEER_SUPPORT            0x00000040
 
 typedef struct _I2O_EXEC_STATUS_GET_REPLY {
    U16                         OrganizationID;
@@ -819,19 +819,19 @@ typedef struct _I2O_EXEC_STATUS_GET_REPLY {
 
 /****************************************************************************/
 
-#define    I2O_EXEC_SW_DOWNLOAD_FLAG_LOAD_MEMORY       0x00
-#define    I2O_EXEC_SW_DOWNLOAD_FLAG_PERMANENT_STORE   0x01
-#define    I2O_EXEC_SW_DOWNLOAD_FLAG_EXPERIMENTAL      0x00
-#define    I2O_EXEC_SW_DOWNLOAD_FLAG_OVERRIDE          0x02
+#define	   I2O_EXEC_SW_DOWNLOAD_FLAG_LOAD_MEMORY       0x00
+#define	   I2O_EXEC_SW_DOWNLOAD_FLAG_PERMANENT_STORE   0x01
+#define	   I2O_EXEC_SW_DOWNLOAD_FLAG_EXPERIMENTAL      0x00
+#define	   I2O_EXEC_SW_DOWNLOAD_FLAG_OVERRIDE          0x02
 
-#define    I2O_EXEC_SW_TYPE_DDM                        0x01
-#define    I2O_EXEC_SW_TYPE_DDM_MPB                    0x02
-#define    I2O_EXEC_SW_TYPE_DDM_CONFIG_TABLE           0x03
-#define    I2O_EXEC_SW_TYPE_IRTOS                      0x11
-#define    I2O_EXEC_SW_TYPE_IRTOS_PRIVATE_MODULE       0x12
-#define    I2O_EXEC_SW_TYPE_IRTOS_DIALOG_TABLE         0x13
-#define    I2O_EXEC_SW_TYPE_IOP_PRIVATE_MODULE         0x22
-#define    I2O_EXEC_SW_TYPE_IOP_DIALOG_TABLE           0x23
+#define	   I2O_EXEC_SW_TYPE_DDM                        0x01
+#define	   I2O_EXEC_SW_TYPE_DDM_MPB                    0x02
+#define	   I2O_EXEC_SW_TYPE_DDM_CONFIG_TABLE           0x03
+#define	   I2O_EXEC_SW_TYPE_IRTOS                      0x11
+#define	   I2O_EXEC_SW_TYPE_IRTOS_PRIVATE_MODULE       0x12
+#define	   I2O_EXEC_SW_TYPE_IRTOS_DIALOG_TABLE         0x13
+#define	   I2O_EXEC_SW_TYPE_IOP_PRIVATE_MODULE         0x22
+#define	   I2O_EXEC_SW_TYPE_IOP_DIALOG_TABLE           0x23
 
 
 /* I2O ExecSwDownload/Upload/Remove SwID Structure */
@@ -930,13 +930,13 @@ typedef struct _I2O_EXEC_SYS_QUIESCE_MESSAGE {
 
 /* ExecSysTabSet (System Table) Function Message Frame structure. */
 
-#define I2O_EXEC_SYS_TAB_IOP_ID_LOCAL_IOP           0x000
-#define I2O_EXEC_SYS_TAB_IOP_ID_LOCAL_HOST          0x001
-#define I2O_EXEC_SYS_TAB_IOP_ID_UNKNOWN_IOP         0xFFF
-#define I2O_EXEC_SYS_TAB_HOST_UNIT_ID_LOCAL_UNIT    0x0000
-#define I2O_EXEC_SYS_TAB_HOST_UNIT_ID_UNKNOWN_UNIT  0xffff
-#define I2O_EXEC_SYS_TAB_SEG_NUMBER_LOCAL_SEGMENT   0x000
-#define I2O_EXEC_SYS_TAB_SEG_NUMBER_UNKNOWN_SEGMENT 0xfff
+#define	I2O_EXEC_SYS_TAB_IOP_ID_LOCAL_IOP           0x000
+#define	I2O_EXEC_SYS_TAB_IOP_ID_LOCAL_HOST          0x001
+#define	I2O_EXEC_SYS_TAB_IOP_ID_UNKNOWN_IOP         0xFFF
+#define	I2O_EXEC_SYS_TAB_HOST_UNIT_ID_LOCAL_UNIT    0x0000
+#define	I2O_EXEC_SYS_TAB_HOST_UNIT_ID_UNKNOWN_UNIT  0xffff
+#define	I2O_EXEC_SYS_TAB_SEG_NUMBER_LOCAL_SEGMENT   0x000
+#define	I2O_EXEC_SYS_TAB_SEG_NUMBER_UNKNOWN_SEGMENT 0xfff
 
 typedef struct _I2O_EXEC_SYS_TAB_SET_MESSAGE {
    I2O_MESSAGE_FRAME           StdMessageFrame;
@@ -961,7 +961,7 @@ typedef struct _I2O_EXEC_SYS_TAB_SET_MESSAGE {
 
 /* ExecSysTabSet (System Table) Header Reply structure. */
 
-#define    I2O_SET_SYSTAB_RESERVED_SZ                  8
+#define	   I2O_SET_SYSTAB_RESERVED_SZ                  8
 
 typedef struct _I2O_SET_SYSTAB_HEADER {
    U8                          NumberEntries;
@@ -973,7 +973,7 @@ typedef struct _I2O_SET_SYSTAB_HEADER {
 } I2O_SET_SYSTAB_HEADER, *PI2O_SET_SYSTAB_HEADER;
 
 
-#define    I2O_RESOURCE_MANAGER_VERSION        0
+#define	   I2O_RESOURCE_MANAGER_VERSION        0
 
 typedef struct _MESSENGER_INFO {
    U32                         InboundMessagePortAddressLow;
@@ -1013,43 +1013,43 @@ typedef struct _I2O_IOP_ENTRY {
 /****************************************************************************/
 
 
-#define    I2O_EXEC_IOP_HARDWARE_GROUP_NO              0x0000
-#define    I2O_EXEC_IOP_MESSAGE_IF_GROUP_NO            0x0001
-#define    I2O_EXEC_EXECUTING_ENVIRONMENT_GROUP_NO     0x0002
-#define    I2O_EXEC_EXECUTING_DDM_LIST_GROUP_NO        0x0003
-#define    I2O_EXEC_DRIVER_STORE_GROUP_NO              0x0004
-#define    I2O_EXEC_DRIVER_STORE_TABLE_GROUP_NO        0x0005
-#define    I2O_EXEC_IOP_BUS_ATTRIBUTES_GROUP_NO        0x0006
-#define    I2O_EXEC_IOP_SW_ATTRIBUTES_GROUP_NO         0x0007
-#define    I2O_EXEC_HARDWARE_RESOURCE_TABLE_GROUP_NO   0x0100
-#define    I2O_EXEC_LCT_SCALAR_GROUP_NO                0x0101
-#define    I2O_EXEC_LCT_TABLE_GROUP_NO                 0x0102
-#define    I2O_EXEC_SYSTEM_TABLE_GROUP_NO              0x0103
-#define    I2O_EXEC_EXTERNAL_CONN_TABLE_GROUP_NO       0x0104
+#define	   I2O_EXEC_IOP_HARDWARE_GROUP_NO              0x0000
+#define	   I2O_EXEC_IOP_MESSAGE_IF_GROUP_NO            0x0001
+#define	   I2O_EXEC_EXECUTING_ENVIRONMENT_GROUP_NO     0x0002
+#define	   I2O_EXEC_EXECUTING_DDM_LIST_GROUP_NO        0x0003
+#define	   I2O_EXEC_DRIVER_STORE_GROUP_NO              0x0004
+#define	   I2O_EXEC_DRIVER_STORE_TABLE_GROUP_NO        0x0005
+#define	   I2O_EXEC_IOP_BUS_ATTRIBUTES_GROUP_NO        0x0006
+#define	   I2O_EXEC_IOP_SW_ATTRIBUTES_GROUP_NO         0x0007
+#define	   I2O_EXEC_HARDWARE_RESOURCE_TABLE_GROUP_NO   0x0100
+#define	   I2O_EXEC_LCT_SCALAR_GROUP_NO                0x0101
+#define	   I2O_EXEC_LCT_TABLE_GROUP_NO                 0x0102
+#define	   I2O_EXEC_SYSTEM_TABLE_GROUP_NO              0x0103
+#define	   I2O_EXEC_EXTERNAL_CONN_TABLE_GROUP_NO       0x0104
 
 
 /* EXEC Group 0000h - IOP Hardware Parameter Group */
 
 /* IOP HardWare Capabilities defines */
 
-#define    I2O_IOP_HW_CAP_SELF_BOOT                    0x00000001
-#define    I2O_IOP_HW_CAP_IRTOS_UPGRADEABLE            0x00000002
-#define    I2O_IOP_HW_CAP_DOWNLOADABLE_DDM             0x00000004
-#define    I2O_IOP_HW_CAP_INSTALLABLE_DDM              0x00000008
-#define    I2O_IOP_HW_CAP_BATTERY_BACKUP_RAM           0x00000010
+#define	   I2O_IOP_HW_CAP_SELF_BOOT                    0x00000001
+#define	   I2O_IOP_HW_CAP_IRTOS_UPGRADEABLE            0x00000002
+#define	   I2O_IOP_HW_CAP_DOWNLOADABLE_DDM             0x00000004
+#define	   I2O_IOP_HW_CAP_INSTALLABLE_DDM              0x00000008
+#define	   I2O_IOP_HW_CAP_BATTERY_BACKUP_RAM           0x00000010
 
 /* IOP Processor Type defines */
 
-#define    I2O_IOP_PROC_TYPE_INTEL_80960               0x00
-#define    I2O_IOP_PROC_TYPE_AMD_29000                 0x01
-#define    I2O_IOP_PROC_TYPE_MOTOROLA_68000            0x02
-#define    I2O_IOP_PROC_TYPE_ARM                       0x03
-#define    I2O_IOP_PROC_TYPE_MIPS                      0x04
-#define    I2O_IOP_PROC_TYPE_SPARC                     0x05
-#define    I2O_IOP_PROC_TYPE_POWER_PC                  0x06
-#define    I2O_IOP_PROC_TYPE_ALPHA                     0x07
-#define    I2O_IOP_PROC_TYPE_INTEL_X86                 0x08
-#define    I2O_IOP_PROC_TYPE_OTHER                     0xFF
+#define	   I2O_IOP_PROC_TYPE_INTEL_80960               0x00
+#define	   I2O_IOP_PROC_TYPE_AMD_29000                 0x01
+#define	   I2O_IOP_PROC_TYPE_MOTOROLA_68000            0x02
+#define	   I2O_IOP_PROC_TYPE_ARM                       0x03
+#define	   I2O_IOP_PROC_TYPE_MIPS                      0x04
+#define	   I2O_IOP_PROC_TYPE_SPARC                     0x05
+#define	   I2O_IOP_PROC_TYPE_POWER_PC                  0x06
+#define	   I2O_IOP_PROC_TYPE_ALPHA                     0x07
+#define	   I2O_IOP_PROC_TYPE_INTEL_X86                 0x08
+#define	   I2O_IOP_PROC_TYPE_OTHER                     0xFF
 
 
 typedef struct _I2O_EXEC_IOP_HARDWARE_SCALAR {
@@ -1066,11 +1066,11 @@ typedef struct _I2O_EXEC_IOP_HARDWARE_SCALAR {
 /* EXEC Group 0001h - IOP Message Interface Parameter Group */
 
 /* InitCode defines */
-#define    I2O_MESSAGE_IF_INIT_CODE_NO_OWNER           0x00
-#define    I2O_MESSAGE_IF_INIT_CODE_BIOS               0x10
-#define    I2O_MESSAGE_IF_INIT_CODE_OEM_BIOS_EXTENSION 0x20
-#define    I2O_MESSAGE_IF_INIT_CODE_ROM_BIOS_EXTENSION 0x30
-#define    I2O_MESSAGE_IF_INIT_CODE_OS                 0x80
+#define	   I2O_MESSAGE_IF_INIT_CODE_NO_OWNER           0x00
+#define	   I2O_MESSAGE_IF_INIT_CODE_BIOS               0x10
+#define	   I2O_MESSAGE_IF_INIT_CODE_OEM_BIOS_EXTENSION 0x20
+#define	   I2O_MESSAGE_IF_INIT_CODE_ROM_BIOS_EXTENSION 0x30
+#define	   I2O_MESSAGE_IF_INIT_CODE_OS                 0x80
 
 typedef struct _I2O_EXEC_IOP_MESSAGE_IF_SCALAR {
    U32                     InboundFrameSize;
@@ -1109,9 +1109,9 @@ typedef struct _I2O_EXEC_EXECUTE_ENVIRONMENT_SCALAR {
 
 /* ModuleType Defines */
 
-#define    I2O_EXEC_DDM_MODULE_TYPE_OTHER              0x00
-#define    I2O_EXEC_DDM_MODULE_TYPE_DOWNLOAD           0x01
-#define    I2O_EXEC_DDM_MODULE_TYPE_EMBEDDED           0x22
+#define	   I2O_EXEC_DDM_MODULE_TYPE_OTHER              0x00
+#define	   I2O_EXEC_DDM_MODULE_TYPE_DOWNLOAD           0x01
+#define	   I2O_EXEC_DDM_MODULE_TYPE_EMBEDDED           0x22
 
 
 typedef struct _I2O_EXEC_EXECUTE_DDM_TABLE {
@@ -1160,9 +1160,9 @@ typedef struct _I2O_EXEC_DRIVER_STORE_TABLE {
 
 /* EXEC Group 0006h - IOP's Bus Attributes Parameter Group */
 
-#define    I2O_EXEC_IOP_BUS_ATTRIB_SYSTEM_BUS          0x00
-#define    I2O_EXEC_IOP_BUS_ATTRIB_BRIDGED_SYSTEM_BUS  0x01
-#define    I2O_EXEC_IOP_BUS_ATTRIB_PRIVATE             0x02
+#define	   I2O_EXEC_IOP_BUS_ATTRIB_SYSTEM_BUS          0x00
+#define	   I2O_EXEC_IOP_BUS_ATTRIB_BRIDGED_SYSTEM_BUS  0x01
+#define	   I2O_EXEC_IOP_BUS_ATTRIB_PRIVATE             0x02
 
 typedef struct _I2O_EXEC_IOP_BUS_ATTRIBUTE_TABLE {
    U32                     BusID;
@@ -1175,10 +1175,10 @@ typedef struct _I2O_EXEC_IOP_BUS_ATTRIBUTE_TABLE {
 
 /* EXEC Group 0007h - IOP's Bus Attributes Parameter Group */
 
-#define    I2O_EXEC_IOP_SW_CAP_IRTOS_I2O_COMPLIANT     0x00000001
-#define    I2O_EXEC_IOP_SW_CAP_IRTOS_UPGRADEABLE       0x00000002
-#define    I2O_EXEC_IOP_SW_CAP_DOWNLOADABLE_DDM        0x00000004
-#define    I2O_EXEC_IOP_SW_CAP_INSTALLABLE_DDM         0x00000008
+#define	   I2O_EXEC_IOP_SW_CAP_IRTOS_I2O_COMPLIANT     0x00000001
+#define	   I2O_EXEC_IOP_SW_CAP_IRTOS_UPGRADEABLE       0x00000002
+#define	   I2O_EXEC_IOP_SW_CAP_DOWNLOADABLE_DDM        0x00000004
+#define	   I2O_EXEC_IOP_SW_CAP_INSTALLABLE_DDM         0x00000008
 
 typedef struct _I2O_EXEC_IOP_SW_ATTRIBUTES_SCALAR {
    U16                     I2oVendorID;
@@ -1226,7 +1226,7 @@ typedef struct _I2O_EXEC_LCT_TABLE {
 
 /* EXEC Group 0103h - System Table Parameter Group */
 
-#define    I2O_MESSENGER_TYPE_MEMORY_MAPPED_MESSAGE_UNIT  0x0
+#define	   I2O_MESSENGER_TYPE_MEMORY_MAPPED_MESSAGE_UNIT  0x0
 
 typedef struct _I2O_EXEC_SYSTEM_TABLE {
    U16                         IOP_ID;
@@ -1245,8 +1245,8 @@ typedef struct _I2O_EXEC_SYSTEM_TABLE {
 
 /* EXEC Group 0104h - External Connection Table Parameter Group */
 
-#define  I2O_EXEC_XCT_FLAGS_REMOTE_IOP_CREATED_CONNECTION     0x00
-#define  I2O_EXEC_XCT_FLAGS_THIS_IOP_CREATED_CONNECTION       0x01
+#define	 I2O_EXEC_XCT_FLAGS_REMOTE_IOP_CREATED_CONNECTION     0x00
+#define	 I2O_EXEC_XCT_FLAGS_THIS_IOP_CREATED_CONNECTION       0x01
 
 typedef struct _I2O_EXEC_EXTERNAL_CONNECTION_TABLE {
    U16                         LocalAliasTID;
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index 5050462..844e5c2 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -89,9 +89,9 @@
  **********************************************************************/
 
 #if !defined(I2O_MESSAGE_HDR)
-#define I2O_MESSAGE_HDR
+#define	I2O_MESSAGE_HDR
 
-#define I2OMSG_REV 1_5_4  /* I2OMsg header file revision string */
+#define	I2OMSG_REV 1_5_4  /* I2OMsg header file revision string */
 
 /*
 
@@ -132,42 +132,42 @@ PRAGMA_ALIGN_PUSH
 PRAGMA_PACK_PUSH
 
 /* Set to 1 for 64 bit Context Fields */
-#define     I2O_64BIT_CONTEXT          0
+#define	    I2O_64BIT_CONTEXT          0
 
 /****************************************************************************/
 
 /* Common functions accross all classes. */
 
-#define    I2O_PRIVATE_MESSAGE                         0xFF
+#define	   I2O_PRIVATE_MESSAGE                         0xFF
 
 /****************************************************************************/
 /* Class ID and Code Assignments */
 
 
-#define    I2O_CLASS_VERSION_10                        0x00
-#define    I2O_CLASS_VERSION_11                        0x01
+#define	   I2O_CLASS_VERSION_10                        0x00
+#define	   I2O_CLASS_VERSION_11                        0x01
 
 /*    Class Code Names:  Table 6-1 Class Code Assignments. */
-#define    I2O_CLASS_EXECUTIVE                         0x000
-#define    I2O_CLASS_DDM                               0x001
-#define    I2O_CLASS_RANDOM_BLOCK_STORAGE              0x010
-#define    I2O_CLASS_SEQUENTIAL_STORAGE                0x011
-#define    I2O_CLASS_LAN                               0x020
-#define    I2O_CLASS_WAN                               0x030
-#define    I2O_CLASS_FIBRE_CHANNEL_PORT                0x040
-#define    I2O_CLASS_FIBRE_CHANNEL_PERIPHERAL          0x041
-#define    I2O_CLASS_SCSI_PERIPHERAL                   0x051
-#define    I2O_CLASS_ATE_PORT                          0x060
-#define    I2O_CLASS_ATE_PERIPHERAL                    0x061
-#define    I2O_CLASS_FLOPPY_CONTROLLER                 0x070
-#define    I2O_CLASS_FLOPPY_DEVICE                     0x071
-#define    I2O_CLASS_BUS_ADAPTER_PORT                  0x080
+#define	   I2O_CLASS_EXECUTIVE                         0x000
+#define	   I2O_CLASS_DDM                               0x001
+#define	   I2O_CLASS_RANDOM_BLOCK_STORAGE              0x010
+#define	   I2O_CLASS_SEQUENTIAL_STORAGE                0x011
+#define	   I2O_CLASS_LAN                               0x020
+#define	   I2O_CLASS_WAN                               0x030
+#define	   I2O_CLASS_FIBRE_CHANNEL_PORT                0x040
+#define	   I2O_CLASS_FIBRE_CHANNEL_PERIPHERAL          0x041
+#define	   I2O_CLASS_SCSI_PERIPHERAL                   0x051
+#define	   I2O_CLASS_ATE_PORT                          0x060
+#define	   I2O_CLASS_ATE_PERIPHERAL                    0x061
+#define	   I2O_CLASS_FLOPPY_CONTROLLER                 0x070
+#define	   I2O_CLASS_FLOPPY_DEVICE                     0x071
+#define	   I2O_CLASS_BUS_ADAPTER_PORT                  0x080
 /* Class Codes 0x090 - 0x09f are reserved for Peer-to-Peer classes */
-#define    I2O_CLASS_MATCH_ANYCLASS                    0xffffffff
+#define	   I2O_CLASS_MATCH_ANYCLASS                    0xffffffff
 
-#define    I2O_SUBCLASS_i960                           0x001
-#define    I2O_SUBCLASS_HDM                            0x020
-#define    I2O_SUBCLASS_ISM                            0x021
+#define	   I2O_SUBCLASS_i960                           0x001
+#define	   I2O_SUBCLASS_HDM                            0x020
+#define	   I2O_SUBCLASS_ISM                            0x021
 
 
 /****************************************************************************/
@@ -175,100 +175,100 @@ PRAGMA_PACK_PUSH
 
 /*   Defines for the Version_Status field. */
 
-#define    I2O_VERSION_10                              0x00
-#define    I2O_VERSION_11                              0x01
+#define	   I2O_VERSION_10                              0x00
+#define	   I2O_VERSION_11                              0x01
 
-#define    I2O_VERSION_OFFSET_NUMBER_MASK              0x07
-#define    I2O_VERSION_OFFSET_SGL_TRL_OFFSET_MASK      0xF0
+#define	   I2O_VERSION_OFFSET_NUMBER_MASK              0x07
+#define	   I2O_VERSION_OFFSET_SGL_TRL_OFFSET_MASK      0xF0
 
 /*   Defines for the Message Flags Field. */
 /*   Please Note the the FAIL bit is only set in the Transport Fail Message. */
-#define    I2O_MESSAGE_FLAGS_STATIC                    0x01
-#define    I2O_MESSAGE_FLAGS_64BIT_CONTEXT             0x02
-#define    I2O_MESSAGE_FLAGS_MULTIPLE                  0x10
-#define    I2O_MESSAGE_FLAGS_FAIL                      0x20
-#define    I2O_MESSAGE_FLAGS_LAST                      0x40
-#define    I2O_MESSAGE_FLAGS_REPLY                     0x80
+#define	   I2O_MESSAGE_FLAGS_STATIC                    0x01
+#define	   I2O_MESSAGE_FLAGS_64BIT_CONTEXT             0x02
+#define	   I2O_MESSAGE_FLAGS_MULTIPLE                  0x10
+#define	   I2O_MESSAGE_FLAGS_FAIL                      0x20
+#define	   I2O_MESSAGE_FLAGS_LAST                      0x40
+#define	   I2O_MESSAGE_FLAGS_REPLY                     0x80
 
 /* Defines for Request Status Codes:  Table 3-1 Reply Status Codes.  */
 
-#define    I2O_REPLY_STATUS_SUCCESS                    0x00
-#define    I2O_REPLY_STATUS_ABORT_DIRTY                0x01
-#define    I2O_REPLY_STATUS_ABORT_NO_DATA_TRANSFER     0x02
-#define    I2O_REPLY_STATUS_ABORT_PARTIAL_TRANSFER     0x03
-#define    I2O_REPLY_STATUS_ERROR_DIRTY                0x04
-#define    I2O_REPLY_STATUS_ERROR_NO_DATA_TRANSFER     0x05
-#define    I2O_REPLY_STATUS_ERROR_PARTIAL_TRANSFER     0x06
-#define    I2O_REPLY_STATUS_PROCESS_ABORT_DIRTY        0x08
-#define    I2O_REPLY_STATUS_PROCESS_ABORT_NO_DATA_TRANSFER   0x09
-#define    I2O_REPLY_STATUS_PROCESS_ABORT_PARTIAL_TRANSFER   0x0A
-#define    I2O_REPLY_STATUS_TRANSACTION_ERROR          0x0B
-#define    I2O_REPLY_STATUS_PROGRESS_REPORT            0x80
+#define	   I2O_REPLY_STATUS_SUCCESS                    0x00
+#define	   I2O_REPLY_STATUS_ABORT_DIRTY                0x01
+#define	   I2O_REPLY_STATUS_ABORT_NO_DATA_TRANSFER     0x02
+#define	   I2O_REPLY_STATUS_ABORT_PARTIAL_TRANSFER     0x03
+#define	   I2O_REPLY_STATUS_ERROR_DIRTY                0x04
+#define	   I2O_REPLY_STATUS_ERROR_NO_DATA_TRANSFER     0x05
+#define	   I2O_REPLY_STATUS_ERROR_PARTIAL_TRANSFER     0x06
+#define	   I2O_REPLY_STATUS_PROCESS_ABORT_DIRTY        0x08
+#define	   I2O_REPLY_STATUS_PROCESS_ABORT_NO_DATA_TRANSFER   0x09
+#define	   I2O_REPLY_STATUS_PROCESS_ABORT_PARTIAL_TRANSFER   0x0A
+#define	   I2O_REPLY_STATUS_TRANSACTION_ERROR          0x0B
+#define	   I2O_REPLY_STATUS_PROGRESS_REPORT            0x80
 
 /* DetailedStatusCode defines for ALL messages: Table 3-2 Detailed Status Codes.  */
 
-#define    I2O_DETAIL_STATUS_SUCCESS                        0x0000
-#define    I2O_DETAIL_STATUS_BAD_KEY                        0x0002
-#define    I2O_DETAIL_STATUS_TCL_ERROR                      0x0003
-#define    I2O_DETAIL_STATUS_REPLY_BUFFER_FULL              0x0004
-#define    I2O_DETAIL_STATUS_NO_SUCH_PAGE                   0x0005
-#define    I2O_DETAIL_STATUS_INSUFFICIENT_RESOURCE_SOFT     0x0006
-#define    I2O_DETAIL_STATUS_INSUFFICIENT_RESOURCE_HARD     0x0007
-#define    I2O_DETAIL_STATUS_CHAIN_BUFFER_TOO_LARGE         0x0009
-#define    I2O_DETAIL_STATUS_UNSUPPORTED_FUNCTION           0x000A
-#define    I2O_DETAIL_STATUS_DEVICE_LOCKED                  0x000B
-#define    I2O_DETAIL_STATUS_DEVICE_RESET                   0x000C
-#define    I2O_DETAIL_STATUS_INAPPROPRIATE_FUNCTION         0x000D
-#define    I2O_DETAIL_STATUS_INVALID_INITIATOR_ADDRESS      0x000E
-#define    I2O_DETAIL_STATUS_INVALID_MESSAGE_FLAGS          0x000F
-#define    I2O_DETAIL_STATUS_INVALID_OFFSET                 0x0010
-#define    I2O_DETAIL_STATUS_INVALID_PARAMETER              0x0011
-#define    I2O_DETAIL_STATUS_INVALID_REQUEST                0x0012
-#define    I2O_DETAIL_STATUS_INVALID_TARGET_ADDRESS         0x0013
-#define    I2O_DETAIL_STATUS_MESSAGE_TOO_LARGE              0x0014
-#define    I2O_DETAIL_STATUS_MESSAGE_TOO_SMALL              0x0015
-#define    I2O_DETAIL_STATUS_MISSING_PARAMETER              0x0016
-#define    I2O_DETAIL_STATUS_TIMEOUT                        0x0017
-#define    I2O_DETAIL_STATUS_UNKNOWN_ERROR                  0x0018
-#define    I2O_DETAIL_STATUS_UNKNOWN_FUNCTION               0x0019
-#define    I2O_DETAIL_STATUS_UNSUPPORTED_VERSION            0x001A
-#define    I2O_DEATIL_STATUS_DEVICE_BUSY                    0x001B
-#define    I2O_DETAIL_STATUS_DEVICE_NOT_AVAILABLE           0x001C
+#define	   I2O_DETAIL_STATUS_SUCCESS                        0x0000
+#define	   I2O_DETAIL_STATUS_BAD_KEY                        0x0002
+#define	   I2O_DETAIL_STATUS_TCL_ERROR                      0x0003
+#define	   I2O_DETAIL_STATUS_REPLY_BUFFER_FULL              0x0004
+#define	   I2O_DETAIL_STATUS_NO_SUCH_PAGE                   0x0005
+#define	   I2O_DETAIL_STATUS_INSUFFICIENT_RESOURCE_SOFT     0x0006
+#define	   I2O_DETAIL_STATUS_INSUFFICIENT_RESOURCE_HARD     0x0007
+#define	   I2O_DETAIL_STATUS_CHAIN_BUFFER_TOO_LARGE         0x0009
+#define	   I2O_DETAIL_STATUS_UNSUPPORTED_FUNCTION           0x000A
+#define	   I2O_DETAIL_STATUS_DEVICE_LOCKED                  0x000B
+#define	   I2O_DETAIL_STATUS_DEVICE_RESET                   0x000C
+#define	   I2O_DETAIL_STATUS_INAPPROPRIATE_FUNCTION         0x000D
+#define	   I2O_DETAIL_STATUS_INVALID_INITIATOR_ADDRESS      0x000E
+#define	   I2O_DETAIL_STATUS_INVALID_MESSAGE_FLAGS          0x000F
+#define	   I2O_DETAIL_STATUS_INVALID_OFFSET                 0x0010
+#define	   I2O_DETAIL_STATUS_INVALID_PARAMETER              0x0011
+#define	   I2O_DETAIL_STATUS_INVALID_REQUEST                0x0012
+#define	   I2O_DETAIL_STATUS_INVALID_TARGET_ADDRESS         0x0013
+#define	   I2O_DETAIL_STATUS_MESSAGE_TOO_LARGE              0x0014
+#define	   I2O_DETAIL_STATUS_MESSAGE_TOO_SMALL              0x0015
+#define	   I2O_DETAIL_STATUS_MISSING_PARAMETER              0x0016
+#define	   I2O_DETAIL_STATUS_TIMEOUT                        0x0017
+#define	   I2O_DETAIL_STATUS_UNKNOWN_ERROR                  0x0018
+#define	   I2O_DETAIL_STATUS_UNKNOWN_FUNCTION               0x0019
+#define	   I2O_DETAIL_STATUS_UNSUPPORTED_VERSION            0x001A
+#define	   I2O_DEATIL_STATUS_DEVICE_BUSY                    0x001B
+#define	   I2O_DETAIL_STATUS_DEVICE_NOT_AVAILABLE           0x001C
 
 /* Common I2O Field sizes  */
 
-#define    I2O_TID_SZ                                  12
-#define    I2O_FUNCTION_SZ                             8
-#define    I2O_UNIT_ID_SZ                              16
-#define    I2O_SEGMENT_NUMBER_SZ                       12
+#define	   I2O_TID_SZ                                  12
+#define	   I2O_FUNCTION_SZ                             8
+#define	   I2O_UNIT_ID_SZ                              16
+#define	   I2O_SEGMENT_NUMBER_SZ                       12
 
-#define    I2O_IOP_ID_SZ                               12
-#define    I2O_GROUP_ID_SZ                             16
-#define    I2O_IOP_STATE_SZ                            8
-#define    I2O_MESSENGER_TYPE_SZ                       8
+#define	   I2O_IOP_ID_SZ                               12
+#define	   I2O_GROUP_ID_SZ                             16
+#define	   I2O_IOP_STATE_SZ                            8
+#define	   I2O_MESSENGER_TYPE_SZ                       8
 
-#define    I2O_CLASS_ID_SZ                             12
-#define    I2O_CLASS_ORGANIZATION_ID_SZ                16
+#define	   I2O_CLASS_ID_SZ                             12
+#define	   I2O_CLASS_ORGANIZATION_ID_SZ                16
 
-#define    I2O_4BIT_VERSION_SZ                         4
-#define    I2O_8BIT_FLAGS_SZ                           8
-#define    I2O_COMMON_LENGTH_FIELD_SZ                  16
+#define	   I2O_4BIT_VERSION_SZ                         4
+#define	   I2O_8BIT_FLAGS_SZ                           8
+#define	   I2O_COMMON_LENGTH_FIELD_SZ                  16
 
-#define    I2O_DEVID_DESCRIPTION_SZ                    16
-#define    I2O_DEVID_VENDOR_INFO_SZ                    16
-#define    I2O_DEVID_PRODUCT_INFO_SZ                   16
-#define    I2O_DEVID_REV_LEVEL_SZ                      8
-#define    I2O_MODULE_NAME_SZ                          24
+#define	   I2O_DEVID_DESCRIPTION_SZ                    16
+#define	   I2O_DEVID_VENDOR_INFO_SZ                    16
+#define	   I2O_DEVID_PRODUCT_INFO_SZ                   16
+#define	   I2O_DEVID_REV_LEVEL_SZ                      8
+#define	   I2O_MODULE_NAME_SZ                          24
 
-#define    I2O_BIOS_INFO_SZ                            8
+#define	   I2O_BIOS_INFO_SZ                            8
 
-#define    I2O_RESERVED_4BITS                          4
-#define    I2O_RESERVED_8BITS                          8
-#define    I2O_RESERVED_12BITS                         12
-#define    I2O_RESERVED_16BITS                         16
-#define    I2O_RESERVED_20BITS                         20
-#define    I2O_RESERVED_24BITS                         24
-#define    I2O_RESERVED_28BITS                         28
+#define	   I2O_RESERVED_4BITS                          4
+#define	   I2O_RESERVED_8BITS                          8
+#define	   I2O_RESERVED_12BITS                         12
+#define	   I2O_RESERVED_16BITS                         16
+#define	   I2O_RESERVED_20BITS                         20
+#define	   I2O_RESERVED_24BITS                         24
+#define	   I2O_RESERVED_28BITS                         28
 
 
 typedef    U32        I2O_PARAMETER_TID;
@@ -284,17 +284,17 @@ typedef    U32        I2O_TRANSACTION_CONTEXT;
 
 /*  Serial Number format defines */
 
-#define    I2O_SERIAL_FORMAT_UNKNOWN                   0
-#define    I2O_SERIAL_FORMAT_BINARY                    1
-#define    I2O_SERIAL_FORMAT_ASCII                     2
-#define    I2O_SERIAL_FORMAT_UNICODE                   3
-#define    I2O_SERIAL_FORMAT_LAN_MAC                   4
-#define    I2O_SERIAL_FORMAT_WAN                       5
+#define	   I2O_SERIAL_FORMAT_UNKNOWN                   0
+#define	   I2O_SERIAL_FORMAT_BINARY                    1
+#define	   I2O_SERIAL_FORMAT_ASCII                     2
+#define	   I2O_SERIAL_FORMAT_UNICODE                   3
+#define	   I2O_SERIAL_FORMAT_LAN_MAC                   4
+#define	   I2O_SERIAL_FORMAT_WAN                       5
 
 /* Special TID Assignments */
 
-#define    I2O_IOP_TID                                 0
-#define    I2O_HOST_TID                                1
+#define	   I2O_IOP_TID                                 0
+#define	   I2O_HOST_TID                                1
 
 
 /****************************************************************************/
@@ -320,9 +320,9 @@ typedef struct _I2O_MESSAGE_FRAME {
 
 /* Transaction Reply Lists (TRL) Control Word structure */
 
-#define    I2O_TRL_FLAGS_SINGLE_FIXED_LENGTH           0x00
-#define    I2O_TRL_FLAGS_SINGLE_VARIABLE_LENGTH        0x40
-#define    I2O_TRL_FLAGS_MULTIPLE_FIXED_LENGTH         0x80
+#define	   I2O_TRL_FLAGS_SINGLE_FIXED_LENGTH           0x00
+#define	   I2O_TRL_FLAGS_SINGLE_VARIABLE_LENGTH        0x40
+#define	   I2O_TRL_FLAGS_MULTIPLE_FIXED_LENGTH         0x80
 
 typedef struct _I2O_TRL_CONTROL_WORD {
    U8                          TrlCount;
@@ -379,34 +379,34 @@ typedef struct _I2O_PRIVATE_MESSAGE_FRAME {
 
 /* Message Failure Severity Codes */
 
-#define    I2O_SEVERITY_FORMAT_ERROR                   0x1
-#define    I2O_SEVERITY_PATH_ERROR                     0x2
-#define    I2O_SEVERITY_PATH_STATE                     0x4
-#define    I2O_SEVERITY_CONGESTION                     0x8
+#define	   I2O_SEVERITY_FORMAT_ERROR                   0x1
+#define	   I2O_SEVERITY_PATH_ERROR                     0x2
+#define	   I2O_SEVERITY_PATH_STATE                     0x4
+#define	   I2O_SEVERITY_CONGESTION                     0x8
 
 /* Transport Failure Codes: Table 3-3 Mesasge Failure Codes */
 
-#define    I2O_FAILURE_CODE_TRANSPORT_SERVICE_SUSPENDED    0x81
-#define    I2O_FAILURE_CODE_TRANSPORT_SERVICE_TERMINATED   0x82
-#define    I2O_FAILURE_CODE_TRANSPORT_CONGESTION           0x83
-#define    I2O_FAILURE_CODE_TRANSPORT_FAIL                 0x84
-#define    I2O_FAILURE_CODE_TRANSPORT_STATE_ERROR          0x85
-#define    I2O_FAILURE_CODE_TRANSPORT_TIME_OUT             0x86
-#define    I2O_FAILURE_CODE_TRANSPORT_ROUTING_FAILURE      0x87
-#define    I2O_FAILURE_CODE_TRANSPORT_INVALID_VERSION      0x88
-#define    I2O_FAILURE_CODE_TRANSPORT_INVALID_OFFSET       0x89
-#define    I2O_FAILURE_CODE_TRANSPORT_INVALID_MSG_FLAGS    0x8A
-#define    I2O_FAILURE_CODE_TRANSPORT_FRAME_TOO_SMALL      0x8B
-#define    I2O_FAILURE_CODE_TRANSPORT_FRAME_TOO_LARGE      0x8C
-#define    I2O_FAILURE_CODE_TRANSPORT_INVALID_TARGET_ID    0x8D
-#define    I2O_FAILURE_CODE_TRANSPORT_INVALID_INITIATOR_ID 0x8E
-#define    I2O_FAILURE_CODE_TRANSPORT_INVALID_INITIATOR_CONTEXT    0x8F
-#define    I2O_FAILURE_CODE_TRANSPORT_UNKNOWN_FAILURE      0xFF
+#define	   I2O_FAILURE_CODE_TRANSPORT_SERVICE_SUSPENDED    0x81
+#define	   I2O_FAILURE_CODE_TRANSPORT_SERVICE_TERMINATED   0x82
+#define	   I2O_FAILURE_CODE_TRANSPORT_CONGESTION           0x83
+#define	   I2O_FAILURE_CODE_TRANSPORT_FAIL                 0x84
+#define	   I2O_FAILURE_CODE_TRANSPORT_STATE_ERROR          0x85
+#define	   I2O_FAILURE_CODE_TRANSPORT_TIME_OUT             0x86
+#define	   I2O_FAILURE_CODE_TRANSPORT_ROUTING_FAILURE      0x87
+#define	   I2O_FAILURE_CODE_TRANSPORT_INVALID_VERSION      0x88
+#define	   I2O_FAILURE_CODE_TRANSPORT_INVALID_OFFSET       0x89
+#define	   I2O_FAILURE_CODE_TRANSPORT_INVALID_MSG_FLAGS    0x8A
+#define	   I2O_FAILURE_CODE_TRANSPORT_FRAME_TOO_SMALL      0x8B
+#define	   I2O_FAILURE_CODE_TRANSPORT_FRAME_TOO_LARGE      0x8C
+#define	   I2O_FAILURE_CODE_TRANSPORT_INVALID_TARGET_ID    0x8D
+#define	   I2O_FAILURE_CODE_TRANSPORT_INVALID_INITIATOR_ID 0x8E
+#define	   I2O_FAILURE_CODE_TRANSPORT_INVALID_INITIATOR_CONTEXT    0x8F
+#define	   I2O_FAILURE_CODE_TRANSPORT_UNKNOWN_FAILURE      0xFF
 
 /* IOP_ID and Severity sizes */
 
-#define    I2O_FAILCODE_SEVERITY_SZ                        8
-#define    I2O_FAILCODE_CODE_SZ                            8
+#define	   I2O_FAILCODE_SEVERITY_SZ                        8
+#define	   I2O_FAILCODE_CODE_SZ                            8
 
 /* I2O Transport Message Reply for Message Failure. */
 
@@ -465,7 +465,7 @@ typedef struct _I2O_CLASS_ID {
 } I2O_CLASS_ID, *PI2O_CLASS_ID;
 
 
-#define    I2O_MAX_SERIAL_NUMBER_SZ                    256
+#define	   I2O_MAX_SERIAL_NUMBER_SZ                    256
 
 typedef struct _I2O_SERIAL_INFO {
    U8                          SerialNumberLength;
@@ -480,19 +480,19 @@ typedef struct _I2O_SERIAL_INFO {
 
 /* Bus Type Code defines */
 
-#define    I2O_LOCAL_BUS                               0
-#define    I2O_ISA_BUS                                 1
-#define    I2O_EISA_BUS                                2
-#define    I2O_MCA_BUS                                 3
-#define    I2O_PCI_BUS                                 4
-#define    I2O_PCMCIA_BUS                              5
-#define    I2O_NUBUS_BUS                               6
-#define    I2O_CARDBUS_BUS                             7
-#define    I2O_OTHER_BUS                               0x80
+#define	   I2O_LOCAL_BUS                               0
+#define	   I2O_ISA_BUS                                 1
+#define	   I2O_EISA_BUS                                2
+#define	   I2O_MCA_BUS                                 3
+#define	   I2O_PCI_BUS                                 4
+#define	   I2O_PCMCIA_BUS                              5
+#define	   I2O_NUBUS_BUS                               6
+#define	   I2O_CARDBUS_BUS                             7
+#define	   I2O_OTHER_BUS                               0x80
 
-#define    I2O_HRT_STATE_SZ                            4
-#define    I2O_HRT_BUS_NUMBER_SZ                       8
-#define    I2O_HRT_BUS_TYPE_SZ                         8
+#define	   I2O_HRT_STATE_SZ                            4
+#define	   I2O_HRT_BUS_NUMBER_SZ                       8
+#define	   I2O_HRT_BUS_TYPE_SZ                         8
 
 
 /* Bus Structures */
@@ -597,14 +597,14 @@ typedef struct _I2O_HRT {
 
 /* I2O Logical Configuration Table structures. */
 
-#define    I2O_IDENTITY_TAG_SZ                         8
+#define	   I2O_IDENTITY_TAG_SZ                         8
 
 /* I2O Logical Configuration Table Device Flags */
 
-#define    I2O_LCT_DEVICE_FLAGS_CONF_DIALOG_REQUEST            0x01
-#define    I2O_LCT_DEVICE_FLAGS_MORE_THAN_1_USER               0x02
-#define    I2O_LCT_DEVICE_FLAGS_PEER_SERVICE_DISABLED          0x10
-#define    I2O_LCT_DEVICE_FLAGS_MANAGEMENT_SERVICE_DISABLED    0x20
+#define	   I2O_LCT_DEVICE_FLAGS_CONF_DIALOG_REQUEST            0x01
+#define	   I2O_LCT_DEVICE_FLAGS_MORE_THAN_1_USER               0x02
+#define	   I2O_LCT_DEVICE_FLAGS_PEER_SERVICE_DISABLED          0x10
+#define	   I2O_LCT_DEVICE_FLAGS_MANAGEMENT_SERVICE_DISABLED    0x20
 
 /* LCT Entry Block */
 
@@ -654,28 +654,28 @@ typedef struct _I2O_LCT {
 
 /* SglFlags defines. */
 
-#define    I2O_SGL_FLAGS_LAST_ELEMENT                  0x80
-#define    I2O_SGL_FLAGS_END_OF_BUFFER                 0x40
-
-#define    I2O_SGL_FLAGS_IGNORE_ELEMENT                0x00
-#define    I2O_SGL_FLAGS_TRANSPORT_ELEMENT             0x04
-#define    I2O_SGL_FLAGS_BIT_BUCKET_ELEMENT            0x08
-#define    I2O_SGL_FLAGS_IMMEDIATE_DATA_ELEMENT        0x0C
-#define    I2O_SGL_FLAGS_SIMPLE_ADDRESS_ELEMENT        0x10
-#define    I2O_SGL_FLAGS_PAGE_LIST_ADDRESS_ELEMENT     0x20
-#define    I2O_SGL_FLAGS_CHAIN_POINTER_ELEMENT         0x30
-#define    I2O_SGL_FLAGS_LONG_TRANSACTION_ELEMENT      0x40
-#define    I2O_SGL_FLAGS_SHORT_TRANSACTION_ELEMENT     0x70
-#define    I2O_SGL_FLAGS_SGL_ATTRIBUTES_ELEMENT        0x7C
-
-#define    I2O_SGL_FLAGS_BC0                           0x01
-#define    I2O_SGL_FLAGS_BC1                           0x02
-#define    I2O_SGL_FLAGS_DIR                           0x04
-#define    I2O_SGL_FLAGS_LOCAL_ADDRESS                 0x08
-
-#define    I2O_SGL_FLAGS_CONTEXT_COUNT_MASK            0x03
-#define    I2O_SGL_FLAGS_ADDRESS_MODE_MASK             0x3C
-#define    I2O_SGL_FLAGS_NO_CONTEXT                    0x00
+#define	   I2O_SGL_FLAGS_LAST_ELEMENT                  0x80
+#define	   I2O_SGL_FLAGS_END_OF_BUFFER                 0x40
+
+#define	   I2O_SGL_FLAGS_IGNORE_ELEMENT                0x00
+#define	   I2O_SGL_FLAGS_TRANSPORT_ELEMENT             0x04
+#define	   I2O_SGL_FLAGS_BIT_BUCKET_ELEMENT            0x08
+#define	   I2O_SGL_FLAGS_IMMEDIATE_DATA_ELEMENT        0x0C
+#define	   I2O_SGL_FLAGS_SIMPLE_ADDRESS_ELEMENT        0x10
+#define	   I2O_SGL_FLAGS_PAGE_LIST_ADDRESS_ELEMENT     0x20
+#define	   I2O_SGL_FLAGS_CHAIN_POINTER_ELEMENT         0x30
+#define	   I2O_SGL_FLAGS_LONG_TRANSACTION_ELEMENT      0x40
+#define	   I2O_SGL_FLAGS_SHORT_TRANSACTION_ELEMENT     0x70
+#define	   I2O_SGL_FLAGS_SGL_ATTRIBUTES_ELEMENT        0x7C
+
+#define	   I2O_SGL_FLAGS_BC0                           0x01
+#define	   I2O_SGL_FLAGS_BC1                           0x02
+#define	   I2O_SGL_FLAGS_DIR                           0x04
+#define	   I2O_SGL_FLAGS_LOCAL_ADDRESS                 0x08
+
+#define	   I2O_SGL_FLAGS_CONTEXT_COUNT_MASK            0x03
+#define	   I2O_SGL_FLAGS_ADDRESS_MODE_MASK             0x3C
+#define	   I2O_SGL_FLAGS_NO_CONTEXT                    0x00
 
 /*  Scatter/Gather Truth Table */
 
@@ -735,41 +735,41 @@ typedef enum _SG_TYPE {
 
 /* 32 Bit Context Field defines */
 
-#define    I2O_SGL_FLAGS_CONTEXT32_NULL                0x00
-#define    I2O_SGL_FLAGS_CONTEXT32_U32                 0x01
-#define    I2O_SGL_FLAGS_CONTEXT32_U64                 0x02
-#define    I2O_SGL_FLAGS_CONTEXT32_U96                 0x03
+#define	   I2O_SGL_FLAGS_CONTEXT32_NULL                0x00
+#define	   I2O_SGL_FLAGS_CONTEXT32_U32                 0x01
+#define	   I2O_SGL_FLAGS_CONTEXT32_U64                 0x02
+#define	   I2O_SGL_FLAGS_CONTEXT32_U96                 0x03
 
-#define    I2O_SGL_FLAGS_CONTEXT32_NULL_SZ             0x00
-#define    I2O_SGL_FLAGS_CONTEXT32_U32_SZ              0x04
-#define    I2O_SGL_FLAGS_CONTEXT32_U64_SZ              0x08
-#define    I2O_SGL_FLAGS_CONTEXT32_U96_SZ              0x0C
+#define	   I2O_SGL_FLAGS_CONTEXT32_NULL_SZ             0x00
+#define	   I2O_SGL_FLAGS_CONTEXT32_U32_SZ              0x04
+#define	   I2O_SGL_FLAGS_CONTEXT32_U64_SZ              0x08
+#define	   I2O_SGL_FLAGS_CONTEXT32_U96_SZ              0x0C
 
 /* 64 Bit Context Field defines */
 
-#define    I2O_SGL_FLAGS_CONTEXT64_NULL                0x00
-#define    I2O_SGL_FLAGS_CONTEXT64_U64                 0x01
-#define    I2O_SGL_FLAGS_CONTEXT64_U128                0x02
-#define    I2O_SGL_FLAGS_CONTEXT64_U192                0x03
+#define	   I2O_SGL_FLAGS_CONTEXT64_NULL                0x00
+#define	   I2O_SGL_FLAGS_CONTEXT64_U64                 0x01
+#define	   I2O_SGL_FLAGS_CONTEXT64_U128                0x02
+#define	   I2O_SGL_FLAGS_CONTEXT64_U192                0x03
 
-#define    I2O_SGL_FLAGS_CONTEXT64_NULL_SZ             0x00
-#define    I2O_SGL_FLAGS_CONTEXT64_U64_SZ              0x08
-#define    I2O_SGL_FLAGS_CONTEXT64_U128_SZ             0x10
-#define    I2O_SGL_FLAGS_CONTEXT64_U192_SZ             0x18
+#define	   I2O_SGL_FLAGS_CONTEXT64_NULL_SZ             0x00
+#define	   I2O_SGL_FLAGS_CONTEXT64_U64_SZ              0x08
+#define	   I2O_SGL_FLAGS_CONTEXT64_U128_SZ             0x10
+#define	   I2O_SGL_FLAGS_CONTEXT64_U192_SZ             0x18
 
 /* SGL Attribute Element defines */
 
-#define    I2O_SGL_ATTRIBUTE_FLAGS_BIT_BUCKET_HINT     0x0400
-#define    I2O_SGL_ATTRIBUTE_FLAGS_IMMEDIATE_DATA_HINT 0x0200
-#define    I2O_SGL_ATTRIBUTE_FLAGS_LOCAL_ADDRESS_HINT  0x0100
-#define    I2O_SGL_ATTRIBUTE_FLAGS_32BIT_TRANSACTION   0x0000
-#define    I2O_SGL_ATTRIBUTE_FLAGS_64BIT_TRANSACTION   0x0004
-#define    I2O_SGL_ATTRIBUTE_FLAGS_32BIT_LOCAL_ADDRESS 0x0000
+#define	   I2O_SGL_ATTRIBUTE_FLAGS_BIT_BUCKET_HINT     0x0400
+#define	   I2O_SGL_ATTRIBUTE_FLAGS_IMMEDIATE_DATA_HINT 0x0200
+#define	   I2O_SGL_ATTRIBUTE_FLAGS_LOCAL_ADDRESS_HINT  0x0100
+#define	   I2O_SGL_ATTRIBUTE_FLAGS_32BIT_TRANSACTION   0x0000
+#define	   I2O_SGL_ATTRIBUTE_FLAGS_64BIT_TRANSACTION   0x0004
+#define	   I2O_SGL_ATTRIBUTE_FLAGS_32BIT_LOCAL_ADDRESS 0x0000
 
 /* SG Size defines */
 
-#define    I2O_SG_COUNT_SZ                             24
-#define    I2O_SG_FLAGS_SZ                             8
+#define	   I2O_SG_COUNT_SZ                             24
+#define	   I2O_SG_FLAGS_SZ                             8
 
 /* Standard Flags and Count fields for SG Elements */
 
@@ -951,16 +951,16 @@ typedef struct _I2O_SG_ELEMENT {
 
 /* Operation Function Numbers */
 
-#define   I2O_PARAMS_OPERATION_FIELD_GET               0x0001
-#define   I2O_PARAMS_OPERATION_LIST_GET                0x0002
-#define   I2O_PARAMS_OPERATION_MORE_GET                0x0003
-#define   I2O_PARAMS_OPERATION_SIZE_GET                0x0004
-#define   I2O_PARAMS_OPERATION_TABLE_GET               0x0005
-#define   I2O_PARAMS_OPERATION_FIELD_SET               0x0006
-#define   I2O_PARAMS_OPERATION_LIST_SET                0x0007
-#define   I2O_PARAMS_OPERATION_ROW_ADD                 0x0008
-#define   I2O_PARAMS_OPERATION_ROW_DELETE              0x0009
-#define   I2O_PARAMS_OPERATION_TABLE_CLEAR             0x000A
+#define	  I2O_PARAMS_OPERATION_FIELD_GET               0x0001
+#define	  I2O_PARAMS_OPERATION_LIST_GET                0x0002
+#define	  I2O_PARAMS_OPERATION_MORE_GET                0x0003
+#define	  I2O_PARAMS_OPERATION_SIZE_GET                0x0004
+#define	  I2O_PARAMS_OPERATION_TABLE_GET               0x0005
+#define	  I2O_PARAMS_OPERATION_FIELD_SET               0x0006
+#define	  I2O_PARAMS_OPERATION_LIST_SET                0x0007
+#define	  I2O_PARAMS_OPERATION_ROW_ADD                 0x0008
+#define	  I2O_PARAMS_OPERATION_ROW_DELETE              0x0009
+#define	  I2O_PARAMS_OPERATION_TABLE_CLEAR             0x000A
 
 /* Operations List Header */
 
@@ -1067,23 +1067,23 @@ typedef struct _I2O_PARAM_OPERATION_TABLE_CLEAR_TEMPLATE {
 
 /* Status codes and Error Information for Parameter functions */
 
-#define   I2O_PARAMS_STATUS_SUCCESS                0x00
-#define   I2O_PARAMS_STATUS_BAD_KEY_ABORT          0x01
-#define   I2O_PARAMS_STATUS_BAD_KEY_CONTINUE       0x02
-#define   I2O_PARAMS_STATUS_BUFFER_FULL            0x03
-#define   I2O_PARAMS_STATUS_BUFFER_TOO_SMALL       0x04
-#define   I2O_PARAMS_STATUS_FIELD_UNREADABLE       0x05
-#define   I2O_PARAMS_STATUS_FIELD_UNWRITEABLE      0x06
-#define   I2O_PARAMS_STATUS_INSUFFICIENT_FIELDS    0x07
-#define   I2O_PARAMS_STATUS_INVALID_GROUP_ID       0x08
-#define   I2O_PARAMS_STATUS_INVALID_OPERATION      0x09
-#define   I2O_PARAMS_STATUS_NO_KEY_FIELD           0x0A
-#define   I2O_PARAMS_STATUS_NO_SUCH_FIELD          0x0B
-#define   I2O_PARAMS_STATUS_NON_DYNAMIC_GROUP      0x0C
-#define   I2O_PARAMS_STATUS_OPERATION_ERROR        0x0D
-#define   I2O_PARAMS_STATUS_SCALAR_ERROR           0x0E
-#define   I2O_PARAMS_STATUS_TABLE_ERROR            0x0F
-#define   I2O_PARAMS_STATUS_WRONG_GROUP_TYPE       0x10
+#define	  I2O_PARAMS_STATUS_SUCCESS                0x00
+#define	  I2O_PARAMS_STATUS_BAD_KEY_ABORT          0x01
+#define	  I2O_PARAMS_STATUS_BAD_KEY_CONTINUE       0x02
+#define	  I2O_PARAMS_STATUS_BUFFER_FULL            0x03
+#define	  I2O_PARAMS_STATUS_BUFFER_TOO_SMALL       0x04
+#define	  I2O_PARAMS_STATUS_FIELD_UNREADABLE       0x05
+#define	  I2O_PARAMS_STATUS_FIELD_UNWRITEABLE      0x06
+#define	  I2O_PARAMS_STATUS_INSUFFICIENT_FIELDS    0x07
+#define	  I2O_PARAMS_STATUS_INVALID_GROUP_ID       0x08
+#define	  I2O_PARAMS_STATUS_INVALID_OPERATION      0x09
+#define	  I2O_PARAMS_STATUS_NO_KEY_FIELD           0x0A
+#define	  I2O_PARAMS_STATUS_NO_SUCH_FIELD          0x0B
+#define	  I2O_PARAMS_STATUS_NON_DYNAMIC_GROUP      0x0C
+#define	  I2O_PARAMS_STATUS_OPERATION_ERROR        0x0D
+#define	  I2O_PARAMS_STATUS_SCALAR_ERROR           0x0E
+#define	  I2O_PARAMS_STATUS_TABLE_ERROR            0x0F
+#define	  I2O_PARAMS_STATUS_WRONG_GROUP_TYPE       0x10
 
 
 /****************************************************************************/
@@ -1094,24 +1094,24 @@ typedef struct _I2O_PARAM_OPERATION_TABLE_CLEAR_TEMPLATE {
 
 /* Groups Numbers */
 
-#define    I2O_UTIL_PARAMS_DESCRIPTOR_GROUP_NO          0xF000
-#define    I2O_UTIL_PHYSICAL_DEVICE_TABLE_GROUP_NO      0xF001
-#define    I2O_UTIL_CLAIMED_TABLE_GROUP_NO              0xF002
-#define    I2O_UTIL_USER_TABLE_GROUP_NO                 0xF003
-#define    I2O_UTIL_PRIVATE_MESSAGE_EXTENSIONS_GROUP_NO 0xF005
-#define    I2O_UTIL_AUTHORIZED_USER_TABLE_GROUP_NO      0xF006
-#define    I2O_UTIL_DEVICE_IDENTITY_GROUP_NO            0xF100
-#define    I2O_UTIL_DDM_IDENTITY_GROUP_NO               0xF101
-#define    I2O_UTIL_USER_INFORMATION_GROUP_NO           0xF102
-#define    I2O_UTIL_SGL_OPERATING_LIMITS_GROUP_NO       0xF103
-#define    I2O_UTIL_SENSORS_GROUP_NO                    0xF200
+#define	   I2O_UTIL_PARAMS_DESCRIPTOR_GROUP_NO          0xF000
+#define	   I2O_UTIL_PHYSICAL_DEVICE_TABLE_GROUP_NO      0xF001
+#define	   I2O_UTIL_CLAIMED_TABLE_GROUP_NO              0xF002
+#define	   I2O_UTIL_USER_TABLE_GROUP_NO                 0xF003
+#define	   I2O_UTIL_PRIVATE_MESSAGE_EXTENSIONS_GROUP_NO 0xF005
+#define	   I2O_UTIL_AUTHORIZED_USER_TABLE_GROUP_NO      0xF006
+#define	   I2O_UTIL_DEVICE_IDENTITY_GROUP_NO            0xF100
+#define	   I2O_UTIL_DDM_IDENTITY_GROUP_NO               0xF101
+#define	   I2O_UTIL_USER_INFORMATION_GROUP_NO           0xF102
+#define	   I2O_UTIL_SGL_OPERATING_LIMITS_GROUP_NO       0xF103
+#define	   I2O_UTIL_SENSORS_GROUP_NO                    0xF200
 
 /* UTIL Group F000h - GROUP DESCRIPTORS Parameter Group */
 
-#define    I2O_UTIL_GROUP_PROPERTIES_GROUP_TABLE       0x01
-#define    I2O_UTIL_GROUP_PROPERTIES_ROW_ADDITION      0x02
-#define    I2O_UTIL_GROUP_PROPERTIES_ROW_DELETION      0x04
-#define    I2O_UTIL_GROUP_PROPERTIES_CLEAR_OPERATION   0x08
+#define	   I2O_UTIL_GROUP_PROPERTIES_GROUP_TABLE       0x01
+#define	   I2O_UTIL_GROUP_PROPERTIES_ROW_ADDITION      0x02
+#define	   I2O_UTIL_GROUP_PROPERTIES_ROW_DELETION      0x04
+#define	   I2O_UTIL_GROUP_PROPERTIES_CLEAR_OPERATION   0x08
 
 typedef struct _I2O_UTIL_GROUP_DESCRIPTOR_TABLE {
    U16                         GroupNumber;
@@ -1183,9 +1183,9 @@ typedef struct _I2O_UTIL_DDM_IDENTITY_SCALAR {
 
 /* UTIL Group F102h - User Information Parameter Group */
 
-#define    I2O_USER_DEVICE_NAME_SZ                     64
-#define    I2O_USER_SERVICE_NAME_SZ                    64
-#define    I2O_USER_PHYSICAL_LOCATION_SZ               64
+#define	   I2O_USER_DEVICE_NAME_SZ                     64
+#define	   I2O_USER_SERVICE_NAME_SZ                    64
+#define	   I2O_USER_PHYSICAL_LOCATION_SZ               64
 
 typedef struct _I2O_UTIL_USER_INFORMATION_SCALAR {
    U8                          DeviceName[I2O_USER_DEVICE_NAME_SZ];
@@ -1207,44 +1207,44 @@ typedef struct _I2O_UTIL_SGL_OPERATING_LIMITS_SCALAR {
 
 /* UTIL Group F200h - Sensors Parameter Group */
 
-#define    I2O_SENSOR_COMPONENT_OTHER                  0x00
-#define    I2O_SENSOR_COMPONENT_PLANAR_LOGIC_BOARD     0x01
-#define    I2O_SENSOR_COMPONENT_CPU                    0x02
-#define    I2O_SENSOR_COMPONENT_CHASSIS                0x03
-#define    I2O_SENSOR_COMPONENT_POWER_SUPPLY           0x04
-#define    I2O_SENSOR_COMPONENT_STORAGE                0x05
-#define    I2O_SENSOR_COMPONENT_EXTERNAL               0x06
-
-#define    I2O_SENSOR_SENSOR_CLASS_ANALOG              0x00
-#define    I2O_SENSOR_SENSOR_CLASS_DIGITAL             0x01
-
-#define    I2O_SENSOR_SENSOR_TYPE_OTHER                0x00
-#define    I2O_SENSOR_SENSOR_TYPE_THERMAL              0x01
-#define    I2O_SENSOR_SENSOR_TYPE_DC_VOLTAGE           0x02
-#define    I2O_SENSOR_SENSOR_TYPE_AC_VOLTAGE           0x03
-#define    I2O_SENSOR_SENSOR_TYPE_DC_CURRENT           0x04
-#define    I2O_SENSOR_SENSOR_TYPE_AC_CURRENT           0x05
-#define    I2O_SENSOR_SENSOR_TYPE_DOOR_OPEN            0x06
-#define    I2O_SENSOR_SENSOR_TYPE_FAN_OPERATIONAL      0x07
-
-#define    I2O_SENSOR_SENSOR_STATE_NORMAL              0x00
-#define    I2O_SENSOR_SENSOR_STATE_ABNORMAL            0x01
-#define    I2O_SENSOR_SENSOR_STATE_UNKNOWN             0x02
-#define    I2O_SENSOR_SENSOR_STATE_LOW_CAT             0x03
-#define    I2O_SENSOR_SENSOR_STATE_LOW                 0x04
-#define    I2O_SENSOR_SENSOR_STATE_LOW_WARNING         0x05
-#define    I2O_SENSOR_SENSOR_STATE_HIGH_WARNING        0x06
-#define    I2O_SENSOR_SENSOR_STATE_HIGH                0x07
-#define    I2O_SENSOR_SENSOR_STATE_HIGH_CAT            0x08
-
-#define    I2O_SENSOR_EVENT_ENABLE_STATE_CHANGE        0x0001
-#define    I2O_SENSOR_EVENT_ENABLE_LOW_CATASTROPHIC    0x0002
-#define    I2O_SENSOR_EVENT_ENABLE_LOW_READING         0x0004
-#define    I2O_SENSOR_EVENT_ENABLE_LOW_WARNING         0x0008
-#define    I2O_SENSOR_EVENT_ENABLE_CHANGE_TO_NORMAL    0x0010
-#define    I2O_SENSOR_EVENT_ENABLE_HIGH_WARNING        0x0020
-#define    I2O_SENSOR_EVENT_ENABLE_HIGH_READING        0x0040
-#define    I2O_SENSOR_EVENT_ENABLE_HIGH_CATASTROPHIC   0x0080
+#define	   I2O_SENSOR_COMPONENT_OTHER                  0x00
+#define	   I2O_SENSOR_COMPONENT_PLANAR_LOGIC_BOARD     0x01
+#define	   I2O_SENSOR_COMPONENT_CPU                    0x02
+#define	   I2O_SENSOR_COMPONENT_CHASSIS                0x03
+#define	   I2O_SENSOR_COMPONENT_POWER_SUPPLY           0x04
+#define	   I2O_SENSOR_COMPONENT_STORAGE                0x05
+#define	   I2O_SENSOR_COMPONENT_EXTERNAL               0x06
+
+#define	   I2O_SENSOR_SENSOR_CLASS_ANALOG              0x00
+#define	   I2O_SENSOR_SENSOR_CLASS_DIGITAL             0x01
+
+#define	   I2O_SENSOR_SENSOR_TYPE_OTHER                0x00
+#define	   I2O_SENSOR_SENSOR_TYPE_THERMAL              0x01
+#define	   I2O_SENSOR_SENSOR_TYPE_DC_VOLTAGE           0x02
+#define	   I2O_SENSOR_SENSOR_TYPE_AC_VOLTAGE           0x03
+#define	   I2O_SENSOR_SENSOR_TYPE_DC_CURRENT           0x04
+#define	   I2O_SENSOR_SENSOR_TYPE_AC_CURRENT           0x05
+#define	   I2O_SENSOR_SENSOR_TYPE_DOOR_OPEN            0x06
+#define	   I2O_SENSOR_SENSOR_TYPE_FAN_OPERATIONAL      0x07
+
+#define	   I2O_SENSOR_SENSOR_STATE_NORMAL              0x00
+#define	   I2O_SENSOR_SENSOR_STATE_ABNORMAL            0x01
+#define	   I2O_SENSOR_SENSOR_STATE_UNKNOWN             0x02
+#define	   I2O_SENSOR_SENSOR_STATE_LOW_CAT             0x03
+#define	   I2O_SENSOR_SENSOR_STATE_LOW                 0x04
+#define	   I2O_SENSOR_SENSOR_STATE_LOW_WARNING         0x05
+#define	   I2O_SENSOR_SENSOR_STATE_HIGH_WARNING        0x06
+#define	   I2O_SENSOR_SENSOR_STATE_HIGH                0x07
+#define	   I2O_SENSOR_SENSOR_STATE_HIGH_CAT            0x08
+
+#define	   I2O_SENSOR_EVENT_ENABLE_STATE_CHANGE        0x0001
+#define	   I2O_SENSOR_EVENT_ENABLE_LOW_CATASTROPHIC    0x0002
+#define	   I2O_SENSOR_EVENT_ENABLE_LOW_READING         0x0004
+#define	   I2O_SENSOR_EVENT_ENABLE_LOW_WARNING         0x0008
+#define	   I2O_SENSOR_EVENT_ENABLE_CHANGE_TO_NORMAL    0x0010
+#define	   I2O_SENSOR_EVENT_ENABLE_HIGH_WARNING        0x0020
+#define	   I2O_SENSOR_EVENT_ENABLE_HIGH_READING        0x0040
+#define	   I2O_SENSOR_EVENT_ENABLE_HIGH_CATASTROPHIC   0x0080
 
 
 typedef struct _I2O_UTIL_SENSORS_TABLE {
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index 77bde2b..1f18ad9 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -81,9 +81,9 @@
  ****************************************************************/
 
 #ifndef __INCi2otypesh
-#define __INCi2otypesh
+#define	__INCi2otypesh
 
-#define I2OTYPES_REV 1_5_4
+#define	I2OTYPES_REV 1_5_4
 
 /* include architecture/compiler dependencies */
 
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index dec2e3c..de9cb7d 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -88,9 +88,9 @@
  **********************************************************************/
 
 #if !defined(I2O_UTILITY_HDR)
-#define I2O_UTILITY_HDR
+#define	I2O_UTILITY_HDR
 
-#define I2OUTIL_REV 1_5_4  /* I2OUtil header file revision string */
+#define	I2OUTIL_REV 1_5_4  /* I2OUtil header file revision string */
 
 #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
 # if (KERN_VERSION < 3)
@@ -129,33 +129,33 @@ PRAGMA_PACK_PUSH
 
 /* Utility Message class functions. */
 
-#define    I2O_UTIL_NOP                                0x00
-#define    I2O_UTIL_ABORT                              0x01
-#define    I2O_UTIL_CLAIM                              0x09
-#define    I2O_UTIL_CLAIM_RELEASE                      0x0B
-#define    I2O_UTIL_CONFIG_DIALOG                      0x10
-#define    I2O_UTIL_DEVICE_RESERVE                     0x0D
-#define    I2O_UTIL_DEVICE_RELEASE                     0x0F
-#define    I2O_UTIL_EVENT_ACKNOWLEDGE                  0x14
-#define    I2O_UTIL_EVENT_REGISTER                     0x13
-#define    I2O_UTIL_LOCK                               0x17
-#define    I2O_UTIL_LOCK_RELEASE                       0x19
-#define    I2O_UTIL_PARAMS_GET                         0x06
-#define    I2O_UTIL_PARAMS_SET                         0x05
-#define    I2O_UTIL_REPLY_FAULT_NOTIFY                 0x15
+#define	   I2O_UTIL_NOP                                0x00
+#define	   I2O_UTIL_ABORT                              0x01
+#define	   I2O_UTIL_CLAIM                              0x09
+#define	   I2O_UTIL_CLAIM_RELEASE                      0x0B
+#define	   I2O_UTIL_CONFIG_DIALOG                      0x10
+#define	   I2O_UTIL_DEVICE_RESERVE                     0x0D
+#define	   I2O_UTIL_DEVICE_RELEASE                     0x0F
+#define	   I2O_UTIL_EVENT_ACKNOWLEDGE                  0x14
+#define	   I2O_UTIL_EVENT_REGISTER                     0x13
+#define	   I2O_UTIL_LOCK                               0x17
+#define	   I2O_UTIL_LOCK_RELEASE                       0x19
+#define	   I2O_UTIL_PARAMS_GET                         0x06
+#define	   I2O_UTIL_PARAMS_SET                         0x05
+#define	   I2O_UTIL_REPLY_FAULT_NOTIFY                 0x15
 
 /****************************************************************************/
 
 /* ABORT Abort type defines. */
 
-#define    I2O_ABORT_TYPE_EXACT_ABORT                  0x00
-#define    I2O_ABORT_TYPE_FUNCTION_ABORT               0x01
-#define    I2O_ABORT_TYPE_TRANSACTION_ABORT            0x02
-#define    I2O_ABORT_TYPE_WILD_ABORT                   0x03
-#define    I2O_ABORT_TYPE_CLEAN_EXACT_ABORT            0x04
-#define    I2O_ABORT_TYPE_CLEAN_FUNCTION_ABORT         0x05
-#define    I2O_ABORT_TYPE_CLEAN_TRANSACTION_ABORT      0x06
-#define    I2O_ABORT_TYPE_CLEAN_WILD_ABORT             0x07
+#define	   I2O_ABORT_TYPE_EXACT_ABORT                  0x00
+#define	   I2O_ABORT_TYPE_FUNCTION_ABORT               0x01
+#define	   I2O_ABORT_TYPE_TRANSACTION_ABORT            0x02
+#define	   I2O_ABORT_TYPE_WILD_ABORT                   0x03
+#define	   I2O_ABORT_TYPE_CLEAN_EXACT_ABORT            0x04
+#define	   I2O_ABORT_TYPE_CLEAN_FUNCTION_ABORT         0x05
+#define	   I2O_ABORT_TYPE_CLEAN_TRANSACTION_ABORT      0x06
+#define	   I2O_ABORT_TYPE_CLEAN_WILD_ABORT             0x07
 
 /* UtilAbort Function Message Frame structure. */
 
@@ -184,19 +184,19 @@ typedef struct _I2O_UTIL_ABORT_REPLY {
 
 /* Claim Flag defines */
 
-#define    I2O_CLAIM_FLAGS_EXCLUSIVE                   0x0001 /* Reserved */
-#define    I2O_CLAIM_FLAGS_RESET_SENSITIVE             0x0002
-#define    I2O_CLAIM_FLAGS_STATE_SENSITIVE             0x0004
-#define    I2O_CLAIM_FLAGS_CAPACITY_SENSITIVE          0x0008
-#define    I2O_CLAIM_FLAGS_PEER_SERVICE_DISABLED       0x0010
-#define    I2O_CLAIM_FLAGS_MGMT_SERVICE_DISABLED       0x0020
+#define	   I2O_CLAIM_FLAGS_EXCLUSIVE                   0x0001 /* Reserved */
+#define	   I2O_CLAIM_FLAGS_RESET_SENSITIVE             0x0002
+#define	   I2O_CLAIM_FLAGS_STATE_SENSITIVE             0x0004
+#define	   I2O_CLAIM_FLAGS_CAPACITY_SENSITIVE          0x0008
+#define	   I2O_CLAIM_FLAGS_PEER_SERVICE_DISABLED       0x0010
+#define	   I2O_CLAIM_FLAGS_MGMT_SERVICE_DISABLED       0x0020
 
 /* Claim Type defines */
 
-#define    I2O_CLAIM_TYPE_PRIMARY_USER                 0x01
-#define    I2O_CLAIM_TYPE_AUTHORIZED_USER              0x02
-#define    I2O_CLAIM_TYPE_SECONDARY_USER               0x03
-#define    I2O_CLAIM_TYPE_MANAGEMENT_USER              0x04
+#define	   I2O_CLAIM_TYPE_PRIMARY_USER                 0x01
+#define	   I2O_CLAIM_TYPE_AUTHORIZED_USER              0x02
+#define	   I2O_CLAIM_TYPE_SECONDARY_USER               0x03
+#define	   I2O_CLAIM_TYPE_MANAGEMENT_USER              0x04
 
 /* UtilClaim Function Message Frame structure. */
 
@@ -213,7 +213,7 @@ typedef struct _I2O_UTIL_CLAIM_MESSAGE {
 
 /* Claim Release Flag defines */
 
-#define    I2O_RELEASE_FLAGS_CONDITIONAL               0x0001
+#define	   I2O_RELEASE_FLAGS_CONDITIONAL               0x0001
 
 /* UtilClaimRelease Function Message Frame structure. */
 
@@ -263,37 +263,37 @@ typedef struct _I2O_UTIL_EVENT_ACK_REPLY {
 
 /* Event Indicator Mask Flags */
 
-#define    I2O_EVENT_IND_STATE_CHANGE                  0x80000000
-#define    I2O_EVENT_IND_GENERAL_WARNING               0x40000000
-#define    I2O_EVENT_IND_CONFIGURATION_FLAG            0x20000000
-/* #define    I2O_EVENT_IND_RESERVE_RELEASE               0x10000000 */
-#define    I2O_EVENT_IND_LOCK_RELEASE                  0x10000000
-#define    I2O_EVENT_IND_CAPABILITY_CHANGE             0x08000000
-#define    I2O_EVENT_IND_DEVICE_RESET                  0x04000000
-#define    I2O_EVENT_IND_EVENT_MASK_MODIFIED           0x02000000
-#define    I2O_EVENT_IND_FIELD_MODIFIED                0x01000000
-#define    I2O_EVENT_IND_VENDOR_EVENT                  0x00800000
-#define    I2O_EVENT_IND_DEVICE_STATE                  0x00400000
+#define	   I2O_EVENT_IND_STATE_CHANGE                  0x80000000
+#define	   I2O_EVENT_IND_GENERAL_WARNING               0x40000000
+#define	   I2O_EVENT_IND_CONFIGURATION_FLAG            0x20000000
+/* #define	   I2O_EVENT_IND_RESERVE_RELEASE               0x10000000 */
+#define	   I2O_EVENT_IND_LOCK_RELEASE                  0x10000000
+#define	   I2O_EVENT_IND_CAPABILITY_CHANGE             0x08000000
+#define	   I2O_EVENT_IND_DEVICE_RESET                  0x04000000
+#define	   I2O_EVENT_IND_EVENT_MASK_MODIFIED           0x02000000
+#define	   I2O_EVENT_IND_FIELD_MODIFIED                0x01000000
+#define	   I2O_EVENT_IND_VENDOR_EVENT                  0x00800000
+#define	   I2O_EVENT_IND_DEVICE_STATE                  0x00400000
 
 /* Event Data for generic Events */
 
-#define    I2O_EVENT_STATE_CHANGE_NORMAL               0x00
-#define    I2O_EVENT_STATE_CHANGE_SUSPENDED            0x01
-#define    I2O_EVENT_STATE_CHANGE_RESTART              0x02
-#define    I2O_EVENT_STATE_CHANGE_NA_RECOVER           0x03
-#define    I2O_EVENT_STATE_CHANGE_NA_NO_RECOVER        0x04
-#define    I2O_EVENT_STATE_CHANGE_QUIESCE_REQUEST      0x05
-#define    I2O_EVENT_STATE_CHANGE_FAILED               0x10
-#define    I2O_EVENT_STATE_CHANGE_FAULTED              0x11
+#define	   I2O_EVENT_STATE_CHANGE_NORMAL               0x00
+#define	   I2O_EVENT_STATE_CHANGE_SUSPENDED            0x01
+#define	   I2O_EVENT_STATE_CHANGE_RESTART              0x02
+#define	   I2O_EVENT_STATE_CHANGE_NA_RECOVER           0x03
+#define	   I2O_EVENT_STATE_CHANGE_NA_NO_RECOVER        0x04
+#define	   I2O_EVENT_STATE_CHANGE_QUIESCE_REQUEST      0x05
+#define	   I2O_EVENT_STATE_CHANGE_FAILED               0x10
+#define	   I2O_EVENT_STATE_CHANGE_FAULTED              0x11
 
-#define    I2O_EVENT_GEN_WARNING_NORMAL                0x00
-#define    I2O_EVENT_GEN_WARNING_ERROR_THRESHOLD       0x01
-#define    I2O_EVENT_GEN_WARNING_MEDIA_FAULT           0x02
+#define	   I2O_EVENT_GEN_WARNING_NORMAL                0x00
+#define	   I2O_EVENT_GEN_WARNING_ERROR_THRESHOLD       0x01
+#define	   I2O_EVENT_GEN_WARNING_MEDIA_FAULT           0x02
 
-#define    I2O_EVENT_CAPABILITY_OTHER                  0x01
-#define    I2O_EVENT_CAPABILITY_CHANGED                0x02
+#define	   I2O_EVENT_CAPABILITY_OTHER                  0x01
+#define	   I2O_EVENT_CAPABILITY_CHANGED                0x02
 
-#define    I2O_EVENT_SENSOR_STATE_CHANGED              0x01
+#define	   I2O_EVENT_SENSOR_STATE_CHANGED              0x01
 
 
 /*  UtilEventRegister Function Message Frame structure */
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index 68ec3e7..d3c3b37 100644
--- a/sys/dev/asr/osd_defs.h
+++ b/sys/dev/asr/osd_defs.h
@@ -66,7 +66,7 @@
 #if defined (ZIL_CURSES)
 #define		_DPT_CURSES
 #else
-#define         _DPT_MOTIF
+#define	        _DPT_MOTIF
 #endif
 
   /* Redefine 'far' to nothing - no far pointer type required in UNIX */
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index 2ab1c4e..b619484 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef         __OSD_UNIX_H
-#define         __OSD_UNIX_H
+#define	        __OSD_UNIX_H
 
 /*File - OSD_UNIX.H */
 /*****************************************************************************/
@@ -56,60 +56,60 @@
 
 /* Definitions - Defines & Constants ---------------------------------------*/
 
-#define DPT_TurnAroundKey  0x01    /* TurnAround Message Type for engine      */
-#define DPT_EngineKey      0x02    /* Message Que and Type for engine         */
-#define DPT_LoggerKey      0x03    /* Message Type For Logger                 */
-#define DPT_CommEngineKey  0x04    /* Message Que Type Created                */
+#define	DPT_TurnAroundKey  0x01    /* TurnAround Message Type for engine      */
+#define	DPT_EngineKey      0x02    /* Message Que and Type for engine         */
+#define	DPT_LoggerKey      0x03    /* Message Type For Logger                 */
+#define	DPT_CommEngineKey  0x04    /* Message Que Type Created                */
  
-#define MSG_RECEIVE    0x40000000  /* Ored Into Logger PID For Return Msg     */
+#define	MSG_RECEIVE    0x40000000  /* Ored Into Logger PID For Return Msg     */
 
-#define ENGMSG_ECHO        0x00    /* Turnarround Echo Engine Message         */
-#define ENGMSG_OPEN        0x01    /* Turnarround Open Engine Message         */
-#define ENGMSG_CLOSE       0x02    /* Turnarround Close Engine Message        */
+#define	ENGMSG_ECHO        0x00    /* Turnarround Echo Engine Message         */
+#define	ENGMSG_OPEN        0x01    /* Turnarround Open Engine Message         */
+#define	ENGMSG_CLOSE       0x02    /* Turnarround Close Engine Message        */
 
   /* Message Que Creation Flags */
 
-#define MSG_URD            00400  
-#define MSG_UWR            00200  
-#define MSG_GRD            00040  
-#define MSG_GWR            00020  
-#define MSG_ORD            00004  
-#define MSG_OWR            00002  
-#define MSG_ALLRD          00444
-#define MSG_ALLWR          00222
+#define	MSG_URD            00400  
+#define	MSG_UWR            00200  
+#define	MSG_GRD            00040  
+#define	MSG_GWR            00020  
+#define	MSG_ORD            00004  
+#define	MSG_OWR            00002  
+#define	MSG_ALLRD          00444
+#define	MSG_ALLWR          00222
 
   /* Message Que Creation Flags */
 
-#define SHM_URD            00400  
-#define SHM_UWR            00200  
-#define SHM_GRD            00040  
-#define SHM_GWR            00020  
-#define SHM_ORD            00004  
-#define SHM_OWR            00002  
-#define SHM_ALLRD          00444
-#define SHM_ALLWR          00222
+#define	SHM_URD            00400  
+#define	SHM_UWR            00200  
+#define	SHM_GRD            00040  
+#define	SHM_GWR            00020  
+#define	SHM_ORD            00004  
+#define	SHM_OWR            00002  
+#define	SHM_ALLRD          00444
+#define	SHM_ALLWR          00222
 
   /* Program Exit Codes */
 
-#define ExitGoodStatus           0
-#define ExitBadParameter         1
-#define ExitSignalFail           3
-#define ExitMsqAllocFail         5
-#define ExitBuffAllocFail        6
-#define ExitMsgSendFail          8
-#define ExitMsgReceiveFail       9
+#define	ExitGoodStatus           0
+#define	ExitBadParameter         1
+#define	ExitSignalFail           3
+#define	ExitMsqAllocFail         5
+#define	ExitBuffAllocFail        6
+#define	ExitMsgSendFail          8
+#define	ExitMsgReceiveFail       9
 
-#define ExitEngOpenFail          10
-#define ExitDuplicateEngine      11
+#define	ExitEngOpenFail          10
+#define	ExitDuplicateEngine      11
 
-#define ExitCommAllocFail        12 
-#define ExitDuplicateCommEng     13
-#define ExitCommConnectFail      14
+#define	ExitCommAllocFail        12 
+#define	ExitDuplicateCommEng     13
+#define	ExitCommConnectFail      14
 
 #ifndef MAX_HAS
 
-#define MAX_HAS                  18
-#define MAX_NAME                 100
+#define	MAX_HAS                  18
+#define	MAX_NAME                 100
 
 #endif  /* ifndef MAX_HAS */
 
@@ -141,24 +141,24 @@ 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 MSG_DISCONNECT
-#define MSG_DISCONNECT  0x11L
-
-#define EATAUSRCMD     1
-#define DPT_SIGNATURE  2
-#define DPT_NUMCTRLS   3
-#define DPT_CTRLINFO   4
-#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	MSG_DISCONNECT  0x11L
+
+#define	EATAUSRCMD     1
+#define	DPT_SIGNATURE  2
+#define	DPT_NUMCTRLS   3
+#define	DPT_CTRLINFO   4
+#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	DPT_MAX_DMA_SEGS  32         /* Max used Scatter/Gather seg         */
 
@@ -187,55 +187,55 @@ typedef struct {
 # define _IO(x,y)	(0x0fff3900|y)
 #endif
 /* EATA PassThrough Command	*/
-#define EATAUSRCMD      _IOWR('D',65,EATA_CP)
+#define	EATAUSRCMD      _IOWR('D',65,EATA_CP)
 /* Get Signature Structure	*/
-#define DPT_SIGNATURE   _IOR('D',67,dpt_sig_S)
+#define	DPT_SIGNATURE   _IOR('D',67,dpt_sig_S)
 /* Get Number Of DPT Adapters	*/
-#define DPT_NUMCTRLS    _IOR('D',68,int)
+#define	DPT_NUMCTRLS    _IOR('D',68,int)
 /* Get Adapter Info Structure	*/
-#define DPT_CTRLINFO    _IOR('D',69,CtrlInfo)
+#define	DPT_CTRLINFO    _IOR('D',69,CtrlInfo)
 /* Get System Info Structure	*/
-#define DPT_SYSINFO     _IOR('D',72,sysInfo_S)
+#define	DPT_SYSINFO     _IOR('D',72,sysInfo_S)
 /* Get Blink LED Code	        */
-#define DPT_BLINKLED    _IOR('D',75,int)
+#define	DPT_BLINKLED    _IOR('D',75,int)
 /* Get Statistical information (if available) */
-#define DPT_STATS_INFO        _IOR('D',80,STATS_DATA)
+#define	DPT_STATS_INFO        _IOR('D',80,STATS_DATA)
 /* Clear the statistical information          */
-#define DPT_STATS_CLEAR       _IO('D',81)
+#define	DPT_STATS_CLEAR       _IO('D',81)
 /* Send an I2O command */
-#define I2OUSRCMD	_IO('D',76)
+#define	I2OUSRCMD	_IO('D',76)
 /* Inform driver to re-acquire LCT information */
-#define I2ORESCANCMD	_IO('D',77)
+#define	I2ORESCANCMD	_IO('D',77)
 /* Inform driver to reset adapter */
-#define I2ORESETCMD	_IO('D',78)
+#define	I2ORESETCMD	_IO('D',78)
 
 #elif defined (SNI_MIPS)
   /* Unix Ioctl Command definitions */
 
-#define EATAUSRCMD     (('D'<<8)|65)
-#define DPT_DEBUG      (('D'<<8)|66)
-#define DPT_SIGNATURE  (('D'<<8)|67)
-#define DPT_NUMCTRLS   (('D'<<8)|68)
-#define DPT_CTRLINFO   (('D'<<8)|69)
-#define DPT_STATINFO   (('D'<<8)|70)
-#define DPT_CLRSTAT    (('D'<<8)|71)
-#define DPT_SYSINFO    (('D'<<8)|72)
+#define	EATAUSRCMD     (('D'<<8)|65)
+#define	DPT_DEBUG      (('D'<<8)|66)
+#define	DPT_SIGNATURE  (('D'<<8)|67)
+#define	DPT_NUMCTRLS   (('D'<<8)|68)
+#define	DPT_CTRLINFO   (('D'<<8)|69)
+#define	DPT_STATINFO   (('D'<<8)|70)
+#define	DPT_CLRSTAT    (('D'<<8)|71)
+#define	DPT_SYSINFO    (('D'<<8)|72)
 /* Set Timeout Value		*/
-#define DPT_TIMEOUT    (('D'<<8)|73)
+#define	DPT_TIMEOUT    (('D'<<8)|73)
 /* Get config Data  		*/
-#define DPT_CONFIG     (('D'<<8)|74)
+#define	DPT_CONFIG     (('D'<<8)|74)
 /* Get config Data  		*/
-#define DPT_BLINKLED   (('D'<<8)|75)
+#define	DPT_BLINKLED   (('D'<<8)|75)
 /* Get Statistical information (if available) */
-#define DPT_STATS_INFO        (('D'<<8)|80)
+#define	DPT_STATS_INFO        (('D'<<8)|80)
 /* Clear the statistical information          */
-#define DPT_STATS_CLEAR       (('D'<<8)|81)
+#define	DPT_STATS_CLEAR       (('D'<<8)|81)
 /* Send an I2O command */
-#define I2OUSRCMD	(('D'<<8)|76)
+#define	I2OUSRCMD	(('D'<<8)|76)
 /* Inform driver to re-acquire LCT information */
-#define I2ORESCANCMD	(('D'<<8)|77)
+#define	I2ORESCANCMD	(('D'<<8)|77)
 /* Inform driver to reset adapter */
-#define I2ORESETCMD	(('D'<<8)|78)
+#define	I2ORESETCMD	(('D'<<8)|78)
 
 #else  
 
@@ -262,45 +262,45 @@ typedef struct {
 # define _IO(x,y)	(((x)<<8)|y)
 #endif
 /* EATA PassThrough Command	*/
-#define EATAUSRCMD      _IOWR('D',65,EATA_CP)
+#define	EATAUSRCMD      _IOWR('D',65,EATA_CP)
 /* Set Debug Level If Enabled	*/
-#define DPT_DEBUG       _IOW('D',66,int)
+#define	DPT_DEBUG       _IOW('D',66,int)
 /* Get Signature Structure	*/
-#define DPT_SIGNATURE   _IOR('D',67,dpt_sig_S)
+#define	DPT_SIGNATURE   _IOR('D',67,dpt_sig_S)
 #if defined __bsdi__
-#define DPT_SIGNATURE_PACKED   _IOR('D',67,dpt_sig_S_Packed)
+#define	DPT_SIGNATURE_PACKED   _IOR('D',67,dpt_sig_S_Packed)
 #endif
 /* Get Number Of DPT Adapters	*/
-#define DPT_NUMCTRLS    _IOR('D',68,int)
+#define	DPT_NUMCTRLS    _IOR('D',68,int)
 /* Get Adapter Info Structure	*/
-#define DPT_CTRLINFO    _IOR('D',69,CtrlInfo)
+#define	DPT_CTRLINFO    _IOR('D',69,CtrlInfo)
 /* Get Statistics If Enabled	*/
-#define DPT_STATINFO    _IO('D',70)
+#define	DPT_STATINFO    _IO('D',70)
 /* Clear Stats If Enabled	*/
-#define DPT_CLRSTAT     _IO('D',71)
+#define	DPT_CLRSTAT     _IO('D',71)
 /* Get System Info Structure	*/
-#define DPT_SYSINFO     _IOR('D',72,sysInfo_S)
+#define	DPT_SYSINFO     _IOR('D',72,sysInfo_S)
 /* Set Timeout Value		*/
-#define DPT_TIMEOUT     _IO('D',73)
+#define	DPT_TIMEOUT     _IO('D',73)
 /* Get config Data  		*/
-#define DPT_CONFIG      _IO('D',74)
+#define	DPT_CONFIG      _IO('D',74)
 /* Get Blink LED Code	        */
-#define DPT_BLINKLED    _IOR('D',75,int)
+#define	DPT_BLINKLED    _IOR('D',75,int)
 /* Get Statistical information (if available) */
-#define DPT_STATS_INFO        _IOR('D',80,STATS_DATA)
+#define	DPT_STATS_INFO        _IOR('D',80,STATS_DATA)
 /* Clear the statistical information          */
-#define DPT_STATS_CLEAR       _IO('D',81)
+#define	DPT_STATS_CLEAR       _IO('D',81)
 /* Get Performance metrics */
-#define DPT_PERF_INFO        _IOR('D',82,dpt_perf_t)
+#define	DPT_PERF_INFO        _IOR('D',82,dpt_perf_t)
 /* Send an I2O command */
-#define I2OUSRCMD	_IO('D',76)
+#define	I2OUSRCMD	_IO('D',76)
 /* Inform driver to re-acquire LCT information */
-#define I2ORESCANCMD	_IO('D',77)
+#define	I2ORESCANCMD	_IO('D',77)
 /* Inform driver to reset adapter */
-#define I2ORESETCMD	_IO('D',78)
+#define	I2ORESETCMD	_IO('D',78)
 #if defined _DPT_LINUX
 /* See if the target is mounted */
-#define DPT_TARGET_BUSY	_IOR('D',79, TARGET_BUSY_T)
+#define	DPT_TARGET_BUSY	_IOR('D',79, TARGET_BUSY_T)
 #endif
 
 
@@ -308,17 +308,17 @@ typedef struct {
 
 		 /* Adapter Flags Field Bit Definitions */
 
-#define CTLR_INSTALLED  0x00000001  /* Adapter Was Installed        */
-#define CTLR_DMA        0x00000002  /* DMA Supported                */
-#define CTLR_OVERLAP    0x00000004  /* Overlapped Commands Support  */
-#define CTLR_SECONDARY  0x00000008  /* I/O Address Not 0x1f0        */
-#define CTLR_BLINKLED   0x00000010  /* Adapter In Blink LED State   */
-#define CTLR_HBACI      0x00000020  /* Cache Inhibit Supported      */
-#define CTLR_CACHE      0x00000040  /* Adapter Has Cache            */
-#define CTLR_SANE       0x00000080  /* Adapter Functioning OK       */
-#define CTLR_BUS_QUIET  0x00000100  /* Bus Quite On This Adapter    */
-#define CTLR_ABOVE_16   0x00000200  /* Support For Mem. Above 16 MB */
-#define CTLR_SCAT_GATH  0x00000400  /* Scatter Gather Supported     */
+#define	CTLR_INSTALLED  0x00000001  /* Adapter Was Installed        */
+#define	CTLR_DMA        0x00000002  /* DMA Supported                */
+#define	CTLR_OVERLAP    0x00000004  /* Overlapped Commands Support  */
+#define	CTLR_SECONDARY  0x00000008  /* I/O Address Not 0x1f0        */
+#define	CTLR_BLINKLED   0x00000010  /* Adapter In Blink LED State   */
+#define	CTLR_HBACI      0x00000020  /* Cache Inhibit Supported      */
+#define	CTLR_CACHE      0x00000040  /* Adapter Has Cache            */
+#define	CTLR_SANE       0x00000080  /* Adapter Functioning OK       */
+#define	CTLR_BUS_QUIET  0x00000100  /* Bus Quite On This Adapter    */
+#define	CTLR_ABOVE_16   0x00000200  /* Support For Mem. Above 16 MB */
+#define	CTLR_SCAT_GATH  0x00000400  /* Scatter Gather Supported     */
 
 
 /* Definitions - Structure & Typedef ---------------------------------------*/
@@ -335,7 +335,7 @@ typedef struct {
 		 uLONG     timeOut;
 	       } MsgHdr;
 
-#define MsgDataSize sizeof(MsgHdr) - 4
+#define	MsgDataSize sizeof(MsgHdr) - 4
 
 #ifndef SNI_MIPS
 
@@ -407,24 +407,24 @@ typedef struct EATACommandPacket {
 
                       /* Control Flags 1 Definitions */
 
-#define SCSI_RESET        0x01       /* Cause a SCSI Bus reset on the cmd */
-#define HBA_INIT          0x02       /* Cause Controller to reInitialize  */
-#define AUTO_REQ_SENSE    0x04       /* Do Auto Request Sense on errors   */
-#define SCATTER_GATHER    0x08       /* Data Ptr points to a SG Packet    */
-#define INTERPRET         0x20       /* Interpret the SCSI cdb of own use */
-#define DATA_OUT          0x04       /* Data Out phase with command       */
-#define DATA_IN           0x08       /* Data In phase with command        */
+#define	SCSI_RESET        0x01       /* Cause a SCSI Bus reset on the cmd */
+#define	HBA_INIT          0x02       /* Cause Controller to reInitialize  */
+#define	AUTO_REQ_SENSE    0x04       /* Do Auto Request Sense on errors   */
+#define	SCATTER_GATHER    0x08       /* Data Ptr points to a SG Packet    */
+#define	INTERPRET         0x20       /* Interpret the SCSI cdb of own use */
+#define	DATA_OUT          0x04       /* Data Out phase with command       */
+#define	DATA_IN           0x08       /* Data In phase with command        */
 
                       /* Control Flags 2 Definitions */
 
-#define FIRMWARE_NESTED   0x01
+#define	FIRMWARE_NESTED   0x01
 
 
                       /* Control Flags 3 Definitions */
 
-#define PHYSICAL_UNIT     0x01       /* Send Command Directly To Target   */
-#define IAT               0x02       /* Inhibit Address Translation       */
-#define HBACI             0x04       /* Inhibit Caching                   */
+#define	PHYSICAL_UNIT     0x01       /* Send Command Directly To Target   */
+#define	IAT               0x02       /* Inhibit Address Translation       */
+#define	HBACI             0x04       /* Inhibit Caching                   */
 
 
   /* Structure Returned From Get Controller Info                             */
@@ -479,8 +479,8 @@ typedef struct {
 
 #define	SDI_IOC        (('S'<<24)|('D'<<16)|('I'<<8))
 
-#define SDI_HBANAME    ((SDI_IOC)|0x14) /* Get HBA module name      */
-#define SDI_SEND       0x0081           /* Send a SCSI command      */
+#define	SDI_HBANAME    ((SDI_IOC)|0x14) /* Get HBA module name      */
+#define	SDI_SEND       0x0081           /* Send a SCSI command      */
 
 #else
 
@@ -545,8 +545,8 @@ typedef struct dpt_cfg {
 #endif /* _DPT_AIX */
 
 
-#define MAX_ELEMENT_COUNT        64
-#define MAX_BUCKET_COUNT         10
+#define	MAX_ELEMENT_COUNT        64
+#define	MAX_BUCKET_COUNT         10
 
 /*
  * DPT statistics structure definitions
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index b054f0a..a8e2703 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef         __OSD_UTIL_H
-#define         __OSD_UTIL_H
+#define	        __OSD_UTIL_H
 
 /*File - OSD_UTIL.H
  ****************************************************************************
@@ -56,25 +56,25 @@
 /* Operating system selections: */
 /*----------------------------- */
 
-/*#define               _DPT_MSDOS      */
-/*#define               _DPT_WIN_3X     */
-/*#define               _DPT_WIN_4X     */
-/*#define               _DPT_WIN_NT     */
-/*#define               _DPT_NETWARE    */
-/*#define               _DPT_OS2        */
-/*#define               _DPT_SCO        */
-/*#define               _DPT_UNIXWARE   */
-/*#define               _DPT_SOLARIS    */
-/*#define               _DPT_NEXTSTEP   */
-/*#define               _DPT_BANYAN     */
+/*#define	              _DPT_MSDOS      */
+/*#define	              _DPT_WIN_3X     */
+/*#define	              _DPT_WIN_4X     */
+/*#define	              _DPT_WIN_NT     */
+/*#define	              _DPT_NETWARE    */
+/*#define	              _DPT_OS2        */
+/*#define	              _DPT_SCO        */
+/*#define	              _DPT_UNIXWARE   */
+/*#define	              _DPT_SOLARIS    */
+/*#define	              _DPT_NEXTSTEP   */
+/*#define	              _DPT_BANYAN     */
 
 /*-------------------------------- */
 /* Include the OS specific defines */
 /*-------------------------------- */
 
-/*#define       OS_SELECTION    From Above List */
-/*#define       SEMAPHORE_T     ??? */
-/*#define       DLL_HANDLE_T    ??? */
+/*#define	      OS_SELECTION    From Above List */
+/*#define	      SEMAPHORE_T     ??? */
+/*#define	      DLL_HANDLE_T    ??? */
 
 #if (defined(KERNEL) && defined(__bsdi__))
 # include        "i386/isa/dpt_osd_defs.h"
@@ -89,19 +89,19 @@
 #endif
 
 #ifndef DPT_UNALIGNED
-   #define      DPT_UNALIGNED
+   #define	     DPT_UNALIGNED
 #endif
 
 #ifndef DPT_EXPORT
-   #define      DPT_EXPORT
+   #define	     DPT_EXPORT
 #endif
 
 #ifndef DPT_IMPORT
-   #define      DPT_IMPORT
+   #define	     DPT_IMPORT
 #endif
 
 #ifndef DPT_RUNTIME_IMPORT
-   #define      DPT_RUNTIME_IMPORT  DPT_IMPORT
+   #define	     DPT_RUNTIME_IMPORT  DPT_IMPORT
 #endif
 
 /*--------------------- */
@@ -109,30 +109,30 @@
 /*--------------------- */
 
 #if defined (_DPT_MSDOS) || defined (_DPT_WIN_3X)
-   #define      _DPT_16_BIT
+   #define	     _DPT_16_BIT
 #else
-   #define      _DPT_32_BIT
+   #define	     _DPT_32_BIT
 #endif
 
 #if defined (_DPT_SCO) || defined (_DPT_UNIXWARE) || defined (_DPT_SOLARIS) || defined (_DPT_AIX) || defined (SNI_MIPS) || defined (_DPT_BSDI) || defined (_DPT_FREE_BSD) || defined(_DPT_LINUX)
-   #define      _DPT_UNIX
+   #define	     _DPT_UNIX
 #endif
 
 #if defined (_DPT_WIN_3x) || defined (_DPT_WIN_4X) || defined (_DPT_WIN_NT) \
 	    || defined (_DPT_OS2)
-   #define      _DPT_DLL_SUPPORT
+   #define	     _DPT_DLL_SUPPORT
 #endif
 
 #if !defined (_DPT_MSDOS) && !defined (_DPT_WIN_3X) && !defined (_DPT_NETWARE)
-   #define      _DPT_PREEMPTIVE
+   #define	     _DPT_PREEMPTIVE
 #endif
 
 #if !defined (_DPT_MSDOS) && !defined (_DPT_WIN_3X)
-   #define      _DPT_MULTI_THREADED
+   #define	     _DPT_MULTI_THREADED
 #endif
 
 #if !defined (_DPT_MSDOS)
-   #define      _DPT_MULTI_TASKING
+   #define	     _DPT_MULTI_TASKING
 #endif
 
   /* These exist for platforms that   */
@@ -141,16 +141,16 @@
 #if defined (SNI_MIPS) || defined (_DPT_SOLARIS)
    #if defined (_DPT_BIG_ENDIAN)
 	#if !defined (_DPT_STRICT_ALIGN)
-            #define _DPT_STRICT_ALIGN
+            #define	_DPT_STRICT_ALIGN
 	#endif
    #endif
 #endif
 
   /* Determine if in C or C++ mode */
 #ifdef  __cplusplus
-   #define      _DPT_CPP
+   #define	     _DPT_CPP
 #else
-   #define      _DPT_C
+   #define	     _DPT_C
 #endif
 
 /*-------------------------------------------------------------------*/
@@ -169,11 +169,11 @@
 /*-------------------------------------------------------------------*/
 #if !defined (DPTSQO)
    #if defined (_DPT_SOLARIS)
-      #define DPTSQO
-      #define DPTSQC
+      #define	DPTSQO
+      #define	DPTSQC
    #else
-      #define DPTSQO {
-      #define DPTSQC }
+      #define	DPTSQO {
+      #define	DPTSQC }
    #endif  /* solaris */
 #endif  /* DPTSQO */
 
@@ -183,12 +183,12 @@
 /*---------------------- */
 
 #if defined (_DPT_MSDOS) || defined (_DPT_SCO)
-   #define BYTE unsigned char
-   #define WORD unsigned short
+   #define	BYTE unsigned char
+   #define	WORD unsigned short
 #endif
 
 #ifndef _DPT_TYPEDEFS
-   #define _DPT_TYPEDEFS
+   #define	_DPT_TYPEDEFS
    typedef unsigned char   uCHAR;
    typedef unsigned short  uSHORT;
    typedef unsigned int    uINT;
@@ -202,7 +202,7 @@
 #endif
 
 #if !defined (NULL)
-   #define      NULL    0
+   #define	     NULL    0
 #endif
 
 
@@ -235,7 +235,7 @@
 	 return *inLong = DPT_Bswapl(*inLong);
 	 }
    #else
-	 #define osdSwap4(inLong)       DPT_Bswapl(inLong)
+	 #define	osdSwap4(inLong)       DPT_Bswapl(inLong)
    #endif  /* cplusplus */
 #else
 	/* Reverses the byte ordering of a 4 byte variable */
@@ -262,7 +262,7 @@
  * We will enclose all structure       *
  * portability modifications inside    *
  * #ifdefs.  When we are ready, we     *
- * will #define DPT_PORTABLE to begin  *
+ * will #define	DPT_PORTABLE to begin  *
  * using the modifications.            *
  *-------------------------------------*/
 uLONG	netSwap4(uLONG val);
@@ -272,11 +272,11 @@ uLONG	netSwap4(uLONG val);
 /* for big-endian we need to swap */
 
 #ifndef NET_SWAP_2
-#define NET_SWAP_2(x) (((x) >> 8) | ((x) << 8))
+#define	NET_SWAP_2(x) (((x) >> 8) | ((x) << 8))
 #endif  /* NET_SWAP_2 */
 
 #ifndef NET_SWAP_4
-#define NET_SWAP_4(x) netSwap4((x))
+#define	NET_SWAP_4(x) netSwap4((x))
 #endif  /* NET_SWAP_4 */
 
 #else
@@ -284,11 +284,11 @@ uLONG	netSwap4(uLONG val);
 /* for little-endian we don't need to do anything */
 
 #ifndef NET_SWAP_2
-#define NET_SWAP_2(x) (x)
+#define	NET_SWAP_2(x) (x)
 #endif  /* NET_SWAP_2 */
 
 #ifndef NET_SWAP_4
-#define NET_SWAP_4(x) (x)
+#define	NET_SWAP_4(x) (x)
 #endif  /* NET_SWAP_4 */
 
 #endif  /* big endian */
@@ -352,9 +352,9 @@ void osdWakeThread(uLONG);
 /* osd sleep for x miliseconds */
 void osdSleep(uLONG);
 
-#define DPT_THREAD_PRIORITY_LOWEST 0x00
-#define DPT_THREAD_PRIORITY_NORMAL 0x01
-#define DPT_THREAD_PRIORITY_HIGHEST 0x02
+#define	DPT_THREAD_PRIORITY_LOWEST 0x00
+#define	DPT_THREAD_PRIORITY_NORMAL 0x01
+#define	DPT_THREAD_PRIORITY_HIGHEST 0x02
 
 uCHAR osdSetThreadPriority(uLONG tid, uCHAR priority);
 
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index 2474d1e..1dc8bd8 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef         __SYS_INFO_H
-#define         __SYS_INFO_H
+#define	        __SYS_INFO_H
 
 /*File - SYS_INFO.H
  ****************************************************************************
@@ -119,24 +119,24 @@
  *---------------------------------------------------------------------------*/
 
 /*flags - bit definitions */
-#define SI_CMOS_Valid           0x0001
-#define SI_NumDrivesValid       0x0002
-#define SI_ProcessorValid       0x0004
-#define SI_MemorySizeValid      0x0008
-#define SI_DriveParamsValid     0x0010
-#define SI_SmartROMverValid     0x0020
-#define SI_OSversionValid       0x0040
-#define SI_OSspecificValid      0x0080  /* 1 if OS structure returned */
-#define SI_BusTypeValid         0x0100
-
-#define SI_ALL_VALID            0x0FFF  /* All Std SysInfo is valid */
-#define SI_NO_SmartROM          0x8000
+#define	SI_CMOS_Valid           0x0001
+#define	SI_NumDrivesValid       0x0002
+#define	SI_ProcessorValid       0x0004
+#define	SI_MemorySizeValid      0x0008
+#define	SI_DriveParamsValid     0x0010
+#define	SI_SmartROMverValid     0x0020
+#define	SI_OSversionValid       0x0040
+#define	SI_OSspecificValid      0x0080  /* 1 if OS structure returned */
+#define	SI_BusTypeValid         0x0100
+
+#define	SI_ALL_VALID            0x0FFF  /* All Std SysInfo is valid */
+#define	SI_NO_SmartROM          0x8000
 
 /*busType - definitions */
-#define SI_ISA_BUS      0x00
-#define SI_MCA_BUS      0x01
-#define SI_EISA_BUS     0x02
-#define SI_PCI_BUS      0x04
+#define	SI_ISA_BUS      0x00
+#define	SI_MCA_BUS      0x01
+#define	SI_EISA_BUS     0x02
+#define	SI_PCI_BUS      0x04
 
 #ifdef  __cplusplus
    struct sysInfo_S {
@@ -197,8 +197,8 @@
  *---------------------------------------------------------------------------*/
 
 /*flags - bit definitions */
-#define DI_DOS_HIGH             0x01    /* DOS is loaded high */
-#define DI_DPMI_VALID           0x02    /* DPMI version is valid */
+#define	DI_DOS_HIGH             0x01    /* DOS is loaded high */
+#define	DI_DPMI_VALID           0x02    /* DPMI version is valid */
 
 #ifdef  __cplusplus
    struct DOS_Info_S {
@@ -463,16 +463,16 @@ typedef struct dpt_metrics {
 	u_int32_t	write_by_size_max_time[10];
 	struct timeval	write_by_size_total_time[10];
 
-#define SIZE_512        0
-#define SIZE_1K         1
-#define SIZE_2K         2
-#define SIZE_4K         3
-#define SIZE_8K         4
-#define SIZE_16K        5
-#define SIZE_32K        6
-#define SIZE_64K        7
-#define SIZE_BIGGER     8
-#define SIZE_OTHER      9
+#define	SIZE_512        0
+#define	SIZE_1K         1
+#define	SIZE_2K         2
+#define	SIZE_4K         3
+#define	SIZE_8K         4
+#define	SIZE_16K        5
+#define	SIZE_32K        6
+#define	SIZE_64K        7
+#define	SIZE_BIGGER     8
+#define	SIZE_OTHER      9
 
 	struct timeval	intr_started;
 } dpt_perf_t;
author	obrien <obrien@FreeBSD.org>	2002-05-14 00:53:08 +0000
committer	obrien <obrien@FreeBSD.org>	2002-05-14 00:53:08 +0000
commit	a10b57ba71436bf6decc5f2145b924efa1d53d3e (patch)
tree	e521fa9522b350f15cd0b36779a3a6722f5a9b81 /sys/dev/asr
parent	b028831d22d44b921c59e2a69aa1e904459aac6d (diff)
download	FreeBSD-src-a10b57ba71436bf6decc5f2145b924efa1d53d3e.zip FreeBSD-src-a10b57ba71436bf6decc5f2145b924efa1d53d3e.tar.gz