aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/st5481_d.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/hisax/st5481_d.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/hisax/st5481_d.c')
-rw-r--r--drivers/isdn/hisax/st5481_d.c194
1 files changed, 97 insertions, 97 deletions
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index db247b79e561..e88c5c71fca7 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -4,7 +4,7 @@
4 * Author Frode Isaksen 4 * Author Frode Isaksen
5 * Copyright 2001 by Frode Isaksen <fisaksen@bewan.com> 5 * Copyright 2001 by Frode Isaksen <fisaksen@bewan.com>
6 * 2001 by Kai Germaschewski <kai.germaschewski@gmx.de> 6 * 2001 by Kai Germaschewski <kai.germaschewski@gmx.de>
7 * 7 *
8 * This software may be used and distributed according to the terms 8 * This software may be used and distributed according to the terms
9 * of the GNU General Public License, incorporated herein by reference. 9 * of the GNU General Public License, incorporated herein by reference.
10 * 10 *
@@ -32,22 +32,22 @@ static char *strL1State[] =
32 32
33static char *strL1Event[] = 33static char *strL1Event[] =
34{ 34{
35 "EV_IND_DP", 35 "EV_IND_DP",
36 "EV_IND_1", 36 "EV_IND_1",
37 "EV_IND_2", 37 "EV_IND_2",
38 "EV_IND_3", 38 "EV_IND_3",
39 "EV_IND_RSY", 39 "EV_IND_RSY",
40 "EV_IND_5", 40 "EV_IND_5",
41 "EV_IND_6", 41 "EV_IND_6",
42 "EV_IND_7", 42 "EV_IND_7",
43 "EV_IND_AP", 43 "EV_IND_AP",
44 "EV_IND_9", 44 "EV_IND_9",
45 "EV_IND_10", 45 "EV_IND_10",
46 "EV_IND_11", 46 "EV_IND_11",
47 "EV_IND_AI8", 47 "EV_IND_AI8",
48 "EV_IND_AI10", 48 "EV_IND_AI10",
49 "EV_IND_AIL", 49 "EV_IND_AIL",
50 "EV_IND_DI", 50 "EV_IND_DI",
51 "EV_PH_ACTIVATE_REQ", 51 "EV_PH_ACTIVATE_REQ",
52 "EV_PH_DEACTIVATE_REQ", 52 "EV_PH_DEACTIVATE_REQ",
53 "EV_TIMER3", 53 "EV_TIMER3",
@@ -67,7 +67,7 @@ l1_go_f3(struct FsmInst *fi, int event, void *arg)
67 67
68 if (fi->state == ST_L1_F7) 68 if (fi->state == ST_L1_F7)
69 ph_disconnect(adapter); 69 ph_disconnect(adapter);
70 70
71 FsmChangeState(fi, ST_L1_F3); 71 FsmChangeState(fi, ST_L1_F3);
72 D_L1L2(adapter, PH_DEACTIVATE | INDICATION, NULL); 72 D_L1L2(adapter, PH_DEACTIVATE | INDICATION, NULL);
73} 73}
@@ -168,11 +168,11 @@ static struct FsmNode L1FnList[] __initdata =
168}; 168};
169 169
170static __printf(2, 3) 170static __printf(2, 3)
171void l1m_debug(struct FsmInst *fi, char *fmt, ...) 171 void l1m_debug(struct FsmInst *fi, char *fmt, ...)
172{ 172{
173 va_list args; 173 va_list args;
174 char buf[256]; 174 char buf[256];
175 175
176 va_start(args, fmt); 176 va_start(args, fmt);
177 vsnprintf(buf, sizeof(buf), fmt, args); 177 vsnprintf(buf, sizeof(buf), fmt, args);
178 DBG(8, "%s", buf); 178 DBG(8, "%s", buf);
@@ -191,54 +191,54 @@ void l1m_debug(struct FsmInst *fi, char *fmt, ...)
191 191
192 L1 FRAME D_OUT_STATE USB D CHANNEL 192 L1 FRAME D_OUT_STATE USB D CHANNEL
193 -------- ----------- --- --------- 193 -------- ----------- --- ---------
194 194
195 FIXME 195 FIXME
196 196
197 -> [xx..xx] SHORT_INIT -> [7Exx..xxC1C27EFF] 197 -> [xx..xx] SHORT_INIT -> [7Exx..xxC1C27EFF]
198 SHORT_WAIT_DEN <> OUT_D_COUNTER=16 198 SHORT_WAIT_DEN <> OUT_D_COUNTER=16
199 199
200 END_OF_SHORT <- DEN_EVENT -> 7Exx 200 END_OF_SHORT <- DEN_EVENT -> 7Exx
201 xxxx 201 xxxx
202 xxxx 202 xxxx
203 xxxx 203 xxxx
204 xxxx 204 xxxx
205 xxxx 205 xxxx
206 C1C1 206 C1C1
207 7EFF 207 7EFF
208 WAIT_FOR_RESET_IDLE <- D_UNDERRUN <- (8ms) 208 WAIT_FOR_RESET_IDLE <- D_UNDERRUN <- (8ms)
209 IDLE <> Reset pipe 209 IDLE <> Reset pipe
210 210
211 211
212 212
213 Transmit long frame (>= 16 bytes of encoded data): 213 Transmit long frame (>= 16 bytes of encoded data):
214 214
215 L1 FRAME D_OUT_STATE USB D CHANNEL 215 L1 FRAME D_OUT_STATE USB D CHANNEL
216 -------- ----------- --- --------- 216 -------- ----------- --- ---------
217 217
218 -> [xx...xx] IDLE 218 -> [xx...xx] IDLE
219 WAIT_FOR_STOP <> OUT_D_COUNTER=0 219 WAIT_FOR_STOP <> OUT_D_COUNTER=0
220 WAIT_FOR_RESET <> Reset pipe 220 WAIT_FOR_RESET <> Reset pipe
221 STOP 221 STOP
222 INIT_LONG_FRAME -> [7Exx..xx] 222 INIT_LONG_FRAME -> [7Exx..xx]
223 WAIT_DEN <> OUT_D_COUNTER=16 223 WAIT_DEN <> OUT_D_COUNTER=16
224 OUT_NORMAL <- DEN_EVENT -> 7Exx 224 OUT_NORMAL <- DEN_EVENT -> 7Exx
225 END_OF_FRAME_BUSY -> [xxxx] xxxx 225 END_OF_FRAME_BUSY -> [xxxx] xxxx
226 END_OF_FRAME_NOT_BUSY -> [xxxx] xxxx 226 END_OF_FRAME_NOT_BUSY -> [xxxx] xxxx
227 -> [xxxx] xxxx 227 -> [xxxx] xxxx
228 -> [C1C2] xxxx 228 -> [C1C2] xxxx
229 -> [7EFF] xxxx 229 -> [7EFF] xxxx
230 xxxx 230 xxxx
231 xxxx 231 xxxx
232 .... 232 ....
233 xxxx 233 xxxx
234 C1C2 234 C1C2
235 7EFF 235 7EFF
236 <- D_UNDERRUN <- (> 8ms) 236 <- D_UNDERRUN <- (> 8ms)
237 WAIT_FOR_STOP <> OUT_D_COUNTER=0 237 WAIT_FOR_STOP <> OUT_D_COUNTER=0
238 WAIT_FOR_RESET <> Reset pipe 238 WAIT_FOR_RESET <> Reset pipe
239 STOP 239 STOP
240 240
241*/ 241*/
242 242
243static struct Fsm dout_fsm; 243static struct Fsm dout_fsm;
244 244
@@ -254,7 +254,7 @@ static char *strDoutState[] =
254 "ST_DOUT_NORMAL", 254 "ST_DOUT_NORMAL",
255 255
256 "ST_DOUT_WAIT_FOR_UNDERRUN", 256 "ST_DOUT_WAIT_FOR_UNDERRUN",
257 "ST_DOUT_WAIT_FOR_NOT_BUSY", 257 "ST_DOUT_WAIT_FOR_NOT_BUSY",
258 "ST_DOUT_WAIT_FOR_STOP", 258 "ST_DOUT_WAIT_FOR_STOP",
259 "ST_DOUT_WAIT_FOR_RESET", 259 "ST_DOUT_WAIT_FOR_RESET",
260}; 260};
@@ -271,11 +271,11 @@ static char *strDoutEvent[] =
271}; 271};
272 272
273static __printf(2, 3) 273static __printf(2, 3)
274void dout_debug(struct FsmInst *fi, char *fmt, ...) 274 void dout_debug(struct FsmInst *fi, char *fmt, ...)
275{ 275{
276 va_list args; 276 va_list args;
277 char buf[256]; 277 char buf[256];
278 278
279 va_start(args, fmt); 279 va_start(args, fmt);
280 vsnprintf(buf, sizeof(buf), fmt, args); 280 vsnprintf(buf, sizeof(buf), fmt, args);
281 DBG(0x2, "%s", buf); 281 DBG(0x2, "%s", buf);
@@ -313,19 +313,19 @@ static void usb_d_out(struct st5481_adapter *adapter, int buf_nr)
313 skb = d_out->tx_skb; 313 skb = d_out->tx_skb;
314 314
315 buf_size = NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT; 315 buf_size = NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT;
316 316
317 if (skb) { 317 if (skb) {
318 len = isdnhdlc_encode(&d_out->hdlc_state, 318 len = isdnhdlc_encode(&d_out->hdlc_state,
319 skb->data, skb->len, &bytes_sent, 319 skb->data, skb->len, &bytes_sent,
320 urb->transfer_buffer, buf_size); 320 urb->transfer_buffer, buf_size);
321 skb_pull(skb,bytes_sent); 321 skb_pull(skb, bytes_sent);
322 } else { 322 } else {
323 // Send flags or idle 323 // Send flags or idle
324 len = isdnhdlc_encode(&d_out->hdlc_state, 324 len = isdnhdlc_encode(&d_out->hdlc_state,
325 NULL, 0, &bytes_sent, 325 NULL, 0, &bytes_sent,
326 urb->transfer_buffer, buf_size); 326 urb->transfer_buffer, buf_size);
327 } 327 }
328 328
329 if (len < buf_size) { 329 if (len < buf_size) {
330 FsmChangeState(&d_out->fsm, ST_DOUT_WAIT_FOR_UNDERRUN); 330 FsmChangeState(&d_out->fsm, ST_DOUT_WAIT_FOR_UNDERRUN);
331 } 331 }
@@ -354,15 +354,15 @@ static void usb_d_out(struct st5481_adapter *adapter, int buf_nr)
354 urb->dev = adapter->usb_dev; 354 urb->dev = adapter->usb_dev;
355 // Need to transmit the next buffer 2ms after the DEN_EVENT 355 // Need to transmit the next buffer 2ms after the DEN_EVENT
356 urb->transfer_flags = 0; 356 urb->transfer_flags = 0;
357 urb->start_frame = usb_get_current_frame_number(adapter->usb_dev)+2; 357 urb->start_frame = usb_get_current_frame_number(adapter->usb_dev) + 2;
358 358
359 DBG_ISO_PACKET(0x20,urb); 359 DBG_ISO_PACKET(0x20, urb);
360 360
361 if (usb_submit_urb(urb, GFP_KERNEL) < 0) { 361 if (usb_submit_urb(urb, GFP_KERNEL) < 0) {
362 // There is another URB queued up 362 // There is another URB queued up
363 urb->transfer_flags = URB_ISO_ASAP; 363 urb->transfer_flags = URB_ISO_ASAP;
364 SUBMIT_URB(urb, GFP_KERNEL); 364 SUBMIT_URB(urb, GFP_KERNEL);
365 } 365 }
366} 366}
367 367
368static void fifo_reseted(void *context) 368static void fifo_reseted(void *context)
@@ -377,7 +377,7 @@ static void usb_d_out_complete(struct urb *urb)
377 struct st5481_adapter *adapter = urb->context; 377 struct st5481_adapter *adapter = urb->context;
378 struct st5481_d_out *d_out = &adapter->d_out; 378 struct st5481_d_out *d_out = &adapter->d_out;
379 long buf_nr; 379 long buf_nr;
380 380
381 DBG(2, ""); 381 DBG(2, "");
382 382
383 buf_nr = get_buf_nr(d_out->urb, urb); 383 buf_nr = get_buf_nr(d_out->urb, urb);
@@ -385,17 +385,17 @@ static void usb_d_out_complete(struct urb *urb)
385 385
386 if (unlikely(urb->status < 0)) { 386 if (unlikely(urb->status < 0)) {
387 switch (urb->status) { 387 switch (urb->status) {
388 case -ENOENT: 388 case -ENOENT:
389 case -ESHUTDOWN: 389 case -ESHUTDOWN:
390 case -ECONNRESET: 390 case -ECONNRESET:
391 DBG(1,"urb killed status %d", urb->status); 391 DBG(1, "urb killed status %d", urb->status);
392 break; 392 break;
393 default: 393 default:
394 WARNING("urb status %d",urb->status); 394 WARNING("urb status %d", urb->status);
395 if (d_out->busy == 0) { 395 if (d_out->busy == 0) {
396 st5481_usb_pipe_reset(adapter, EP_D_OUT | USB_DIR_OUT, fifo_reseted, adapter); 396 st5481_usb_pipe_reset(adapter, EP_D_OUT | USB_DIR_OUT, fifo_reseted, adapter);
397 } 397 }
398 break; 398 break;
399 } 399 }
400 return; // Give up 400 return; // Give up
401 } 401 }
@@ -417,7 +417,7 @@ static void dout_start_xmit(struct FsmInst *fsm, int event, void *arg)
417 417
418 skb = d_out->tx_skb; 418 skb = d_out->tx_skb;
419 419
420 DBG(2,"len=%d",skb->len); 420 DBG(2, "len=%d", skb->len);
421 421
422 isdnhdlc_out_init(&d_out->hdlc_state, HDLC_DCHANNEL | HDLC_BITREVERSE); 422 isdnhdlc_out_init(&d_out->hdlc_state, HDLC_DCHANNEL | HDLC_BITREVERSE);
423 423
@@ -433,7 +433,7 @@ static void dout_start_xmit(struct FsmInst *fsm, int event, void *arg)
433 urb->transfer_buffer, 16); 433 urb->transfer_buffer, 16);
434 skb_pull(skb, bytes_sent); 434 skb_pull(skb, bytes_sent);
435 435
436 if(len < 16) 436 if (len < 16)
437 FsmChangeState(&d_out->fsm, ST_DOUT_SHORT_INIT); 437 FsmChangeState(&d_out->fsm, ST_DOUT_SHORT_INIT);
438 else 438 else
439 FsmChangeState(&d_out->fsm, ST_DOUT_LONG_INIT); 439 FsmChangeState(&d_out->fsm, ST_DOUT_LONG_INIT);
@@ -455,7 +455,7 @@ static void dout_start_xmit(struct FsmInst *fsm, int event, void *arg)
455 urb->dev = adapter->usb_dev; 455 urb->dev = adapter->usb_dev;
456 urb->transfer_flags = URB_ISO_ASAP; 456 urb->transfer_flags = URB_ISO_ASAP;
457 457
458 DBG_ISO_PACKET(0x20,urb); 458 DBG_ISO_PACKET(0x20, urb);
459 SUBMIT_URB(urb, GFP_KERNEL); 459 SUBMIT_URB(urb, GFP_KERNEL);
460} 460}
461 461
@@ -480,7 +480,7 @@ static void dout_long_enable_fifo(struct FsmInst *fsm, int event, void *arg)
480{ 480{
481 struct st5481_adapter *adapter = fsm->userdata; 481 struct st5481_adapter *adapter = fsm->userdata;
482 struct st5481_d_out *d_out = &adapter->d_out; 482 struct st5481_d_out *d_out = &adapter->d_out;
483 483
484 st5481_usb_device_ctrl_msg(adapter, OUT_D_COUNTER, 16, NULL, NULL); 484 st5481_usb_device_ctrl_msg(adapter, OUT_D_COUNTER, 16, NULL, NULL);
485 FsmChangeState(&d_out->fsm, ST_DOUT_LONG_WAIT_DEN); 485 FsmChangeState(&d_out->fsm, ST_DOUT_LONG_WAIT_DEN);
486} 486}
@@ -619,8 +619,8 @@ static void ph_connect(struct st5481_adapter *adapter)
619 struct st5481_d_out *d_out = &adapter->d_out; 619 struct st5481_d_out *d_out = &adapter->d_out;
620 struct st5481_in *d_in = &adapter->d_in; 620 struct st5481_in *d_in = &adapter->d_in;
621 621
622 DBG(8,""); 622 DBG(8, "");
623 623
624 FsmChangeState(&d_out->fsm, ST_DOUT_NONE); 624 FsmChangeState(&d_out->fsm, ST_DOUT_NONE);
625 625
626 // st5481_usb_device_ctrl_msg(adapter, FFMSK_D, OUT_UNDERRUN, NULL, NULL); 626 // st5481_usb_device_ctrl_msg(adapter, FFMSK_D, OUT_UNDERRUN, NULL, NULL);
@@ -644,7 +644,7 @@ static void ph_connect(struct st5481_adapter *adapter)
644 */ 644 */
645static void ph_disconnect(struct st5481_adapter *adapter) 645static void ph_disconnect(struct st5481_adapter *adapter)
646{ 646{
647 DBG(8,""); 647 DBG(8, "");
648 648
649 st5481_in_mode(&adapter->d_in, L1_MODE_NULL); 649 st5481_in_mode(&adapter->d_in, L1_MODE_NULL);
650 650
@@ -661,7 +661,7 @@ static int st5481_setup_d_out(struct st5481_adapter *adapter)
661 struct usb_host_endpoint *endpoint; 661 struct usb_host_endpoint *endpoint;
662 struct st5481_d_out *d_out = &adapter->d_out; 662 struct st5481_d_out *d_out = &adapter->d_out;
663 663
664 DBG(2,""); 664 DBG(2, "");
665 665
666 intf = usb_ifnum_to_if(dev, 0); 666 intf = usb_ifnum_to_if(dev, 0);
667 if (intf) 667 if (intf)
@@ -672,10 +672,10 @@ static int st5481_setup_d_out(struct st5481_adapter *adapter)
672 // Allocate URBs and buffers for the D channel out 672 // Allocate URBs and buffers for the D channel out
673 endpoint = &altsetting->endpoint[EP_D_OUT-1]; 673 endpoint = &altsetting->endpoint[EP_D_OUT-1];
674 674
675 DBG(2,"endpoint address=%02x,packet size=%d", 675 DBG(2, "endpoint address=%02x,packet size=%d",
676 endpoint->desc.bEndpointAddress, le16_to_cpu(endpoint->desc.wMaxPacketSize)); 676 endpoint->desc.bEndpointAddress, le16_to_cpu(endpoint->desc.wMaxPacketSize));
677 677
678 return st5481_setup_isocpipes(d_out->urb, dev, 678 return st5481_setup_isocpipes(d_out->urb, dev,
679 usb_sndisocpipe(dev, endpoint->desc.bEndpointAddress), 679 usb_sndisocpipe(dev, endpoint->desc.bEndpointAddress),
680 NUM_ISO_PACKETS_D, SIZE_ISO_PACKETS_D_OUT, 680 NUM_ISO_PACKETS_D, SIZE_ISO_PACKETS_D_OUT,
681 NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT, 681 NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT,
@@ -686,7 +686,7 @@ static void st5481_release_d_out(struct st5481_adapter *adapter)
686{ 686{
687 struct st5481_d_out *d_out = &adapter->d_out; 687 struct st5481_d_out *d_out = &adapter->d_out;
688 688
689 DBG(2,""); 689 DBG(2, "");
690 690
691 st5481_release_isocpipes(d_out->urb); 691 st5481_release_isocpipes(d_out->urb);
692} 692}
@@ -695,7 +695,7 @@ int st5481_setup_d(struct st5481_adapter *adapter)
695{ 695{
696 int retval; 696 int retval;
697 697
698 DBG(2,""); 698 DBG(2, "");
699 699
700 retval = st5481_setup_d_out(adapter); 700 retval = st5481_setup_d_out(adapter);
701 if (retval) 701 if (retval)
@@ -726,15 +726,15 @@ int st5481_setup_d(struct st5481_adapter *adapter)
726 726
727 return 0; 727 return 0;
728 728
729 err_d_out: 729err_d_out:
730 st5481_release_d_out(adapter); 730 st5481_release_d_out(adapter);
731 err: 731err:
732 return retval; 732 return retval;
733} 733}
734 734
735void st5481_release_d(struct st5481_adapter *adapter) 735void st5481_release_d(struct st5481_adapter *adapter)
736{ 736{
737 DBG(2,""); 737 DBG(2, "");
738 738
739 st5481_release_in(&adapter->d_in); 739 st5481_release_in(&adapter->d_in);
740 st5481_release_d_out(adapter); 740 st5481_release_d_out(adapter);
@@ -766,9 +766,9 @@ int __init st5481_d_init(void)
766 766
767 return 0; 767 return 0;
768 768
769 err_l1: 769err_l1:
770 FsmFree(&l1fsm); 770 FsmFree(&l1fsm);
771 err: 771err:
772 return retval; 772 return retval;
773} 773}
774 774
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-21 12:14:24 -0400