diff options
author | Andrew Morton <akpm@osdl.org> | 2006-01-11 15:17:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 21:42:14 -0500 |
commit | 8d8706e2f86d28814c1b40a116ffdeca35e4c949 (patch) | |
tree | 146567d7a807feb37a5368fbb4a6ee76d9d7bc7e /drivers/char/rio/daemon.h | |
parent | a9415644583ef344e02f84faf5fe24bfadb2af8e (diff) |
[PATCH] lindent rio drivers
Run all rio files through indent -kr -i8 -bri0 -l255, as requested by Alan.
rioboot.c and rioinit.c were skipped due to worrisome lindent warnings.
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/rio/daemon.h')
-rw-r--r-- | drivers/char/rio/daemon.h | 162 |
1 files changed, 73 insertions, 89 deletions
diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h index 62dba0e68b3e..28a991bd4fe6 100644 --- a/drivers/char/rio/daemon.h +++ b/drivers/char/rio/daemon.h | |||
@@ -44,18 +44,16 @@ static char *_daemon_h_sccs_ = "@(#)daemon.h 1.3"; | |||
44 | ** structures used on /dev/rio | 44 | ** structures used on /dev/rio |
45 | */ | 45 | */ |
46 | 46 | ||
47 | struct Error | 47 | struct Error { |
48 | { | 48 | uint Error; |
49 | uint Error; | 49 | uint Entry; |
50 | uint Entry; | 50 | uint Other; |
51 | uint Other; | ||
52 | }; | 51 | }; |
53 | 52 | ||
54 | struct DownLoad | 53 | struct DownLoad { |
55 | { | 54 | char *DataP; |
56 | char *DataP; | 55 | uint Count; |
57 | uint Count; | 56 | uint ProductCode; |
58 | uint ProductCode; | ||
59 | }; | 57 | }; |
60 | 58 | ||
61 | /* | 59 | /* |
@@ -66,46 +64,41 @@ struct DownLoad | |||
66 | #endif | 64 | #endif |
67 | 65 | ||
68 | #ifndef MAX_XP_CTRL_LEN | 66 | #ifndef MAX_XP_CTRL_LEN |
69 | #define MAX_XP_CTRL_LEN 16 /* ALSO IN PORT.H */ | 67 | #define MAX_XP_CTRL_LEN 16 /* ALSO IN PORT.H */ |
70 | #endif | 68 | #endif |
71 | 69 | ||
72 | struct PortSetup | 70 | struct PortSetup { |
73 | { | 71 | uint From; /* Set/Clear XP & IXANY Control from this port.... */ |
74 | uint From; /* Set/Clear XP & IXANY Control from this port.... */ | 72 | uint To; /* .... to this port */ |
75 | uint To; /* .... to this port */ | 73 | uint XpCps; /* at this speed */ |
76 | uint XpCps; /* at this speed */ | 74 | char XpOn[MAX_XP_CTRL_LEN]; /* this is the start string */ |
77 | char XpOn[MAX_XP_CTRL_LEN]; /* this is the start string */ | 75 | char XpOff[MAX_XP_CTRL_LEN]; /* this is the stop string */ |
78 | char XpOff[MAX_XP_CTRL_LEN]; /* this is the stop string */ | 76 | uchar IxAny; /* enable/disable IXANY */ |
79 | uchar IxAny; /* enable/disable IXANY */ | 77 | uchar IxOn; /* enable/disable IXON */ |
80 | uchar IxOn; /* enable/disable IXON */ | 78 | uchar Lock; /* lock port params */ |
81 | uchar Lock; /* lock port params */ | 79 | uchar Store; /* store params across closes */ |
82 | uchar Store; /* store params across closes */ | 80 | uchar Drain; /* close only when drained */ |
83 | uchar Drain; /* close only when drained */ | ||
84 | }; | 81 | }; |
85 | 82 | ||
86 | struct LpbReq | 83 | struct LpbReq { |
87 | { | 84 | uint Host; |
88 | uint Host; | 85 | uint Link; |
89 | uint Link; | 86 | struct LPB *LpbP; |
90 | struct LPB *LpbP; | ||
91 | }; | 87 | }; |
92 | 88 | ||
93 | struct RupReq | 89 | struct RupReq { |
94 | { | 90 | uint HostNum; |
95 | uint HostNum; | 91 | uint RupNum; |
96 | uint RupNum; | 92 | struct RUP *RupP; |
97 | struct RUP *RupP; | ||
98 | }; | 93 | }; |
99 | 94 | ||
100 | struct PortReq | 95 | struct PortReq { |
101 | { | 96 | uint SysPort; |
102 | uint SysPort; | 97 | struct Port *PortP; |
103 | struct Port *PortP; | ||
104 | }; | 98 | }; |
105 | 99 | ||
106 | struct StreamInfo | 100 | struct StreamInfo { |
107 | { | 101 | uint SysPort; |
108 | uint SysPort; | ||
109 | #if 0 | 102 | #if 0 |
110 | queue_t RQueue; | 103 | queue_t RQueue; |
111 | queue_t WQueue; | 104 | queue_t WQueue; |
@@ -115,68 +108,59 @@ struct StreamInfo | |||
115 | #endif | 108 | #endif |
116 | }; | 109 | }; |
117 | 110 | ||
118 | struct HostReq | 111 | struct HostReq { |
119 | { | 112 | uint HostNum; |
120 | uint HostNum; | 113 | struct Host *HostP; |
121 | struct Host *HostP; | ||
122 | }; | 114 | }; |
123 | 115 | ||
124 | struct HostDpRam | 116 | struct HostDpRam { |
125 | { | 117 | uint HostNum; |
126 | uint HostNum; | 118 | struct DpRam *DpRamP; |
127 | struct DpRam *DpRamP; | ||
128 | }; | 119 | }; |
129 | 120 | ||
130 | struct DebugCtrl | 121 | struct DebugCtrl { |
131 | { | 122 | uint SysPort; |
132 | uint SysPort; | 123 | uint Debug; |
133 | uint Debug; | 124 | uint Wait; |
134 | uint Wait; | ||
135 | }; | 125 | }; |
136 | 126 | ||
137 | struct MapInfo | 127 | struct MapInfo { |
138 | { | 128 | uint FirstPort; /* 8 ports, starting from this (tty) number */ |
139 | uint FirstPort; /* 8 ports, starting from this (tty) number */ | 129 | uint RtaUnique; /* reside on this RTA (unique number) */ |
140 | uint RtaUnique; /* reside on this RTA (unique number) */ | ||
141 | }; | 130 | }; |
142 | 131 | ||
143 | struct MapIn | 132 | struct MapIn { |
144 | { | 133 | uint NumEntries; /* How many port sets are we mapping? */ |
145 | uint NumEntries; /* How many port sets are we mapping? */ | 134 | struct MapInfo *MapInfoP; /* Pointer to (user space) info */ |
146 | struct MapInfo *MapInfoP; /* Pointer to (user space) info */ | ||
147 | }; | 135 | }; |
148 | 136 | ||
149 | struct SendPack | 137 | struct SendPack { |
150 | { | 138 | unsigned int PortNum; |
151 | unsigned int PortNum; | 139 | unsigned char Len; |
152 | unsigned char Len; | 140 | unsigned char Data[PKT_MAX_DATA_LEN]; |
153 | unsigned char Data[PKT_MAX_DATA_LEN]; | ||
154 | }; | 141 | }; |
155 | 142 | ||
156 | struct SpecialRupCmd | 143 | struct SpecialRupCmd { |
157 | { | 144 | struct PKT Packet; |
158 | struct PKT Packet; | 145 | unsigned short Host; |
159 | unsigned short Host; | 146 | unsigned short RupNum; |
160 | unsigned short RupNum; | ||
161 | }; | 147 | }; |
162 | 148 | ||
163 | struct IdentifyRta | 149 | struct IdentifyRta { |
164 | { | 150 | ulong RtaUnique; |
165 | ulong RtaUnique; | 151 | uchar ID; |
166 | uchar ID; | ||
167 | }; | 152 | }; |
168 | 153 | ||
169 | struct KillNeighbour | 154 | struct KillNeighbour { |
170 | { | 155 | ulong UniqueNum; |
171 | ulong UniqueNum; | 156 | uchar Link; |
172 | uchar Link; | ||
173 | }; | 157 | }; |
174 | 158 | ||
175 | struct rioVersion { | 159 | struct rioVersion { |
176 | char version[MAX_VERSION_LEN]; | 160 | char version[MAX_VERSION_LEN]; |
177 | char relid[MAX_VERSION_LEN]; | 161 | char relid[MAX_VERSION_LEN]; |
178 | int buildLevel; | 162 | int buildLevel; |
179 | char buildDate[MAX_VERSION_LEN]; | 163 | char buildDate[MAX_VERSION_LEN]; |
180 | }; | 164 | }; |
181 | 165 | ||
182 | 166 | ||
@@ -316,16 +300,16 @@ struct rioVersion { | |||
316 | #define RIO_SET_XP_CPS rIOCW(155,int) | 300 | #define RIO_SET_XP_CPS rIOCW(155,int) |
317 | #define RIO_GET_IXANY rIOCR(156,int) /* ixany allowed? */ | 301 | #define RIO_GET_IXANY rIOCR(156,int) /* ixany allowed? */ |
318 | #define RIO_SET_IXANY rIOCW(157,int) | 302 | #define RIO_SET_IXANY rIOCW(157,int) |
319 | #define RIO_SET_IXANY_ON rIOCN(158) /* allow ixany */ | 303 | #define RIO_SET_IXANY_ON rIOCN(158) /* allow ixany */ |
320 | #define RIO_SET_IXANY_OFF rIOCN(159) /* disallow ixany */ | 304 | #define RIO_SET_IXANY_OFF rIOCN(159) /* disallow ixany */ |
321 | #define RIO_GET_MODEM rIOCR(160,int) /* port is modem/direct line? */ | 305 | #define RIO_GET_MODEM rIOCR(160,int) /* port is modem/direct line? */ |
322 | #define RIO_SET_MODEM rIOCW(161,int) | 306 | #define RIO_SET_MODEM rIOCW(161,int) |
323 | #define RIO_SET_MODEM_ON rIOCN(162) /* port is a modem */ | 307 | #define RIO_SET_MODEM_ON rIOCN(162) /* port is a modem */ |
324 | #define RIO_SET_MODEM_OFF rIOCN(163) /* port is direct */ | 308 | #define RIO_SET_MODEM_OFF rIOCN(163) /* port is direct */ |
325 | #define RIO_GET_IXON rIOCR(164,int) /* ixon allowed? */ | 309 | #define RIO_GET_IXON rIOCR(164,int) /* ixon allowed? */ |
326 | #define RIO_SET_IXON rIOCW(165,int) | 310 | #define RIO_SET_IXON rIOCW(165,int) |
327 | #define RIO_SET_IXON_ON rIOCN(166) /* allow ixon */ | 311 | #define RIO_SET_IXON_ON rIOCN(166) /* allow ixon */ |
328 | #define RIO_SET_IXON_OFF rIOCN(167) /* disallow ixon */ | 312 | #define RIO_SET_IXON_OFF rIOCN(167) /* disallow ixon */ |
329 | 313 | ||
330 | #define RIO_GET_SIVIEW ((('s')<<8) | 106) /* backwards compatible with SI */ | 314 | #define RIO_GET_SIVIEW ((('s')<<8) | 106) /* backwards compatible with SI */ |
331 | 315 | ||