aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware/eicon/mntfunc.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-19 22:52:38 -0500
committerJoe Perches <joe@perches.com>2012-02-21 12:04:01 -0500
commit475be4d85a274d0961593db41cf85689db1d583c (patch)
treeb2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hardware/eicon/mntfunc.c
parent0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff)
isdn: whitespace coding style cleanup
isdn source code uses a not-current coding style. Update the coding style used on a per-line basis so that git diff -w shows only elided blank lines at EOF. Done with emacs and some scripts and some typing. Built x86 allyesconfig. No detected change in objdump -d or size. Signed-off-by: Joe Perches <joe@perches.com>
Diffstat (limited to 'drivers/isdn/hardware/eicon/mntfunc.c')
-rw-r--r--drivers/isdn/hardware/eicon/mntfunc.c186
1 files changed, 93 insertions, 93 deletions
diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c
index a564b7560031..d6072607305c 100644
--- a/drivers/isdn/hardware/eicon/mntfunc.c
+++ b/drivers/isdn/hardware/eicon/mntfunc.c
@@ -27,7 +27,7 @@ static dword notify_handle;
27static DESCRIPTOR DAdapter; 27static DESCRIPTOR DAdapter;
28static DESCRIPTOR MAdapter; 28static DESCRIPTOR MAdapter;
29static DESCRIPTOR MaintDescriptor = 29static DESCRIPTOR MaintDescriptor =
30 { IDI_DIMAINT, 0, 0, (IDI_CALL) diva_maint_prtComp }; 30{ IDI_DIMAINT, 0, 0, (IDI_CALL) diva_maint_prtComp };
31 31
32extern int diva_os_copy_to_user(void *os_handle, void __user *dst, 32extern int diva_os_copy_to_user(void *os_handle, void __user *dst,
33 const void *src, int length); 33 const void *src, int length);
@@ -44,7 +44,7 @@ static void no_printf(unsigned char *x, ...)
44/* 44/*
45 * DIDD callback function 45 * DIDD callback function
46 */ 46 */
47static void *didd_callback(void *context, DESCRIPTOR * adapter, 47static void *didd_callback(void *context, DESCRIPTOR *adapter,
48 int removal) 48 int removal)
49{ 49{
50 if (adapter->type == IDI_DADAPTER) { 50 if (adapter->type == IDI_DADAPTER) {
@@ -87,20 +87,20 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
87 memcpy(&DAdapter, &DIDD_Table[x], sizeof(DAdapter)); 87 memcpy(&DAdapter, &DIDD_Table[x], sizeof(DAdapter));
88 req.didd_notify.e.Req = 0; 88 req.didd_notify.e.Req = 0;
89 req.didd_notify.e.Rc = 89 req.didd_notify.e.Rc =
90 IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; 90 IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;
91 req.didd_notify.info.callback = (void *)didd_callback; 91 req.didd_notify.info.callback = (void *)didd_callback;
92 req.didd_notify.info.context = NULL; 92 req.didd_notify.info.context = NULL;
93 DAdapter.request((ENTITY *) & req); 93 DAdapter.request((ENTITY *)&req);
94 if (req.didd_notify.e.Rc != 0xff) 94 if (req.didd_notify.e.Rc != 0xff)
95 return (0); 95 return (0);
96 notify_handle = req.didd_notify.info.handle; 96 notify_handle = req.didd_notify.info.handle;
97 /* Register MAINT (me) */ 97 /* Register MAINT (me) */
98 req.didd_add_adapter.e.Req = 0; 98 req.didd_add_adapter.e.Req = 0;
99 req.didd_add_adapter.e.Rc = 99 req.didd_add_adapter.e.Rc =
100 IDI_SYNC_REQ_DIDD_ADD_ADAPTER; 100 IDI_SYNC_REQ_DIDD_ADD_ADAPTER;
101 req.didd_add_adapter.info.descriptor = 101 req.didd_add_adapter.info.descriptor =
102 (void *) &MaintDescriptor; 102 (void *) &MaintDescriptor;
103 DAdapter.request((ENTITY *) & req); 103 DAdapter.request((ENTITY *)&req);
104 if (req.didd_add_adapter.e.Rc != 0xff) 104 if (req.didd_add_adapter.e.Rc != 0xff)
105 return (0); 105 return (0);
106 } else if ((DIDD_Table[x].type > 0) 106 } else if ((DIDD_Table[x].type > 0)
@@ -121,13 +121,13 @@ static void DIVA_EXIT_FUNCTION disconnect_didd(void)
121 req.didd_notify.e.Req = 0; 121 req.didd_notify.e.Req = 0;
122 req.didd_notify.e.Rc = IDI_SYNC_REQ_DIDD_REMOVE_ADAPTER_NOTIFY; 122 req.didd_notify.e.Rc = IDI_SYNC_REQ_DIDD_REMOVE_ADAPTER_NOTIFY;
123 req.didd_notify.info.handle = notify_handle; 123 req.didd_notify.info.handle = notify_handle;
124 DAdapter.request((ENTITY *) & req); 124 DAdapter.request((ENTITY *)&req);
125 125
126 req.didd_remove_adapter.e.Req = 0; 126 req.didd_remove_adapter.e.Req = 0;
127 req.didd_remove_adapter.e.Rc = IDI_SYNC_REQ_DIDD_REMOVE_ADAPTER; 127 req.didd_remove_adapter.e.Rc = IDI_SYNC_REQ_DIDD_REMOVE_ADAPTER;
128 req.didd_remove_adapter.info.p_request = 128 req.didd_remove_adapter.info.p_request =
129 (IDI_CALL) MaintDescriptor.request; 129 (IDI_CALL) MaintDescriptor.request;
130 DAdapter.request((ENTITY *) & req); 130 DAdapter.request((ENTITY *)&req);
131} 131}
132 132
133/* 133/*
@@ -147,9 +147,9 @@ int maint_read_write(void __user *buf, int count)
147 return (-EFAULT); 147 return (-EFAULT);
148 } 148 }
149 149
150 cmd = *(dword *) & data[0]; /* command */ 150 cmd = *(dword *)&data[0]; /* command */
151 id = *(dword *) & data[4]; /* driver id */ 151 id = *(dword *)&data[4]; /* driver id */
152 mask = *(dword *) & data[8]; /* mask or size */ 152 mask = *(dword *)&data[8]; /* mask or size */
153 153
154 switch (cmd) { 154 switch (cmd) {
155 case DITRACE_CMD_GET_DRIVER_INFO: 155 case DITRACE_CMD_GET_DRIVER_INFO:
@@ -178,19 +178,19 @@ int maint_read_write(void __user *buf, int count)
178 } 178 }
179 break; 179 break;
180 180
181 /* 181 /*
182 Filter commands will ignore the ID due to fact that filtering affects 182 Filter commands will ignore the ID due to fact that filtering affects
183 the B- channel and Audio Tap trace levels only. Also MAINT driver will 183 the B- channel and Audio Tap trace levels only. Also MAINT driver will
184 select the right trace ID by itself 184 select the right trace ID by itself
185 */ 185 */
186 case DITRACE_WRITE_SELECTIVE_TRACE_FILTER: 186 case DITRACE_WRITE_SELECTIVE_TRACE_FILTER:
187 if (!mask) { 187 if (!mask) {
188 ret = diva_set_trace_filter (1, "*"); 188 ret = diva_set_trace_filter(1, "*");
189 } else if (mask < sizeof(data)) { 189 } else if (mask < sizeof(data)) {
190 if (diva_os_copy_from_user(NULL, data, (char __user *)buf+12, mask)) { 190 if (diva_os_copy_from_user(NULL, data, (char __user *)buf + 12, mask)) {
191 ret = -EFAULT; 191 ret = -EFAULT;
192 } else { 192 } else {
193 ret = diva_set_trace_filter ((int)mask, data); 193 ret = diva_set_trace_filter((int)mask, data);
194 } 194 }
195 } else { 195 } else {
196 ret = -EINVAL; 196 ret = -EINVAL;
@@ -198,8 +198,8 @@ int maint_read_write(void __user *buf, int count)
198 break; 198 break;
199 199
200 case DITRACE_READ_SELECTIVE_TRACE_FILTER: 200 case DITRACE_READ_SELECTIVE_TRACE_FILTER:
201 if ((ret = diva_get_trace_filter (sizeof(data), data)) > 0) { 201 if ((ret = diva_get_trace_filter(sizeof(data), data)) > 0) {
202 if (diva_os_copy_to_user (NULL, buf, data, ret)) 202 if (diva_os_copy_to_user(NULL, buf, data, ret))
203 ret = -EFAULT; 203 ret = -EFAULT;
204 } else { 204 } else {
205 ret = -ENODEV; 205 ret = -ENODEV;
@@ -207,88 +207,88 @@ int maint_read_write(void __user *buf, int count)
207 break; 207 break;
208 208
209 case DITRACE_READ_TRACE_ENTRY:{ 209 case DITRACE_READ_TRACE_ENTRY:{
210 diva_os_spin_lock_magic_t old_irql; 210 diva_os_spin_lock_magic_t old_irql;
211 word size; 211 word size;
212 diva_dbg_entry_head_t *pmsg; 212 diva_dbg_entry_head_t *pmsg;
213 byte *pbuf; 213 byte *pbuf;
214 214
215 if (!(pbuf = diva_os_malloc(0, mask))) { 215 if (!(pbuf = diva_os_malloc(0, mask))) {
216 return (-ENOMEM); 216 return (-ENOMEM);
217 } 217 }
218 218
219 for(;;) { 219 for (;;) {
220 if (!(pmsg = 220 if (!(pmsg =
221 diva_maint_get_message(&size, &old_irql))) { 221 diva_maint_get_message(&size, &old_irql))) {
222 break; 222 break;
223 } 223 }
224 if (size > mask) { 224 if (size > mask) {
225 diva_maint_ack_message(0, &old_irql); 225 diva_maint_ack_message(0, &old_irql);
226 ret = -EINVAL; 226 ret = -EINVAL;
227 break;
228 }
229 ret = size;
230 memcpy(pbuf, pmsg, size);
231 diva_maint_ack_message(1, &old_irql);
232 if ((count < size) ||
233 diva_os_copy_to_user (NULL, buf, (void *) pbuf, size))
234 ret = -EFAULT;
235 break; 227 break;
236 } 228 }
237 diva_os_free(0, pbuf); 229 ret = size;
230 memcpy(pbuf, pmsg, size);
231 diva_maint_ack_message(1, &old_irql);
232 if ((count < size) ||
233 diva_os_copy_to_user(NULL, buf, (void *) pbuf, size))
234 ret = -EFAULT;
235 break;
238 } 236 }
237 diva_os_free(0, pbuf);
238 }
239 break; 239 break;
240 240
241 case DITRACE_READ_TRACE_ENTRYS:{ 241 case DITRACE_READ_TRACE_ENTRYS:{
242 diva_os_spin_lock_magic_t old_irql; 242 diva_os_spin_lock_magic_t old_irql;
243 word size; 243 word size;
244 diva_dbg_entry_head_t *pmsg; 244 diva_dbg_entry_head_t *pmsg;
245 byte *pbuf = NULL; 245 byte *pbuf = NULL;
246 int written = 0; 246 int written = 0;
247 247
248 if (mask < 4096) { 248 if (mask < 4096) {
249 ret = -EINVAL; 249 ret = -EINVAL;
250 break;
251 }
252 if (!(pbuf = diva_os_malloc(0, mask))) {
253 return (-ENOMEM);
254 }
255
256 for (;;) {
257 if (!(pmsg =
258 diva_maint_get_message(&size, &old_irql))) {
250 break; 259 break;
251 } 260 }
252 if (!(pbuf = diva_os_malloc(0, mask))) { 261 if ((size + 8) > mask) {
253 return (-ENOMEM); 262 diva_maint_ack_message(0, &old_irql);
254 } 263 break;
255
256 for (;;) {
257 if (!(pmsg =
258 diva_maint_get_message(&size, &old_irql))) {
259 break;
260 }
261 if ((size + 8) > mask) {
262 diva_maint_ack_message(0, &old_irql);
263 break;
264 }
265 /*
266 Write entry length
267 */
268 pbuf[written++] = (byte) size;
269 pbuf[written++] = (byte) (size >> 8);
270 pbuf[written++] = 0;
271 pbuf[written++] = 0;
272 /*
273 Write message
274 */
275 memcpy(&pbuf[written], pmsg, size);
276 diva_maint_ack_message(1, &old_irql);
277 written += size;
278 mask -= (size + 4);
279 } 264 }
265 /*
266 Write entry length
267 */
268 pbuf[written++] = (byte) size;
269 pbuf[written++] = (byte) (size >> 8);
280 pbuf[written++] = 0; 270 pbuf[written++] = 0;
281 pbuf[written++] = 0; 271 pbuf[written++] = 0;
282 pbuf[written++] = 0; 272 /*
283 pbuf[written++] = 0; 273 Write message
274 */
275 memcpy(&pbuf[written], pmsg, size);
276 diva_maint_ack_message(1, &old_irql);
277 written += size;
278 mask -= (size + 4);
279 }
280 pbuf[written++] = 0;
281 pbuf[written++] = 0;
282 pbuf[written++] = 0;
283 pbuf[written++] = 0;
284 284
285 if ((count < written) || diva_os_copy_to_user(NULL, buf, (void *) pbuf, written)) { 285 if ((count < written) || diva_os_copy_to_user(NULL, buf, (void *) pbuf, written)) {
286 ret = -EFAULT; 286 ret = -EFAULT;
287 } else { 287 } else {
288 ret = written; 288 ret = written;
289 }
290 diva_os_free(0, pbuf);
291 } 289 }
290 diva_os_free(0, pbuf);
291 }
292 break; 292 break;
293 293
294 default: 294 default:
@@ -316,7 +316,7 @@ int DIVA_INIT_FUNCTION mntfunc_init(int *buffer_length, void **buffer,
316 } else { 316 } else {
317 while ((*buffer_length >= (64 * 1024)) 317 while ((*buffer_length >= (64 * 1024))
318 && 318 &&
319 (!(*buffer = diva_os_malloc (0, *buffer_length)))) { 319 (!(*buffer = diva_os_malloc(0, *buffer_length)))) {
320 *buffer_length -= 1024; 320 *buffer_length -= 1024;
321 } 321 }
322 322
@@ -328,7 +328,7 @@ int DIVA_INIT_FUNCTION mntfunc_init(int *buffer_length, void **buffer,
328 328
329 if (diva_maint_init(*buffer, *buffer_length, (diva_dbg_mem == 0))) { 329 if (diva_maint_init(*buffer, *buffer_length, (diva_dbg_mem == 0))) {
330 if (!diva_dbg_mem) { 330 if (!diva_dbg_mem) {
331 diva_os_free (0, *buffer); 331 diva_os_free(0, *buffer);
332 } 332 }
333 DBG_ERR(("init: maint init failed")); 333 DBG_ERR(("init: maint init failed"));
334 return (0); 334 return (0);
@@ -338,7 +338,7 @@ int DIVA_INIT_FUNCTION mntfunc_init(int *buffer_length, void **buffer,
338 DBG_ERR(("init: failed to connect to DIDD.")); 338 DBG_ERR(("init: failed to connect to DIDD."));
339 diva_maint_finit(); 339 diva_maint_finit();
340 if (!diva_dbg_mem) { 340 if (!diva_dbg_mem) {
341 diva_os_free (0, *buffer); 341 diva_os_free(0, *buffer);
342 } 342 }
343 return (0); 343 return (0);
344 } 344 }
@@ -362,7 +362,7 @@ void DIVA_EXIT_FUNCTION mntfunc_finit(void)
362 disconnect_didd(); 362 disconnect_didd();
363 363
364 if ((buffer = diva_maint_finit())) { 364 if ((buffer = diva_maint_finit())) {
365 diva_os_free (0, buffer); 365 diva_os_free(0, buffer);
366 } 366 }
367 367
368 memset(&MAdapter, 0, sizeof(MAdapter)); 368 memset(&MAdapter, 0, sizeof(MAdapter));