aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware/avm/c4.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/avm/c4.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/avm/c4.c')
-rw-r--r--drivers/isdn/hardware/avm/c4.c348
1 files changed, 174 insertions, 174 deletions
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 9743b24ef9d6..98f18812441d 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -1,7 +1,7 @@
1/* $Id: c4.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ 1/* $Id: c4.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $
2 * 2 *
3 * Module for AVM C4 & C2 card. 3 * Module for AVM C4 & C2 card.
4 * 4 *
5 * Copyright 1999 by Carsten Paeth <calle@calle.de> 5 * Copyright 1999 by Carsten Paeth <calle@calle.de>
6 * 6 *
7 * This software may be used and distributed according to the terms 7 * This software may be used and distributed according to the terms
@@ -129,8 +129,8 @@ static void c4_dispatch_tx(avmcard *card);
129 129
130/* ------------------------------------------------------------- */ 130/* ------------------------------------------------------------- */
131 131
132#define RESET_TIMEOUT (15*HZ) /* 15 sec */ 132#define RESET_TIMEOUT (15 * HZ) /* 15 sec */
133#define PEEK_POKE_TIMEOUT (HZ/10) /* 0.1 sec */ 133#define PEEK_POKE_TIMEOUT (HZ / 10) /* 0.1 sec */
134 134
135/* ------------------------------------------------------------- */ 135/* ------------------------------------------------------------- */
136 136
@@ -148,7 +148,7 @@ static inline int wait_for_doorbell(avmcard *card, unsigned long t)
148 unsigned long stop; 148 unsigned long stop;
149 149
150 stop = jiffies + t; 150 stop = jiffies + t;
151 while (c4inmeml(card->mbase+DOORBELL) != 0xffffffff) { 151 while (c4inmeml(card->mbase + DOORBELL) != 0xffffffff) {
152 if (!time_before(jiffies, stop)) 152 if (!time_before(jiffies, stop))
153 return -1; 153 return -1;
154 mb(); 154 mb();
@@ -159,40 +159,40 @@ static inline int wait_for_doorbell(avmcard *card, unsigned long t)
159static int c4_poke(avmcard *card, unsigned long off, unsigned long value) 159static int c4_poke(avmcard *card, unsigned long off, unsigned long value)
160{ 160{
161 161
162 if (wait_for_doorbell(card, HZ/10) < 0) 162 if (wait_for_doorbell(card, HZ / 10) < 0)
163 return -1; 163 return -1;
164
165 c4outmeml(card->mbase+MBOX_PEEK_POKE, off);
166 c4outmeml(card->mbase+DOORBELL, DBELL_ADDR);
167 164
168 if (wait_for_doorbell(card, HZ/10) < 0) 165 c4outmeml(card->mbase + MBOX_PEEK_POKE, off);
166 c4outmeml(card->mbase + DOORBELL, DBELL_ADDR);
167
168 if (wait_for_doorbell(card, HZ / 10) < 0)
169 return -1; 169 return -1;
170 170
171 c4outmeml(card->mbase+MBOX_PEEK_POKE, value); 171 c4outmeml(card->mbase + MBOX_PEEK_POKE, value);
172 c4outmeml(card->mbase+DOORBELL, DBELL_DATA | DBELL_ADDR); 172 c4outmeml(card->mbase + DOORBELL, DBELL_DATA | DBELL_ADDR);
173 173
174 return 0; 174 return 0;
175} 175}
176 176
177static int c4_peek(avmcard *card, unsigned long off, unsigned long *valuep) 177static int c4_peek(avmcard *card, unsigned long off, unsigned long *valuep)
178{ 178{
179 if (wait_for_doorbell(card, HZ/10) < 0) 179 if (wait_for_doorbell(card, HZ / 10) < 0)
180 return -1; 180 return -1;
181 181
182 c4outmeml(card->mbase+MBOX_PEEK_POKE, off); 182 c4outmeml(card->mbase + MBOX_PEEK_POKE, off);
183 c4outmeml(card->mbase+DOORBELL, DBELL_RNWR | DBELL_ADDR); 183 c4outmeml(card->mbase + DOORBELL, DBELL_RNWR | DBELL_ADDR);
184 184
185 if (wait_for_doorbell(card, HZ/10) < 0) 185 if (wait_for_doorbell(card, HZ / 10) < 0)
186 return -1; 186 return -1;
187 187
188 *valuep = c4inmeml(card->mbase+MBOX_PEEK_POKE); 188 *valuep = c4inmeml(card->mbase + MBOX_PEEK_POKE);
189 189
190 return 0; 190 return 0;
191} 191}
192 192
193/* ------------------------------------------------------------- */ 193/* ------------------------------------------------------------- */
194 194
195static int c4_load_t4file(avmcard *card, capiloaddatapart * t4file) 195static int c4_load_t4file(avmcard *card, capiloaddatapart *t4file)
196{ 196{
197 u32 val; 197 u32 val;
198 unsigned char *dp; 198 unsigned char *dp;
@@ -202,7 +202,7 @@ static int c4_load_t4file(avmcard *card, capiloaddatapart * t4file)
202 dp = t4file->data; 202 dp = t4file->data;
203 left = t4file->len; 203 left = t4file->len;
204 while (left >= sizeof(u32)) { 204 while (left >= sizeof(u32)) {
205 if (t4file->user) { 205 if (t4file->user) {
206 if (copy_from_user(&val, dp, sizeof(val))) 206 if (copy_from_user(&val, dp, sizeof(val)))
207 return -EFAULT; 207 return -EFAULT;
208 } else { 208 } else {
@@ -210,7 +210,7 @@ static int c4_load_t4file(avmcard *card, capiloaddatapart * t4file)
210 } 210 }
211 if (c4_poke(card, loadoff, val)) { 211 if (c4_poke(card, loadoff, val)) {
212 printk(KERN_ERR "%s: corrupted firmware file ?\n", 212 printk(KERN_ERR "%s: corrupted firmware file ?\n",
213 card->name); 213 card->name);
214 return -EIO; 214 return -EIO;
215 } 215 }
216 left -= sizeof(u32); 216 left -= sizeof(u32);
@@ -227,7 +227,7 @@ static int c4_load_t4file(avmcard *card, capiloaddatapart * t4file)
227 } 227 }
228 if (c4_poke(card, loadoff, val)) { 228 if (c4_poke(card, loadoff, val)) {
229 printk(KERN_ERR "%s: corrupted firmware file ?\n", 229 printk(KERN_ERR "%s: corrupted firmware file ?\n",
230 card->name); 230 card->name);
231 return -EIO; 231 return -EIO;
232 } 232 }
233 } 233 }
@@ -297,13 +297,13 @@ static void c4_reset(avmcard *card)
297{ 297{
298 unsigned long stop; 298 unsigned long stop;
299 299
300 c4outmeml(card->mbase+DOORBELL, DBELL_RESET_ARM); 300 c4outmeml(card->mbase + DOORBELL, DBELL_RESET_ARM);
301 301
302 stop = jiffies + HZ*10; 302 stop = jiffies + HZ * 10;
303 while (c4inmeml(card->mbase+DOORBELL) != 0xffffffff) { 303 while (c4inmeml(card->mbase + DOORBELL) != 0xffffffff) {
304 if (!time_before(jiffies, stop)) 304 if (!time_before(jiffies, stop))
305 return; 305 return;
306 c4outmeml(card->mbase+DOORBELL, DBELL_ADDR); 306 c4outmeml(card->mbase + DOORBELL, DBELL_ADDR);
307 mb(); 307 mb();
308 } 308 }
309 309
@@ -317,89 +317,89 @@ static int c4_detect(avmcard *card)
317{ 317{
318 unsigned long stop, dummy; 318 unsigned long stop, dummy;
319 319
320 c4outmeml(card->mbase+PCI_OUT_INT_MASK, 0x0c); 320 c4outmeml(card->mbase + PCI_OUT_INT_MASK, 0x0c);
321 if (c4inmeml(card->mbase+PCI_OUT_INT_MASK) != 0x0c) 321 if (c4inmeml(card->mbase + PCI_OUT_INT_MASK) != 0x0c)
322 return 1; 322 return 1;
323 323
324 c4outmeml(card->mbase+DOORBELL, DBELL_RESET_ARM); 324 c4outmeml(card->mbase + DOORBELL, DBELL_RESET_ARM);
325 325
326 stop = jiffies + HZ*10; 326 stop = jiffies + HZ * 10;
327 while (c4inmeml(card->mbase+DOORBELL) != 0xffffffff) { 327 while (c4inmeml(card->mbase + DOORBELL) != 0xffffffff) {
328 if (!time_before(jiffies, stop)) 328 if (!time_before(jiffies, stop))
329 return 2; 329 return 2;
330 c4outmeml(card->mbase+DOORBELL, DBELL_ADDR); 330 c4outmeml(card->mbase + DOORBELL, DBELL_ADDR);
331 mb(); 331 mb();
332 } 332 }
333 333
334 c4_poke(card, DC21285_ARMCSR_BASE + CHAN_1_CONTROL, 0); 334 c4_poke(card, DC21285_ARMCSR_BASE + CHAN_1_CONTROL, 0);
335 c4_poke(card, DC21285_ARMCSR_BASE + CHAN_2_CONTROL, 0); 335 c4_poke(card, DC21285_ARMCSR_BASE + CHAN_2_CONTROL, 0);
336 336
337 c4outmeml(card->mbase+MAILBOX_0, 0x55aa55aa); 337 c4outmeml(card->mbase + MAILBOX_0, 0x55aa55aa);
338 if (c4inmeml(card->mbase+MAILBOX_0) != 0x55aa55aa) return 3; 338 if (c4inmeml(card->mbase + MAILBOX_0) != 0x55aa55aa) return 3;
339 339
340 c4outmeml(card->mbase+MAILBOX_0, 0xaa55aa55); 340 c4outmeml(card->mbase + MAILBOX_0, 0xaa55aa55);
341 if (c4inmeml(card->mbase+MAILBOX_0) != 0xaa55aa55) return 4; 341 if (c4inmeml(card->mbase + MAILBOX_0) != 0xaa55aa55) return 4;
342 342
343 if (c4_poke(card, DC21285_ARMCSR_BASE+DBELL_SA_MASK, 0)) return 5; 343 if (c4_poke(card, DC21285_ARMCSR_BASE + DBELL_SA_MASK, 0)) return 5;
344 if (c4_poke(card, DC21285_ARMCSR_BASE+DBELL_PCI_MASK, 0)) return 6; 344 if (c4_poke(card, DC21285_ARMCSR_BASE + DBELL_PCI_MASK, 0)) return 6;
345 if (c4_poke(card, DC21285_ARMCSR_BASE+SA_CONTROL, SA_CTL_ALLRIGHT)) 345 if (c4_poke(card, DC21285_ARMCSR_BASE + SA_CONTROL, SA_CTL_ALLRIGHT))
346 return 7; 346 return 7;
347 if (c4_poke(card, DC21285_ARMCSR_BASE+XBUS_CYCLE, INIT_XBUS_CYCLE)) 347 if (c4_poke(card, DC21285_ARMCSR_BASE + XBUS_CYCLE, INIT_XBUS_CYCLE))
348 return 8; 348 return 8;
349 if (c4_poke(card, DC21285_ARMCSR_BASE+XBUS_STROBE, INIT_XBUS_STROBE)) 349 if (c4_poke(card, DC21285_ARMCSR_BASE + XBUS_STROBE, INIT_XBUS_STROBE))
350 return 8; 350 return 8;
351 if (c4_poke(card, DC21285_ARMCSR_BASE+DRAM_TIMING, 0)) return 9; 351 if (c4_poke(card, DC21285_ARMCSR_BASE + DRAM_TIMING, 0)) return 9;
352 352
353 mdelay(1); 353 mdelay(1);
354 354
355 if (c4_peek(card, DC21285_DRAM_A0MR, &dummy)) return 10; 355 if (c4_peek(card, DC21285_DRAM_A0MR, &dummy)) return 10;
356 if (c4_peek(card, DC21285_DRAM_A1MR, &dummy)) return 11; 356 if (c4_peek(card, DC21285_DRAM_A1MR, &dummy)) return 11;
357 if (c4_peek(card, DC21285_DRAM_A2MR, &dummy)) return 12; 357 if (c4_peek(card, DC21285_DRAM_A2MR, &dummy)) return 12;
358 if (c4_peek(card, DC21285_DRAM_A3MR, &dummy)) return 13; 358 if (c4_peek(card, DC21285_DRAM_A3MR, &dummy)) return 13;
359 359
360 if (c4_poke(card, DC21285_DRAM_A0MR+CAS_OFFSET, 0)) return 14; 360 if (c4_poke(card, DC21285_DRAM_A0MR + CAS_OFFSET, 0)) return 14;
361 if (c4_poke(card, DC21285_DRAM_A1MR+CAS_OFFSET, 0)) return 15; 361 if (c4_poke(card, DC21285_DRAM_A1MR + CAS_OFFSET, 0)) return 15;
362 if (c4_poke(card, DC21285_DRAM_A2MR+CAS_OFFSET, 0)) return 16; 362 if (c4_poke(card, DC21285_DRAM_A2MR + CAS_OFFSET, 0)) return 16;
363 if (c4_poke(card, DC21285_DRAM_A3MR+CAS_OFFSET, 0)) return 17; 363 if (c4_poke(card, DC21285_DRAM_A3MR + CAS_OFFSET, 0)) return 17;
364 364
365 mdelay(1); 365 mdelay(1);
366 366
367 if (c4_poke(card, DC21285_ARMCSR_BASE+DRAM_TIMING, DRAM_TIMING_DEF)) 367 if (c4_poke(card, DC21285_ARMCSR_BASE + DRAM_TIMING, DRAM_TIMING_DEF))
368 return 18; 368 return 18;
369 369
370 if (c4_poke(card, DC21285_ARMCSR_BASE+DRAM_ADDR_SIZE_0,DRAM_AD_SZ_DEF0)) 370 if (c4_poke(card, DC21285_ARMCSR_BASE + DRAM_ADDR_SIZE_0, DRAM_AD_SZ_DEF0))
371 return 19; 371 return 19;
372 if (c4_poke(card, DC21285_ARMCSR_BASE+DRAM_ADDR_SIZE_1,DRAM_AD_SZ_NULL)) 372 if (c4_poke(card, DC21285_ARMCSR_BASE + DRAM_ADDR_SIZE_1, DRAM_AD_SZ_NULL))
373 return 20; 373 return 20;
374 if (c4_poke(card, DC21285_ARMCSR_BASE+DRAM_ADDR_SIZE_2,DRAM_AD_SZ_NULL)) 374 if (c4_poke(card, DC21285_ARMCSR_BASE + DRAM_ADDR_SIZE_2, DRAM_AD_SZ_NULL))
375 return 21; 375 return 21;
376 if (c4_poke(card, DC21285_ARMCSR_BASE+DRAM_ADDR_SIZE_3,DRAM_AD_SZ_NULL)) 376 if (c4_poke(card, DC21285_ARMCSR_BASE + DRAM_ADDR_SIZE_3, DRAM_AD_SZ_NULL))
377 return 22; 377 return 22;
378 378
379 /* Transputer test */ 379 /* Transputer test */
380 380
381 if ( c4_poke(card, 0x000000, 0x11111111) 381 if (c4_poke(card, 0x000000, 0x11111111)
382 || c4_poke(card, 0x400000, 0x22222222) 382 || c4_poke(card, 0x400000, 0x22222222)
383 || c4_poke(card, 0x800000, 0x33333333) 383 || c4_poke(card, 0x800000, 0x33333333)
384 || c4_poke(card, 0xC00000, 0x44444444)) 384 || c4_poke(card, 0xC00000, 0x44444444))
385 return 23; 385 return 23;
386 386
387 if ( c4_peek(card, 0x000000, &dummy) || dummy != 0x11111111 387 if (c4_peek(card, 0x000000, &dummy) || dummy != 0x11111111
388 || c4_peek(card, 0x400000, &dummy) || dummy != 0x22222222 388 || c4_peek(card, 0x400000, &dummy) || dummy != 0x22222222
389 || c4_peek(card, 0x800000, &dummy) || dummy != 0x33333333 389 || c4_peek(card, 0x800000, &dummy) || dummy != 0x33333333
390 || c4_peek(card, 0xC00000, &dummy) || dummy != 0x44444444) 390 || c4_peek(card, 0xC00000, &dummy) || dummy != 0x44444444)
391 return 24; 391 return 24;
392 392
393 if ( c4_poke(card, 0x000000, 0x55555555) 393 if (c4_poke(card, 0x000000, 0x55555555)
394 || c4_poke(card, 0x400000, 0x66666666) 394 || c4_poke(card, 0x400000, 0x66666666)
395 || c4_poke(card, 0x800000, 0x77777777) 395 || c4_poke(card, 0x800000, 0x77777777)
396 || c4_poke(card, 0xC00000, 0x88888888)) 396 || c4_poke(card, 0xC00000, 0x88888888))
397 return 25; 397 return 25;
398 398
399 if ( c4_peek(card, 0x000000, &dummy) || dummy != 0x55555555 399 if (c4_peek(card, 0x000000, &dummy) || dummy != 0x55555555
400 || c4_peek(card, 0x400000, &dummy) || dummy != 0x66666666 400 || c4_peek(card, 0x400000, &dummy) || dummy != 0x66666666
401 || c4_peek(card, 0x800000, &dummy) || dummy != 0x77777777 401 || c4_peek(card, 0x800000, &dummy) || dummy != 0x77777777
402 || c4_peek(card, 0xC00000, &dummy) || dummy != 0x88888888) 402 || c4_peek(card, 0xC00000, &dummy) || dummy != 0x88888888)
403 return 26; 403 return 26;
404 404
405 return 0; 405 return 0;
@@ -451,26 +451,26 @@ static void c4_dispatch_tx(avmcard *card)
451 printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen); 451 printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen);
452#endif 452#endif
453 } else { 453 } else {
454 txlen = skb->len-2; 454 txlen = skb->len - 2;
455#ifdef AVM_C4_POLLDEBUG 455#ifdef AVM_C4_POLLDEBUG
456 if (skb->data[2] == SEND_POLLACK) 456 if (skb->data[2] == SEND_POLLACK)
457 printk(KERN_INFO "%s: ack to c4\n", card->name); 457 printk(KERN_INFO "%s: ack to c4\n", card->name);
458#endif 458#endif
459#ifdef AVM_C4_DEBUG 459#ifdef AVM_C4_DEBUG
460 printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n", 460 printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n",
461 card->name, skb->data[2], txlen); 461 card->name, skb->data[2], txlen);
462#endif 462#endif
463 skb_copy_from_linear_data_offset(skb, 2, dma->sendbuf.dmabuf, 463 skb_copy_from_linear_data_offset(skb, 2, dma->sendbuf.dmabuf,
464 skb->len - 2); 464 skb->len - 2);
465 } 465 }
466 txlen = (txlen + 3) & ~3; 466 txlen = (txlen + 3) & ~3;
467 467
468 c4outmeml(card->mbase+MBOX_DOWN_ADDR, dma->sendbuf.dmaaddr); 468 c4outmeml(card->mbase + MBOX_DOWN_ADDR, dma->sendbuf.dmaaddr);
469 c4outmeml(card->mbase+MBOX_DOWN_LEN, txlen); 469 c4outmeml(card->mbase + MBOX_DOWN_LEN, txlen);
470 470
471 card->csr |= DBELL_DOWN_ARM; 471 card->csr |= DBELL_DOWN_ARM;
472 472
473 c4outmeml(card->mbase+DOORBELL, DBELL_DOWN_ARM); 473 c4outmeml(card->mbase + DOORBELL, DBELL_DOWN_ARM);
474 474
475 dev_kfree_skb_any(skb); 475 dev_kfree_skb_any(skb);
476} 476}
@@ -485,7 +485,7 @@ static void queue_pollack(avmcard *card)
485 skb = alloc_skb(3, GFP_ATOMIC); 485 skb = alloc_skb(3, GFP_ATOMIC);
486 if (!skb) { 486 if (!skb) {
487 printk(KERN_CRIT "%s: no memory, lost poll ack\n", 487 printk(KERN_CRIT "%s: no memory, lost poll ack\n",
488 card->name); 488 card->name);
489 return; 489 return;
490 } 490 }
491 p = skb->data; 491 p = skb->data;
@@ -514,9 +514,9 @@ static void c4_handle_rx(avmcard *card)
514 514
515#ifdef AVM_C4_DEBUG 515#ifdef AVM_C4_DEBUG
516 printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name, 516 printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name,
517 b1cmd, (unsigned long)dma->recvlen); 517 b1cmd, (unsigned long)dma->recvlen);
518#endif 518#endif
519 519
520 switch (b1cmd) { 520 switch (b1cmd) {
521 case RECEIVE_DATA_B3_IND: 521 case RECEIVE_DATA_B3_IND:
522 522
@@ -528,13 +528,13 @@ static void c4_handle_rx(avmcard *card)
528 ctrl = &card->ctrlinfo[cidx].capi_ctrl; 528 ctrl = &card->ctrlinfo[cidx].capi_ctrl;
529 529
530 if (MsgLen < 30) { /* not CAPI 64Bit */ 530 if (MsgLen < 30) { /* not CAPI 64Bit */
531 memset(card->msgbuf+MsgLen, 0, 30-MsgLen); 531 memset(card->msgbuf + MsgLen, 0, 30 - MsgLen);
532 MsgLen = 30; 532 MsgLen = 30;
533 CAPIMSG_SETLEN(card->msgbuf, 30); 533 CAPIMSG_SETLEN(card->msgbuf, 30);
534 } 534 }
535 if (!(skb = alloc_skb(DataB3Len+MsgLen, GFP_ATOMIC))) { 535 if (!(skb = alloc_skb(DataB3Len + MsgLen, GFP_ATOMIC))) {
536 printk(KERN_ERR "%s: incoming packet dropped\n", 536 printk(KERN_ERR "%s: incoming packet dropped\n",
537 card->name); 537 card->name);
538 } else { 538 } else {
539 memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen); 539 memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen);
540 memcpy(skb_put(skb, DataB3Len), card->databuf, DataB3Len); 540 memcpy(skb_put(skb, DataB3Len), card->databuf, DataB3Len);
@@ -553,7 +553,7 @@ static void c4_handle_rx(avmcard *card)
553 553
554 if (!(skb = alloc_skb(MsgLen, GFP_ATOMIC))) { 554 if (!(skb = alloc_skb(MsgLen, GFP_ATOMIC))) {
555 printk(KERN_ERR "%s: incoming packet dropped\n", 555 printk(KERN_ERR "%s: incoming packet dropped\n",
556 card->name); 556 card->name);
557 } else { 557 } else {
558 memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen); 558 memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen);
559 if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF) 559 if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF)
@@ -570,7 +570,7 @@ static void c4_handle_rx(avmcard *card)
570 ApplId = _get_word(&p); 570 ApplId = _get_word(&p);
571 NCCI = _get_word(&p); 571 NCCI = _get_word(&p);
572 WindowSize = _get_word(&p); 572 WindowSize = _get_word(&p);
573 cidx = (NCCI&0x7f) - card->cardnr; 573 cidx = (NCCI & 0x7f) - card->cardnr;
574 if (cidx >= card->nlogcontr) cidx = 0; 574 if (cidx >= card->nlogcontr) cidx = 0;
575 575
576 capilib_new_ncci(&card->ctrlinfo[cidx].ncci_head, ApplId, NCCI, WindowSize); 576 capilib_new_ncci(&card->ctrlinfo[cidx].ncci_head, ApplId, NCCI, WindowSize);
@@ -583,7 +583,7 @@ static void c4_handle_rx(avmcard *card)
583 NCCI = _get_word(&p); 583 NCCI = _get_word(&p);
584 584
585 if (NCCI != 0xffffffff) { 585 if (NCCI != 0xffffffff) {
586 cidx = (NCCI&0x7f) - card->cardnr; 586 cidx = (NCCI & 0x7f) - card->cardnr;
587 if (cidx >= card->nlogcontr) cidx = 0; 587 if (cidx >= card->nlogcontr) cidx = 0;
588 capilib_free_ncci(&card->ctrlinfo[cidx].ncci_head, ApplId, NCCI); 588 capilib_free_ncci(&card->ctrlinfo[cidx].ncci_head, ApplId, NCCI);
589 } 589 }
@@ -595,14 +595,14 @@ static void c4_handle_rx(avmcard *card)
595#endif 595#endif
596 if (!suppress_pollack) 596 if (!suppress_pollack)
597 queue_pollack(card); 597 queue_pollack(card);
598 for (cidx=0; cidx < card->nr_controllers; cidx++) { 598 for (cidx = 0; cidx < card->nr_controllers; cidx++) {
599 ctrl = &card->ctrlinfo[cidx].capi_ctrl; 599 ctrl = &card->ctrlinfo[cidx].capi_ctrl;
600 capi_ctr_resume_output(ctrl); 600 capi_ctr_resume_output(ctrl);
601 } 601 }
602 break; 602 break;
603 603
604 case RECEIVE_STOP: 604 case RECEIVE_STOP:
605 for (cidx=0; cidx < card->nr_controllers; cidx++) { 605 for (cidx = 0; cidx < card->nr_controllers; cidx++) {
606 ctrl = &card->ctrlinfo[cidx].capi_ctrl; 606 ctrl = &card->ctrlinfo[cidx].capi_ctrl;
607 capi_ctr_suspend_output(ctrl); 607 capi_ctr_suspend_output(ctrl);
608 } 608 }
@@ -610,14 +610,14 @@ static void c4_handle_rx(avmcard *card)
610 610
611 case RECEIVE_INIT: 611 case RECEIVE_INIT:
612 612
613 cidx = card->nlogcontr; 613 cidx = card->nlogcontr;
614 if (cidx >= card->nr_controllers) { 614 if (cidx >= card->nr_controllers) {
615 printk(KERN_ERR "%s: card with %d controllers ??\n", 615 printk(KERN_ERR "%s: card with %d controllers ??\n",
616 card->name, cidx+1); 616 card->name, cidx + 1);
617 break; 617 break;
618 } 618 }
619 card->nlogcontr++; 619 card->nlogcontr++;
620 cinfo = &card->ctrlinfo[cidx]; 620 cinfo = &card->ctrlinfo[cidx];
621 ctrl = &cinfo->capi_ctrl; 621 ctrl = &cinfo->capi_ctrl;
622 cinfo->versionlen = _get_slice(&p, cinfo->versionbuf); 622 cinfo->versionlen = _get_slice(&p, cinfo->versionbuf);
623 b1_parse_version(cinfo); 623 b1_parse_version(cinfo);
@@ -632,23 +632,23 @@ static void c4_handle_rx(avmcard *card)
632 ApplId = (unsigned) _get_word(&p); 632 ApplId = (unsigned) _get_word(&p);
633 MsgLen = _get_slice(&p, card->msgbuf); 633 MsgLen = _get_slice(&p, card->msgbuf);
634 card->msgbuf[MsgLen] = 0; 634 card->msgbuf[MsgLen] = 0;
635 while ( MsgLen > 0 635 while (MsgLen > 0
636 && ( card->msgbuf[MsgLen-1] == '\n' 636 && (card->msgbuf[MsgLen - 1] == '\n'
637 || card->msgbuf[MsgLen-1] == '\r')) { 637 || card->msgbuf[MsgLen - 1] == '\r')) {
638 card->msgbuf[MsgLen-1] = 0; 638 card->msgbuf[MsgLen - 1] = 0;
639 MsgLen--; 639 MsgLen--;
640 } 640 }
641 printk(KERN_INFO "%s: task %d \"%s\" ready.\n", 641 printk(KERN_INFO "%s: task %d \"%s\" ready.\n",
642 card->name, ApplId, card->msgbuf); 642 card->name, ApplId, card->msgbuf);
643 break; 643 break;
644 644
645 case RECEIVE_DEBUGMSG: 645 case RECEIVE_DEBUGMSG:
646 MsgLen = _get_slice(&p, card->msgbuf); 646 MsgLen = _get_slice(&p, card->msgbuf);
647 card->msgbuf[MsgLen] = 0; 647 card->msgbuf[MsgLen] = 0;
648 while ( MsgLen > 0 648 while (MsgLen > 0
649 && ( card->msgbuf[MsgLen-1] == '\n' 649 && (card->msgbuf[MsgLen - 1] == '\n'
650 || card->msgbuf[MsgLen-1] == '\r')) { 650 || card->msgbuf[MsgLen - 1] == '\r')) {
651 card->msgbuf[MsgLen-1] = 0; 651 card->msgbuf[MsgLen - 1] = 0;
652 MsgLen--; 652 MsgLen--;
653 } 653 }
654 printk(KERN_INFO "%s: DEBUG: %s\n", card->name, card->msgbuf); 654 printk(KERN_INFO "%s: DEBUG: %s\n", card->name, card->msgbuf);
@@ -656,7 +656,7 @@ static void c4_handle_rx(avmcard *card)
656 656
657 default: 657 default:
658 printk(KERN_ERR "%s: c4_interrupt: 0x%x ???\n", 658 printk(KERN_ERR "%s: c4_interrupt: 0x%x ???\n",
659 card->name, b1cmd); 659 card->name, b1cmd);
660 return; 660 return;
661 } 661 }
662} 662}
@@ -669,16 +669,16 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
669 u32 status; 669 u32 status;
670 670
671 spin_lock_irqsave(&card->lock, flags); 671 spin_lock_irqsave(&card->lock, flags);
672 status = c4inmeml(card->mbase+DOORBELL); 672 status = c4inmeml(card->mbase + DOORBELL);
673 673
674 if (status & DBELL_RESET_HOST) { 674 if (status & DBELL_RESET_HOST) {
675 u_int i; 675 u_int i;
676 c4outmeml(card->mbase+PCI_OUT_INT_MASK, 0x0c); 676 c4outmeml(card->mbase + PCI_OUT_INT_MASK, 0x0c);
677 spin_unlock_irqrestore(&card->lock, flags); 677 spin_unlock_irqrestore(&card->lock, flags);
678 if (card->nlogcontr == 0) 678 if (card->nlogcontr == 0)
679 return IRQ_HANDLED; 679 return IRQ_HANDLED;
680 printk(KERN_ERR "%s: unexpected reset\n", card->name); 680 printk(KERN_ERR "%s: unexpected reset\n", card->name);
681 for (i=0; i < card->nr_controllers; i++) { 681 for (i = 0; i < card->nr_controllers; i++) {
682 avmctrl_info *cinfo = &card->ctrlinfo[i]; 682 avmctrl_info *cinfo = &card->ctrlinfo[i];
683 memset(cinfo->version, 0, sizeof(cinfo->version)); 683 memset(cinfo->version, 0, sizeof(cinfo->version));
684 spin_lock_irqsave(&card->lock, flags); 684 spin_lock_irqsave(&card->lock, flags);
@@ -695,23 +695,23 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
695 spin_unlock_irqrestore(&card->lock, flags); 695 spin_unlock_irqrestore(&card->lock, flags);
696 return IRQ_HANDLED; 696 return IRQ_HANDLED;
697 } 697 }
698 c4outmeml(card->mbase+DOORBELL, status); 698 c4outmeml(card->mbase + DOORBELL, status);
699 699
700 if ((status & DBELL_UP_HOST) != 0) { 700 if ((status & DBELL_UP_HOST) != 0) {
701 card->dma->recvlen = c4inmeml(card->mbase+MBOX_UP_LEN); 701 card->dma->recvlen = c4inmeml(card->mbase + MBOX_UP_LEN);
702 c4outmeml(card->mbase+MBOX_UP_LEN, 0); 702 c4outmeml(card->mbase + MBOX_UP_LEN, 0);
703 c4_handle_rx(card); 703 c4_handle_rx(card);
704 card->dma->recvlen = 0; 704 card->dma->recvlen = 0;
705 c4outmeml(card->mbase+MBOX_UP_LEN, card->dma->recvbuf.size); 705 c4outmeml(card->mbase + MBOX_UP_LEN, card->dma->recvbuf.size);
706 c4outmeml(card->mbase+DOORBELL, DBELL_UP_ARM); 706 c4outmeml(card->mbase + DOORBELL, DBELL_UP_ARM);
707 } 707 }
708 708
709 if ((status & DBELL_DOWN_HOST) != 0) { 709 if ((status & DBELL_DOWN_HOST) != 0) {
710 card->csr &= ~DBELL_DOWN_ARM; 710 card->csr &= ~DBELL_DOWN_ARM;
711 c4_dispatch_tx(card); 711 c4_dispatch_tx(card);
712 } else if (card->csr & DBELL_DOWN_HOST) { 712 } else if (card->csr & DBELL_DOWN_HOST) {
713 if (c4inmeml(card->mbase+MBOX_DOWN_LEN) == 0) { 713 if (c4inmeml(card->mbase + MBOX_DOWN_LEN) == 0) {
714 card->csr &= ~DBELL_DOWN_ARM; 714 card->csr &= ~DBELL_DOWN_ARM;
715 c4_dispatch_tx(card); 715 c4_dispatch_tx(card);
716 } 716 }
717 } 717 }
@@ -737,7 +737,7 @@ static void c4_send_init(avmcard *card)
737 skb = alloc_skb(15, GFP_ATOMIC); 737 skb = alloc_skb(15, GFP_ATOMIC);
738 if (!skb) { 738 if (!skb) {
739 printk(KERN_CRIT "%s: no memory, lost register appl.\n", 739 printk(KERN_CRIT "%s: no memory, lost register appl.\n",
740 card->name); 740 card->name);
741 return; 741 return;
742 } 742 }
743 p = skb->data; 743 p = skb->data;
@@ -745,7 +745,7 @@ static void c4_send_init(avmcard *card)
745 _put_byte(&p, 0); 745 _put_byte(&p, 0);
746 _put_byte(&p, SEND_INIT); 746 _put_byte(&p, SEND_INIT);
747 _put_word(&p, CAPI_MAXAPPL); 747 _put_word(&p, CAPI_MAXAPPL);
748 _put_word(&p, AVM_NCCI_PER_CHANNEL*30); 748 _put_word(&p, AVM_NCCI_PER_CHANNEL * 30);
749 _put_word(&p, card->cardnr - 1); 749 _put_word(&p, card->cardnr - 1);
750 skb_put(skb, (u8 *)p - (u8 *)skb->data); 750 skb_put(skb, (u8 *)p - (u8 *)skb->data);
751 751
@@ -761,10 +761,10 @@ static int queue_sendconfigword(avmcard *card, u32 val)
761 unsigned long flags; 761 unsigned long flags;
762 void *p; 762 void *p;
763 763
764 skb = alloc_skb(3+4, GFP_ATOMIC); 764 skb = alloc_skb(3 + 4, GFP_ATOMIC);
765 if (!skb) { 765 if (!skb) {
766 printk(KERN_CRIT "%s: no memory, send config\n", 766 printk(KERN_CRIT "%s: no memory, send config\n",
767 card->name); 767 card->name);
768 return -ENOMEM; 768 return -ENOMEM;
769 } 769 }
770 p = skb->data; 770 p = skb->data;
@@ -787,10 +787,10 @@ static int queue_sendconfig(avmcard *card, char cval[4])
787 unsigned long flags; 787 unsigned long flags;
788 void *p; 788 void *p;
789 789
790 skb = alloc_skb(3+4, GFP_ATOMIC); 790 skb = alloc_skb(3 + 4, GFP_ATOMIC);
791 if (!skb) { 791 if (!skb) {
792 printk(KERN_CRIT "%s: no memory, send config\n", 792 printk(KERN_CRIT "%s: no memory, send config\n",
793 card->name); 793 card->name);
794 return -ENOMEM; 794 return -ENOMEM;
795 } 795 }
796 p = skb->data; 796 p = skb->data;
@@ -804,20 +804,20 @@ static int queue_sendconfig(avmcard *card, char cval[4])
804 skb_put(skb, (u8 *)p - (u8 *)skb->data); 804 skb_put(skb, (u8 *)p - (u8 *)skb->data);
805 805
806 skb_queue_tail(&card->dma->send_queue, skb); 806 skb_queue_tail(&card->dma->send_queue, skb);
807 807
808 spin_lock_irqsave(&card->lock, flags); 808 spin_lock_irqsave(&card->lock, flags);
809 c4_dispatch_tx(card); 809 c4_dispatch_tx(card);
810 spin_unlock_irqrestore(&card->lock, flags); 810 spin_unlock_irqrestore(&card->lock, flags);
811 return 0; 811 return 0;
812} 812}
813 813
814static int c4_send_config(avmcard *card, capiloaddatapart * config) 814static int c4_send_config(avmcard *card, capiloaddatapart *config)
815{ 815{
816 u8 val[4]; 816 u8 val[4];
817 unsigned char *dp; 817 unsigned char *dp;
818 u_int left; 818 u_int left;
819 int retval; 819 int retval;
820 820
821 if ((retval = queue_sendconfigword(card, 1)) != 0) 821 if ((retval = queue_sendconfigword(card, 1)) != 0)
822 return retval; 822 return retval;
823 if ((retval = queue_sendconfigword(card, config->len)) != 0) 823 if ((retval = queue_sendconfigword(card, config->len)) != 0)
@@ -826,7 +826,7 @@ static int c4_send_config(avmcard *card, capiloaddatapart * config)
826 dp = config->data; 826 dp = config->data;
827 left = config->len; 827 left = config->len;
828 while (left >= sizeof(u32)) { 828 while (left >= sizeof(u32)) {
829 if (config->user) { 829 if (config->user) {
830 if (copy_from_user(val, dp, sizeof(val))) 830 if (copy_from_user(val, dp, sizeof(val)))
831 return -EFAULT; 831 return -EFAULT;
832 } else { 832 } else {
@@ -860,37 +860,37 @@ static int c4_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
860 860
861 if ((retval = c4_load_t4file(card, &data->firmware))) { 861 if ((retval = c4_load_t4file(card, &data->firmware))) {
862 printk(KERN_ERR "%s: failed to load t4file!!\n", 862 printk(KERN_ERR "%s: failed to load t4file!!\n",
863 card->name); 863 card->name);
864 c4_reset(card); 864 c4_reset(card);
865 return retval; 865 return retval;
866 } 866 }
867 867
868 card->csr = 0; 868 card->csr = 0;
869 c4outmeml(card->mbase+MBOX_UP_LEN, 0); 869 c4outmeml(card->mbase + MBOX_UP_LEN, 0);
870 c4outmeml(card->mbase+MBOX_DOWN_LEN, 0); 870 c4outmeml(card->mbase + MBOX_DOWN_LEN, 0);
871 c4outmeml(card->mbase+DOORBELL, DBELL_INIT); 871 c4outmeml(card->mbase + DOORBELL, DBELL_INIT);
872 mdelay(1); 872 mdelay(1);
873 c4outmeml(card->mbase+DOORBELL, 873 c4outmeml(card->mbase + DOORBELL,
874 DBELL_UP_HOST | DBELL_DOWN_HOST | DBELL_RESET_HOST); 874 DBELL_UP_HOST | DBELL_DOWN_HOST | DBELL_RESET_HOST);
875 875
876 c4outmeml(card->mbase+PCI_OUT_INT_MASK, 0x08); 876 c4outmeml(card->mbase + PCI_OUT_INT_MASK, 0x08);
877 877
878 card->dma->recvlen = 0; 878 card->dma->recvlen = 0;
879 c4outmeml(card->mbase+MBOX_UP_ADDR, card->dma->recvbuf.dmaaddr); 879 c4outmeml(card->mbase + MBOX_UP_ADDR, card->dma->recvbuf.dmaaddr);
880 c4outmeml(card->mbase+MBOX_UP_LEN, card->dma->recvbuf.size); 880 c4outmeml(card->mbase + MBOX_UP_LEN, card->dma->recvbuf.size);
881 c4outmeml(card->mbase+DOORBELL, DBELL_UP_ARM); 881 c4outmeml(card->mbase + DOORBELL, DBELL_UP_ARM);
882 882
883 if (data->configuration.len > 0 && data->configuration.data) { 883 if (data->configuration.len > 0 && data->configuration.data) {
884 retval = c4_send_config(card, &data->configuration); 884 retval = c4_send_config(card, &data->configuration);
885 if (retval) { 885 if (retval) {
886 printk(KERN_ERR "%s: failed to set config!!\n", 886 printk(KERN_ERR "%s: failed to set config!!\n",
887 card->name); 887 card->name);
888 c4_reset(card); 888 c4_reset(card);
889 return retval; 889 return retval;
890 } 890 }
891 } 891 }
892 892
893 c4_send_init(card); 893 c4_send_init(card);
894 894
895 return 0; 895 return 0;
896} 896}
@@ -905,11 +905,11 @@ static void c4_reset_ctr(struct capi_ctr *ctrl)
905 905
906 spin_lock_irqsave(&card->lock, flags); 906 spin_lock_irqsave(&card->lock, flags);
907 907
908 c4_reset(card); 908 c4_reset(card);
909 909
910 spin_unlock_irqrestore(&card->lock, flags); 910 spin_unlock_irqrestore(&card->lock, flags);
911 911
912 for (i=0; i < card->nr_controllers; i++) { 912 for (i = 0; i < card->nr_controllers; i++) {
913 cinfo = &card->ctrlinfo[i]; 913 cinfo = &card->ctrlinfo[i];
914 memset(cinfo->version, 0, sizeof(cinfo->version)); 914 memset(cinfo->version, 0, sizeof(cinfo->version));
915 capi_ctr_down(&cinfo->capi_ctrl); 915 capi_ctr_down(&cinfo->capi_ctrl);
@@ -926,9 +926,9 @@ static void c4_remove(struct pci_dev *pdev)
926 if (!card) 926 if (!card)
927 return; 927 return;
928 928
929 c4_reset(card); 929 c4_reset(card);
930 930
931 for (i=0; i < card->nr_controllers; i++) { 931 for (i = 0; i < card->nr_controllers; i++) {
932 cinfo = &card->ctrlinfo[i]; 932 cinfo = &card->ctrlinfo[i];
933 detach_capi_ctr(&cinfo->capi_ctrl); 933 detach_capi_ctr(&cinfo->capi_ctrl);
934 } 934 }
@@ -936,8 +936,8 @@ static void c4_remove(struct pci_dev *pdev)
936 free_irq(card->irq, card); 936 free_irq(card->irq, card);
937 iounmap(card->mbase); 937 iounmap(card->mbase);
938 release_region(card->port, AVMB1_PORTLEN); 938 release_region(card->port, AVMB1_PORTLEN);
939 avmcard_dma_free(card->dma); 939 avmcard_dma_free(card->dma);
940 pci_set_drvdata(pdev, NULL); 940 pci_set_drvdata(pdev, NULL);
941 b1_free_card(card); 941 b1_free_card(card);
942} 942}
943 943
@@ -945,8 +945,8 @@ static void c4_remove(struct pci_dev *pdev)
945 945
946 946
947static void c4_register_appl(struct capi_ctr *ctrl, 947static void c4_register_appl(struct capi_ctr *ctrl,
948 u16 appl, 948 u16 appl,
949 capi_register_params *rp) 949 capi_register_params *rp)
950{ 950{
951 avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata); 951 avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
952 avmcard *card = cinfo->card; 952 avmcard *card = cinfo->card;
@@ -965,7 +965,7 @@ static void c4_register_appl(struct capi_ctr *ctrl,
965 skb = alloc_skb(23, GFP_ATOMIC); 965 skb = alloc_skb(23, GFP_ATOMIC);
966 if (!skb) { 966 if (!skb) {
967 printk(KERN_CRIT "%s: no memory, lost register appl.\n", 967 printk(KERN_CRIT "%s: no memory, lost register appl.\n",
968 card->name); 968 card->name);
969 return; 969 return;
970 } 970 }
971 p = skb->data; 971 p = skb->data;
@@ -973,14 +973,14 @@ static void c4_register_appl(struct capi_ctr *ctrl,
973 _put_byte(&p, 0); 973 _put_byte(&p, 0);
974 _put_byte(&p, SEND_REGISTER); 974 _put_byte(&p, SEND_REGISTER);
975 _put_word(&p, appl); 975 _put_word(&p, appl);
976 _put_word(&p, 1024 * (nconn+1)); 976 _put_word(&p, 1024 * (nconn + 1));
977 _put_word(&p, nconn); 977 _put_word(&p, nconn);
978 _put_word(&p, rp->datablkcnt); 978 _put_word(&p, rp->datablkcnt);
979 _put_word(&p, rp->datablklen); 979 _put_word(&p, rp->datablklen);
980 skb_put(skb, (u8 *)p - (u8 *)skb->data); 980 skb_put(skb, (u8 *)p - (u8 *)skb->data);
981 981
982 skb_queue_tail(&card->dma->send_queue, skb); 982 skb_queue_tail(&card->dma->send_queue, skb);
983 983
984 spin_lock_irqsave(&card->lock, flags); 984 spin_lock_irqsave(&card->lock, flags);
985 c4_dispatch_tx(card); 985 c4_dispatch_tx(card);
986 spin_unlock_irqrestore(&card->lock, flags); 986 spin_unlock_irqrestore(&card->lock, flags);
@@ -1005,7 +1005,7 @@ static void c4_release_appl(struct capi_ctr *ctrl, u16 appl)
1005 skb = alloc_skb(7, GFP_ATOMIC); 1005 skb = alloc_skb(7, GFP_ATOMIC);
1006 if (!skb) { 1006 if (!skb) {
1007 printk(KERN_CRIT "%s: no memory, lost release appl.\n", 1007 printk(KERN_CRIT "%s: no memory, lost release appl.\n",
1008 card->name); 1008 card->name);
1009 return; 1009 return;
1010 } 1010 }
1011 p = skb->data; 1011 p = skb->data;
@@ -1098,29 +1098,29 @@ static int c4_proc_show(struct seq_file *m, void *v)
1098 seq_printf(m, "%-16s %s\n", "ver_serial", s); 1098 seq_printf(m, "%-16s %s\n", "ver_serial", s);
1099 1099
1100 if (card->cardtype != avm_m1) { 1100 if (card->cardtype != avm_m1) {
1101 flag = ((u8 *)(ctrl->profile.manu))[3]; 1101 flag = ((u8 *)(ctrl->profile.manu))[3];
1102 if (flag) 1102 if (flag)
1103 seq_printf(m, "%-16s%s%s%s%s%s%s%s\n", 1103 seq_printf(m, "%-16s%s%s%s%s%s%s%s\n",
1104 "protocol", 1104 "protocol",
1105 (flag & 0x01) ? " DSS1" : "", 1105 (flag & 0x01) ? " DSS1" : "",
1106 (flag & 0x02) ? " CT1" : "", 1106 (flag & 0x02) ? " CT1" : "",
1107 (flag & 0x04) ? " VN3" : "", 1107 (flag & 0x04) ? " VN3" : "",
1108 (flag & 0x08) ? " NI1" : "", 1108 (flag & 0x08) ? " NI1" : "",
1109 (flag & 0x10) ? " AUSTEL" : "", 1109 (flag & 0x10) ? " AUSTEL" : "",
1110 (flag & 0x20) ? " ESS" : "", 1110 (flag & 0x20) ? " ESS" : "",
1111 (flag & 0x40) ? " 1TR6" : "" 1111 (flag & 0x40) ? " 1TR6" : ""
1112 ); 1112 );
1113 } 1113 }
1114 if (card->cardtype != avm_m1) { 1114 if (card->cardtype != avm_m1) {
1115 flag = ((u8 *)(ctrl->profile.manu))[5]; 1115 flag = ((u8 *)(ctrl->profile.manu))[5];
1116 if (flag) 1116 if (flag)
1117 seq_printf(m, "%-16s%s%s%s%s\n", 1117 seq_printf(m, "%-16s%s%s%s%s\n",
1118 "linetype", 1118 "linetype",
1119 (flag & 0x01) ? " point to point" : "", 1119 (flag & 0x01) ? " point to point" : "",
1120 (flag & 0x02) ? " point to multipoint" : "", 1120 (flag & 0x02) ? " point to multipoint" : "",
1121 (flag & 0x08) ? " leased line without D-channel" : "", 1121 (flag & 0x08) ? " leased line without D-channel" : "",
1122 (flag & 0x04) ? " leased line with D-channel" : "" 1122 (flag & 0x04) ? " leased line with D-channel" : ""
1123 ); 1123 );
1124 } 1124 }
1125 seq_printf(m, "%-16s %s\n", "cardname", cinfo->cardname); 1125 seq_printf(m, "%-16s %s\n", "cardname", cinfo->cardname);
1126 1126
@@ -1156,7 +1156,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
1156 retval = -ENOMEM; 1156 retval = -ENOMEM;
1157 goto err; 1157 goto err;
1158 } 1158 }
1159 card->dma = avmcard_dma_alloc("c4", dev, 2048+128, 2048+128); 1159 card->dma = avmcard_dma_alloc("c4", dev, 2048 + 128, 2048 + 128);
1160 if (!card->dma) { 1160 if (!card->dma) {
1161 printk(KERN_WARNING "c4: no memory.\n"); 1161 printk(KERN_WARNING "c4: no memory.\n");
1162 retval = -ENOMEM; 1162 retval = -ENOMEM;
@@ -1195,12 +1195,12 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
1195 1195
1196 retval = request_irq(card->irq, c4_interrupt, IRQF_SHARED, card->name, card); 1196 retval = request_irq(card->irq, c4_interrupt, IRQF_SHARED, card->name, card);
1197 if (retval) { 1197 if (retval) {
1198 printk(KERN_ERR "c4: unable to get IRQ %d.\n",card->irq); 1198 printk(KERN_ERR "c4: unable to get IRQ %d.\n", card->irq);
1199 retval = -EBUSY; 1199 retval = -EBUSY;
1200 goto err_unmap; 1200 goto err_unmap;
1201 } 1201 }
1202 1202
1203 for (i=0; i < nr_controllers ; i++) { 1203 for (i = 0; i < nr_controllers; i++) {
1204 cinfo = &card->ctrlinfo[i]; 1204 cinfo = &card->ctrlinfo[i];
1205 cinfo->capi_ctrl.owner = THIS_MODULE; 1205 cinfo->capi_ctrl.owner = THIS_MODULE;
1206 cinfo->capi_ctrl.driver_name = "c4"; 1206 cinfo->capi_ctrl.driver_name = "c4";
@@ -1233,17 +1233,17 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
1233 pci_set_drvdata(dev, card); 1233 pci_set_drvdata(dev, card);
1234 return 0; 1234 return 0;
1235 1235
1236 err_free_irq: 1236err_free_irq:
1237 free_irq(card->irq, card); 1237 free_irq(card->irq, card);
1238 err_unmap: 1238err_unmap:
1239 iounmap(card->mbase); 1239 iounmap(card->mbase);
1240 err_release_region: 1240err_release_region:
1241 release_region(card->port, AVMB1_PORTLEN); 1241 release_region(card->port, AVMB1_PORTLEN);
1242 err_free_dma: 1242err_free_dma:
1243 avmcard_dma_free(card->dma); 1243 avmcard_dma_free(card->dma);
1244 err_free: 1244err_free:
1245 b1_free_card(card); 1245 b1_free_card(card);
1246 err: 1246err:
1247 return retval; 1247 return retval;
1248} 1248}
1249 1249
@@ -1265,10 +1265,10 @@ static int __devinit c4_probe(struct pci_dev *dev,
1265 param.port = pci_resource_start(dev, 1); 1265 param.port = pci_resource_start(dev, 1);
1266 param.irq = dev->irq; 1266 param.irq = dev->irq;
1267 param.membase = pci_resource_start(dev, 0); 1267 param.membase = pci_resource_start(dev, 0);
1268 1268
1269 printk(KERN_INFO "c4: PCI BIOS reports AVM-C%d at i/o %#x, irq %d, mem %#x\n", 1269 printk(KERN_INFO "c4: PCI BIOS reports AVM-C%d at i/o %#x, irq %d, mem %#x\n",
1270 nr, param.port, param.irq, param.membase); 1270 nr, param.port, param.irq, param.membase);
1271 1271
1272 retval = c4_add_card(&param, dev, nr); 1272 retval = c4_add_card(&param, dev, nr);
1273 if (retval != 0) { 1273 if (retval != 0) {
1274 printk(KERN_ERR "c4: no AVM-C%d at i/o %#x, irq %d detected, mem %#x\n", 1274 printk(KERN_ERR "c4: no AVM-C%d at i/o %#x, irq %d detected, mem %#x\n",
@@ -1280,10 +1280,10 @@ static int __devinit c4_probe(struct pci_dev *dev,
1280} 1280}
1281 1281
1282static struct pci_driver c4_pci_driver = { 1282static struct pci_driver c4_pci_driver = {
1283 .name = "c4", 1283 .name = "c4",
1284 .id_table = c4_pci_tbl, 1284 .id_table = c4_pci_tbl,
1285 .probe = c4_probe, 1285 .probe = c4_probe,
1286 .remove = c4_remove, 1286 .remove = c4_remove,
1287}; 1287};
1288 1288
1289static struct capi_driver capi_driver_c2 = { 1289static struct capi_driver capi_driver_c2 = {
@@ -1305,7 +1305,7 @@ static int __init c4_init(void)
1305 if ((p = strchr(revision, ':')) != NULL && p[1]) { 1305 if ((p = strchr(revision, ':')) != NULL && p[1]) {
1306 strlcpy(rev, p + 2, 32); 1306 strlcpy(rev, p + 2, 32);
1307 if ((p = strchr(rev, '$')) != NULL && p > rev) 1307 if ((p = strchr(rev, '$')) != NULL && p > rev)
1308 *(p-1) = 0; 1308 *(p - 1) = 0;
1309 } else 1309 } else
1310 strcpy(rev, "1.0"); 1310 strcpy(rev, "1.0");
1311 1311
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-22 11:38:49 -0400