1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h
index 77cee8df68ef..b6445d3f1416 100644
--- a/drivers/char/rio/cmdpkt.h
+++ b/drivers/char/rio/cmdpkt.h
@@ -55,24 +55,24 @@ static char *_cmdpkt_h_sccs_ = "@(#)cmdpkt.h	1.2";
 ** at Data[2] in the actual pkt!
 */
 struct BootSequence {
-        WORD NumPackets;
+        u16 NumPackets;
-        WORD LoadBase;
+        u16 LoadBase;
-        WORD CodeSize;
+        u16 CodeSize;
 };
 #define BOOT_SEQUENCE_LEN       8
 struct SamTop {
-        BYTE Unit;
+        u8 Unit;
-        BYTE Link;
+        u8 Link;
 };
 struct CmdHdr {
-        BYTE PcCommand;
+        u8 PcCommand;
        union {
-                BYTE PcPhbNum;
+                u8 PcPhbNum;
-                BYTE PcLinkNum;
+                u8 PcLinkNum;
-                BYTE PcIDNum;
+                u8 PcIDNum;
        } U0;
 };
@@ -84,28 +84,28 @@ struct PktCmd {
                        struct BootSequence PcBootSequence;
                } S1;
                struct {
-                        WORD PcSequence;
+                        u16 PcSequence;
-                        BYTE PcBootData[RTA_BOOT_DATA_SIZE];
+                        u8 PcBootData[RTA_BOOT_DATA_SIZE];
                } S2;
                struct {
-                        WORD __crud__;
+                        u16 __crud__;
-                        BYTE PcUniqNum[4];      /* this is really a uint. */
+                        u8 PcUniqNum[4];        /* this is really a uint. */
-                        BYTE PcModuleTypes;     /* what modules are fitted */
+                        u8 PcModuleTypes;       /* what modules are fitted */
                } S3;
                struct {
                        struct CmdHdr CmdHdr;
-                        BYTE __undefined__;
+                        u8 __undefined__;
-                        BYTE PcModemStatus;
+                        u8 PcModemStatus;
-                        BYTE PcPortStatus;
+                        u8 PcPortStatus;
-                        BYTE PcSubCommand;      /* commands like mem or register dump */
+                        u8 PcSubCommand;        /* commands like mem or register dump */
-                        WORD PcSubAddr; /* Address for command */
+                        u16 PcSubAddr;  /* Address for command */
-                        BYTE PcSubData[64];     /* Date area for command */
+                        u8 PcSubData[64];       /* Date area for command */
                } S4;
                struct {
                        struct CmdHdr CmdHdr;
-                        BYTE PcCommandText[1];
+                        u8 PcCommandText[1];
-                        BYTE __crud__[20];
+                        u8 __crud__[20];
-                        BYTE PcIDNum2;  /* It had to go somewhere! */
+                        u8 PcIDNum2;    /* It had to go somewhere! */
                } S5;
                struct {
                        struct CmdHdr CmdHdr;

diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h index 77cee8df68ef..b6445d3f1416 100644 --- a/drivers/char/rio/cmdpkt.h +++ b/drivers/char/rio/cmdpkt.h
@@ -55,24 +55,24 @@ static char *_cmdpkt_h_sccs_ = "@(#)cmdpkt.h 1.2";
55	** at Data[2] in the actual pkt!	55	** at Data[2] in the actual pkt!
56	*/	56	*/
57	struct BootSequence {	57	struct BootSequence {
58	WORD NumPackets;	58	u16 NumPackets;
59	WORD LoadBase;	59	u16 LoadBase;
60	WORD CodeSize;	60	u16 CodeSize;
61	};	61	};
62		62
63	#define BOOT_SEQUENCE_LEN 8	63	#define BOOT_SEQUENCE_LEN 8
64		64
65	struct SamTop {	65	struct SamTop {
66	BYTE Unit;	66	u8 Unit;
67	BYTE Link;	67	u8 Link;
68	};	68	};
69		69
70	struct CmdHdr {	70	struct CmdHdr {
71	BYTE PcCommand;	71	u8 PcCommand;
72	union {	72	union {
73	BYTE PcPhbNum;	73	u8 PcPhbNum;
74	BYTE PcLinkNum;	74	u8 PcLinkNum;
75	BYTE PcIDNum;	75	u8 PcIDNum;
76	} U0;	76	} U0;
77	};	77	};
78		78
@@ -84,28 +84,28 @@ struct PktCmd {
84	struct BootSequence PcBootSequence;	84	struct BootSequence PcBootSequence;
85	} S1;	85	} S1;
86	struct {	86	struct {
87	WORD PcSequence;	87	u16 PcSequence;
88	BYTE PcBootData[RTA_BOOT_DATA_SIZE];	88	u8 PcBootData[RTA_BOOT_DATA_SIZE];
89	} S2;	89	} S2;
90	struct {	90	struct {
91	WORD __crud__;	91	u16 __crud__;
92	BYTE PcUniqNum[4]; /* this is really a uint. */	92	u8 PcUniqNum[4]; /* this is really a uint. */
93	BYTE PcModuleTypes; /* what modules are fitted */	93	u8 PcModuleTypes; /* what modules are fitted */
94	} S3;	94	} S3;
95	struct {	95	struct {
96	struct CmdHdr CmdHdr;	96	struct CmdHdr CmdHdr;
97	BYTE __undefined__;	97	u8 __undefined__;
98	BYTE PcModemStatus;	98	u8 PcModemStatus;
99	BYTE PcPortStatus;	99	u8 PcPortStatus;
100	BYTE PcSubCommand; /* commands like mem or register dump */	100	u8 PcSubCommand; /* commands like mem or register dump */
101	WORD PcSubAddr; /* Address for command */	101	u16 PcSubAddr; /* Address for command */
102	BYTE PcSubData[64]; /* Date area for command */	102	u8 PcSubData[64]; /* Date area for command */
103	} S4;	103	} S4;
104	struct {	104	struct {
105	struct CmdHdr CmdHdr;	105	struct CmdHdr CmdHdr;
106	BYTE PcCommandText[1];	106	u8 PcCommandText[1];
107	BYTE __crud__[20];	107	u8 __crud__[20];
108	BYTE PcIDNum2; /* It had to go somewhere! */	108	u8 PcIDNum2; /* It had to go somewhere! */
109	} S5;	109	} S5;
110	struct {	110	struct {
111	struct CmdHdr CmdHdr;	111	struct CmdHdr CmdHdr;