Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / char / rio / cmdpkt.h

diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h
index 46befd3..357ae57 100644 (file)
--- a/drivers/char/rio/cmdpkt.h
+++ b/drivers/char/rio/cmdpkt.h
@@ -54,135 +54,112 @@ static char *_cmdpkt_h_sccs_ = "@(#)cmdpkt.h      1.2";
 ** This structure overlays a PktCmd->CmdData structure, and so starts
 ** at Data[2] in the actual pkt!
 */
-struct BootSequence
-{
-    WORD       NumPackets;
-    WORD       LoadBase;
-    WORD       CodeSize;
+struct BootSequence {
+       u16 NumPackets;
+       u16 LoadBase;
+       u16 CodeSize;
 };
 
 #define        BOOT_SEQUENCE_LEN       8
 
-struct SamTop
-{
-    BYTE Unit;
-    BYTE Link;
+struct SamTop {
+       u8 Unit;
+       u8 Link;
 };
 
-struct CmdHdr
-{
-    BYTE PcCommand;
-    union
-    {
-    BYTE PcPhbNum;
-    BYTE PcLinkNum;
-    BYTE PcIDNum;
-    } U0;
+struct CmdHdr {
+       u8 PcCommand;
+       union {
+               u8 PcPhbNum;
+               u8 PcLinkNum;
+               u8 PcIDNum;
+       } U0;
 };
 
 
-struct PktCmd
-{
-    union
-    {
-       struct 
-       {
-           struct CmdHdr CmdHdr;
-           struct BootSequence PcBootSequence;
-       } S1;
-       struct
-       {
-           WORD PcSequence;
-           BYTE PcBootData[RTA_BOOT_DATA_SIZE];
-       } S2;
-       struct
-       {
-           WORD  __crud__;
-           BYTE  PcUniqNum[4];         /* this is really a uint. */
-           BYTE  PcModuleTypes;        /* what modules are fitted */
-       } S3;
-       struct
-       {
-           struct CmdHdr CmdHdr;
-           BYTE   __undefined__;
-           BYTE   PcModemStatus;
-           BYTE   PcPortStatus;
-           BYTE   PcSubCommand;        /* commands like mem or register dump */
-           WORD   PcSubAddr;           /* Address for command */
-           BYTE   PcSubData[64];       /* Date area for command */
-       } S4;
-       struct
-       {
-           struct CmdHdr CmdHdr;
-           BYTE   PcCommandText[1];
-           BYTE   __crud__[20];
-           BYTE   PcIDNum2;            /* It had to go somewhere! */
-       } S5;
-       struct
-       {
-           struct CmdHdr CmdHdr;
-           struct SamTop    Topology[LINKS_PER_UNIT];
-       } S6;
-    } U1;
+struct PktCmd {
+       union {
+               struct {
+                       struct CmdHdr CmdHdr;
+                       struct BootSequence PcBootSequence;
+               } S1;
+               struct {
+                       u16 PcSequence;
+                       u8 PcBootData[RTA_BOOT_DATA_SIZE];
+               } S2;
+               struct {
+                       u16 __crud__;
+                       u8 PcUniqNum[4];        /* this is really a uint. */
+                       u8 PcModuleTypes;       /* what modules are fitted */
+               } S3;
+               struct {
+                       struct CmdHdr CmdHdr;
+                       u8 __undefined__;
+                       u8 PcModemStatus;
+                       u8 PcPortStatus;
+                       u8 PcSubCommand;        /* commands like mem or register dump */
+                       u16 PcSubAddr;  /* Address for command */
+                       u8 PcSubData[64];       /* Date area for command */
+               } S4;
+               struct {
+                       struct CmdHdr CmdHdr;
+                       u8 PcCommandText[1];
+                       u8 __crud__[20];
+                       u8 PcIDNum2;    /* It had to go somewhere! */
+               } S5;
+               struct {
+                       struct CmdHdr CmdHdr;
+                       struct SamTop Topology[LINKS_PER_UNIT];
+               } S6;
+       } U1;
 };
 
-struct PktCmd_M
-{
-    union
-    {
-       struct 
-       {
-           struct
-           {
-               uchar PcCommand;
-               union
-               {
-                   uchar PcPhbNum;
-                   uchar PcLinkNum;
-                   uchar PcIDNum;
-               } U0;
-           } CmdHdr;
-           struct
-           {
-                ushort NumPackets;
-                ushort LoadBase;
-                ushort CodeSize;
-            } PcBootSequence;
-       } S1;
-       struct
-       {
-           ushort PcSequence;
-           uchar PcBootData[RTA_BOOT_DATA_SIZE];
-       } S2;
-       struct
-       {
-           ushort  __crud__;
-           uchar  PcUniqNum[4];                /* this is really a uint. */
-           uchar  PcModuleTypes;       /* what modules are fitted */
-       } S3;
-       struct
-       {
-           ushort  __cmd_hdr__;
-           uchar   __undefined__;
-           uchar   PcModemStatus;
-           uchar   PcPortStatus;
-           uchar   PcSubCommand;
-           ushort  PcSubAddr;
-           uchar   PcSubData[64];
-       } S4;
-       struct
-       {
-           ushort  __cmd_hdr__;
-           uchar   PcCommandText[1];
-           uchar   __crud__[20];
-           uchar   PcIDNum2;           /* Tacked on end */
-       } S5;
-       struct
-       {
-           ushort  __cmd_hdr__;
-           struct Top Topology[LINKS_PER_UNIT];
-       } S6;
-    } U1;
+struct PktCmd_M {
+       union {
+               struct {
+                       struct {
+                               u8 PcCommand;
+                               union {
+                                       u8 PcPhbNum;
+                                       u8 PcLinkNum;
+                                       u8 PcIDNum;
+                               } U0;
+                       } CmdHdr;
+                       struct {
+                               u16 NumPackets;
+                               u16 LoadBase;
+                               u16 CodeSize;
+                       } PcBootSequence;
+               } S1;
+               struct {
+                       u16 PcSequence;
+                       u8 PcBootData[RTA_BOOT_DATA_SIZE];
+               } S2;
+               struct {
+                       u16 __crud__;
+                       u8 PcUniqNum[4];        /* this is really a uint. */
+                       u8 PcModuleTypes;       /* what modules are fitted */
+               } S3;
+               struct {
+                       u16 __cmd_hdr__;
+                       u8 __undefined__;
+                       u8 PcModemStatus;
+                       u8 PcPortStatus;
+                       u8 PcSubCommand;
+                       u16 PcSubAddr;
+                       u8 PcSubData[64];
+               } S4;
+               struct {
+                       u16 __cmd_hdr__;
+                       u8 PcCommandText[1];
+                       u8 __crud__[20];
+                       u8 PcIDNum2;    /* Tacked on end */
+               } S5;
+               struct {
+                       u16 __cmd_hdr__;
+                       struct Top Topology[LINKS_PER_UNIT];
+               } S6;
+       } U1;
 };
 
 #define Command                U1.S1.CmdHdr.PcCommand