aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/elsa.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/elsa.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/elsa.c')
-rw-r--r--drivers/isdn/hisax/elsa.c500
1 files changed, 250 insertions, 250 deletions
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 5d9d338814aa..64ba26a4afe6 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -4,7 +4,7 @@
4 * 4 *
5 * Author Karsten Keil 5 * Author Karsten Keil
6 * Copyright by Karsten Keil <keil@isdn4linux.de> 6 * Copyright by Karsten Keil <keil@isdn4linux.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 *
@@ -34,14 +34,14 @@
34static const char *Elsa_revision = "$Revision: 2.32.2.4 $"; 34static const char *Elsa_revision = "$Revision: 2.32.2.4 $";
35static const char *Elsa_Types[] = 35static const char *Elsa_Types[] =
36{"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro", 36{"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro",
37 "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI", 37 "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI",
38 "PCMCIA-IPAC" }; 38 "PCMCIA-IPAC" };
39 39
40static const char *ITACVer[] = 40static const char *ITACVer[] =
41{"?0?", "?1?", "?2?", "?3?", "?4?", "V2.2", 41{"?0?", "?1?", "?2?", "?3?", "?4?", "V2.2",
42 "B1", "A1"}; 42 "B1", "A1"};
43 43
44#define byteout(addr,val) outb(val,addr) 44#define byteout(addr, val) outb(val, addr)
45#define bytein(addr) inb(addr) 45#define bytein(addr) inb(addr)
46 46
47#define ELSA_ISAC 0 47#define ELSA_ISAC 0
@@ -113,25 +113,25 @@ static const char *ITACVer[] =
113 113
114#if ARCOFI_USE 114#if ARCOFI_USE
115static struct arcofi_msg ARCOFI_XOP_F = 115static struct arcofi_msg ARCOFI_XOP_F =
116 {NULL,0,2,{0xa1,0x3f,0,0,0,0,0,0,0,0}}; /* Normal OP */ 116{NULL,0,2,{0xa1,0x3f,0,0,0,0,0,0,0,0}}; /* Normal OP */
117static struct arcofi_msg ARCOFI_XOP_1 = 117static struct arcofi_msg ARCOFI_XOP_1 =
118 {&ARCOFI_XOP_F,0,2,{0xa1,0x31,0,0,0,0,0,0,0,0}}; /* PWR UP */ 118{&ARCOFI_XOP_F,0,2,{0xa1,0x31,0,0,0,0,0,0,0,0}}; /* PWR UP */
119static struct arcofi_msg ARCOFI_SOP_F = 119static struct arcofi_msg ARCOFI_SOP_F =
120 {&ARCOFI_XOP_1,0,10,{0xa1,0x1f,0x00,0x50,0x10,0x00,0x00,0x80,0x02,0x12}}; 120{&ARCOFI_XOP_1,0,10,{0xa1,0x1f,0x00,0x50,0x10,0x00,0x00,0x80,0x02,0x12}};
121static struct arcofi_msg ARCOFI_COP_9 = 121static struct arcofi_msg ARCOFI_COP_9 =
122 {&ARCOFI_SOP_F,0,10,{0xa1,0x29,0x80,0xcb,0xe9,0x88,0x00,0xc8,0xd8,0x80}}; /* RX */ 122{&ARCOFI_SOP_F,0,10,{0xa1,0x29,0x80,0xcb,0xe9,0x88,0x00,0xc8,0xd8,0x80}}; /* RX */
123static struct arcofi_msg ARCOFI_COP_8 = 123static struct arcofi_msg ARCOFI_COP_8 =
124 {&ARCOFI_COP_9,0,10,{0xa1,0x28,0x49,0x31,0x8,0x13,0x6e,0x88,0x2a,0x61}}; /* TX */ 124{&ARCOFI_COP_9,0,10,{0xa1,0x28,0x49,0x31,0x8,0x13,0x6e,0x88,0x2a,0x61}}; /* TX */
125static struct arcofi_msg ARCOFI_COP_7 = 125static struct arcofi_msg ARCOFI_COP_7 =
126 {&ARCOFI_COP_8,0,4,{0xa1,0x27,0x80,0x80,0,0,0,0,0,0}}; /* GZ */ 126{&ARCOFI_COP_8,0,4,{0xa1,0x27,0x80,0x80,0,0,0,0,0,0}}; /* GZ */
127static struct arcofi_msg ARCOFI_COP_6 = 127static struct arcofi_msg ARCOFI_COP_6 =
128 {&ARCOFI_COP_7,0,6,{0xa1,0x26,0,0,0x82,0x7c,0,0,0,0}}; /* GRL GRH */ 128{&ARCOFI_COP_7,0,6,{0xa1,0x26,0,0,0x82,0x7c,0,0,0,0}}; /* GRL GRH */
129static struct arcofi_msg ARCOFI_COP_5 = 129static struct arcofi_msg ARCOFI_COP_5 =
130 {&ARCOFI_COP_6,0,4,{0xa1,0x25,0xbb,0x4a,0,0,0,0,0,0}}; /* GTX */ 130{&ARCOFI_COP_6,0,4,{0xa1,0x25,0xbb,0x4a,0,0,0,0,0,0}}; /* GTX */
131static struct arcofi_msg ARCOFI_VERSION = 131static struct arcofi_msg ARCOFI_VERSION =
132 {NULL,1,2,{0xa0,0,0,0,0,0,0,0,0,0}}; 132{NULL,1,2,{0xa0,0,0,0,0,0,0,0,0,0}};
133static struct arcofi_msg ARCOFI_XOP_0 = 133static struct arcofi_msg ARCOFI_XOP_0 =
134 {NULL,0,2,{0xa1,0x30,0,0,0,0,0,0,0,0}}; /* PWR Down */ 134{NULL,0,2,{0xa1,0x30,0,0,0,0,0,0,0,0}}; /* PWR Down */
135 135
136static void set_arcofi(struct IsdnCardState *cs, int bc); 136static void set_arcofi(struct IsdnCardState *cs, int bc);
137 137
@@ -149,7 +149,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off)
149} 149}
150 150
151static inline void 151static inline void
152readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) 152readfifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size)
153{ 153{
154 byteout(ale, off); 154 byteout(ale, off);
155 insb(adr, data, size); 155 insb(adr, data, size);
@@ -164,7 +164,7 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data)
164} 164}
165 165
166static inline void 166static inline void
167writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) 167writefifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size)
168{ 168{
169 byteout(ale, off); 169 byteout(ale, off);
170 outsb(adr, data, size); 170 outsb(adr, data, size);
@@ -185,13 +185,13 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
185} 185}
186 186
187static void 187static void
188ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) 188ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size)
189{ 189{
190 readfifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0, data, size); 190 readfifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0, data, size);
191} 191}
192 192
193static void 193static void
194WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) 194WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size)
195{ 195{
196 writefifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0, data, size); 196 writefifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0, data, size);
197} 197}
@@ -199,23 +199,23 @@ WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)
199static u_char 199static u_char
200ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) 200ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset)
201{ 201{
202 return (readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset+0x80)); 202 return (readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset + 0x80));
203} 203}
204 204
205static void 205static void
206WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) 206WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value)
207{ 207{
208 writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset|0x80, value); 208 writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset | 0x80, value);
209} 209}
210 210
211static void 211static void
212ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) 212ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char *data, int size)
213{ 213{
214 readfifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0x80, data, size); 214 readfifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0x80, data, size);
215} 215}
216 216
217static void 217static void
218WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) 218WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char *data, int size)
219{ 219{
220 writefifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0x80, data, size); 220 writefifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0x80, data, size);
221} 221}
@@ -267,16 +267,16 @@ TimerRun(struct IsdnCardState *cs)
267 * fast interrupt HSCX stuff goes here 267 * fast interrupt HSCX stuff goes here
268 */ 268 */
269 269
270#define READHSCX(cs, nr, reg) readreg(cs->hw.elsa.ale, \ 270#define READHSCX(cs, nr, reg) readreg(cs->hw.elsa.ale, \
271 cs->hw.elsa.hscx, reg + (nr ? 0x40 : 0)) 271 cs->hw.elsa.hscx, reg + (nr ? 0x40 : 0))
272#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.elsa.ale, \ 272#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.elsa.ale, \
273 cs->hw.elsa.hscx, reg + (nr ? 0x40 : 0), data) 273 cs->hw.elsa.hscx, reg + (nr ? 0x40 : 0), data)
274 274
275#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.elsa.ale, \ 275#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.elsa.ale, \
276 cs->hw.elsa.hscx, (nr ? 0x40 : 0), ptr, cnt) 276 cs->hw.elsa.hscx, (nr ? 0x40 : 0), ptr, cnt)
277 277
278#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.elsa.ale, \ 278#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.elsa.ale, \
279 cs->hw.elsa.hscx, (nr ? 0x40 : 0), ptr, cnt) 279 cs->hw.elsa.hscx, (nr ? 0x40 : 0), ptr, cnt)
280 280
281#include "hscx_irq.c" 281#include "hscx_irq.c"
282 282
@@ -286,11 +286,11 @@ elsa_interrupt(int intno, void *dev_id)
286 struct IsdnCardState *cs = dev_id; 286 struct IsdnCardState *cs = dev_id;
287 u_long flags; 287 u_long flags;
288 u_char val; 288 u_char val;
289 int icnt=5; 289 int icnt = 5;
290 290
291 if ((cs->typ == ISDN_CTYPE_ELSA_PCMCIA) && (*cs->busy_flag == 1)) { 291 if ((cs->typ == ISDN_CTYPE_ELSA_PCMCIA) && (*cs->busy_flag == 1)) {
292 /* The card tends to generate interrupts while being removed 292 /* The card tends to generate interrupts while being removed
293 causing us to just crash the kernel. bad. */ 293 causing us to just crash the kernel. bad. */
294 printk(KERN_WARNING "Elsa: card not available!\n"); 294 printk(KERN_WARNING "Elsa: card not available!\n");
295 return IRQ_NONE; 295 return IRQ_NONE;
296 } 296 }
@@ -299,18 +299,18 @@ elsa_interrupt(int intno, void *dev_id)
299 if (cs->hw.elsa.MFlag) { 299 if (cs->hw.elsa.MFlag) {
300 val = serial_inp(cs, UART_IIR); 300 val = serial_inp(cs, UART_IIR);
301 if (!(val & UART_IIR_NO_INT)) { 301 if (!(val & UART_IIR_NO_INT)) {
302 debugl1(cs,"IIR %02x", val); 302 debugl1(cs, "IIR %02x", val);
303 rs_interrupt_elsa(cs); 303 rs_interrupt_elsa(cs);
304 } 304 }
305 } 305 }
306#endif 306#endif
307 val = readreg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_ISTA + 0x40); 307 val = readreg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_ISTA + 0x40);
308 Start_HSCX: 308Start_HSCX:
309 if (val) { 309 if (val) {
310 hscx_int_main(cs, val); 310 hscx_int_main(cs, val);
311 } 311 }
312 val = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_ISTA); 312 val = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_ISTA);
313 Start_ISAC: 313Start_ISAC:
314 if (val) { 314 if (val) {
315 isac_interrupt(cs, val); 315 isac_interrupt(cs, val);
316 } 316 }
@@ -364,8 +364,8 @@ elsa_interrupt_ipac(int intno, void *dev_id)
364{ 364{
365 struct IsdnCardState *cs = dev_id; 365 struct IsdnCardState *cs = dev_id;
366 u_long flags; 366 u_long flags;
367 u_char ista,val; 367 u_char ista, val;
368 int icnt=5; 368 int icnt = 5;
369 369
370 spin_lock_irqsave(&cs->lock, flags); 370 spin_lock_irqsave(&cs->lock, flags);
371 if (cs->subtyp == ELSA_QS1000PCI || cs->subtyp == ELSA_QS3000PCI) { 371 if (cs->subtyp == ELSA_QS1000PCI || cs->subtyp == ELSA_QS3000PCI) {
@@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id)
379 if (cs->hw.elsa.MFlag) { 379 if (cs->hw.elsa.MFlag) {
380 val = serial_inp(cs, UART_IIR); 380 val = serial_inp(cs, UART_IIR);
381 if (!(val & UART_IIR_NO_INT)) { 381 if (!(val & UART_IIR_NO_INT)) {
382 debugl1(cs,"IIR %02x", val); 382 debugl1(cs, "IIR %02x", val);
383 rs_interrupt_elsa(cs); 383 rs_interrupt_elsa(cs);
384 } 384 }
385 } 385 }
@@ -444,13 +444,13 @@ release_io_elsa(struct IsdnCardState *cs)
444 writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff); 444 writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff);
445 release_region(cs->hw.elsa.cfg, 0x80); 445 release_region(cs->hw.elsa.cfg, 0x80);
446 } 446 }
447 if (cs->subtyp == ELSA_PCMCIA_IPAC) { 447 if (cs->subtyp == ELSA_PCMCIA_IPAC) {
448 writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff); 448 writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff);
449 } 449 }
450 if ((cs->subtyp == ELSA_PCFPRO) || 450 if ((cs->subtyp == ELSA_PCFPRO) ||
451 (cs->subtyp == ELSA_QS3000) || 451 (cs->subtyp == ELSA_QS3000) ||
452 (cs->subtyp == ELSA_PCF) || 452 (cs->subtyp == ELSA_PCF) ||
453 (cs->subtyp == ELSA_QS3000PCI)) { 453 (cs->subtyp == ELSA_QS3000PCI)) {
454 bytecnt = 16; 454 bytecnt = 16;
455#if ARCOFI_USE 455#if ARCOFI_USE
456 release_modem(cs); 456 release_modem(cs);
@@ -521,84 +521,84 @@ check_arcofi(struct IsdnCardState *cs)
521 u_char *p; 521 u_char *p;
522 522
523 if (!cs->dc.isac.mon_tx) 523 if (!cs->dc.isac.mon_tx)
524 if (!(cs->dc.isac.mon_tx=kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { 524 if (!(cs->dc.isac.mon_tx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
525 if (cs->debug & L1_DEB_WARN) 525 if (cs->debug & L1_DEB_WARN)
526 debugl1(cs, "ISAC MON TX out of buffers!"); 526 debugl1(cs, "ISAC MON TX out of buffers!");
527 return(0); 527 return (0);
528 } 528 }
529 cs->dc.isac.arcofi_bc = 0; 529 cs->dc.isac.arcofi_bc = 0;
530 arcofi_fsm(cs, ARCOFI_START, &ARCOFI_VERSION); 530 arcofi_fsm(cs, ARCOFI_START, &ARCOFI_VERSION);
531 interruptible_sleep_on(&cs->dc.isac.arcofi_wait); 531 interruptible_sleep_on(&cs->dc.isac.arcofi_wait);
532 if (!test_and_clear_bit(FLG_ARCOFI_ERROR, &cs->HW_Flags)) { 532 if (!test_and_clear_bit(FLG_ARCOFI_ERROR, &cs->HW_Flags)) {
533 debugl1(cs, "Arcofi response received %d bytes", cs->dc.isac.mon_rxp); 533 debugl1(cs, "Arcofi response received %d bytes", cs->dc.isac.mon_rxp);
534 p = cs->dc.isac.mon_rx; 534 p = cs->dc.isac.mon_rx;
535 t = tmp; 535 t = tmp;
536 t += sprintf(tmp, "Arcofi data"); 536 t += sprintf(tmp, "Arcofi data");
537 QuickHex(t, p, cs->dc.isac.mon_rxp); 537 QuickHex(t, p, cs->dc.isac.mon_rxp);
538 debugl1(cs, tmp); 538 debugl1(cs, tmp);
539 if ((cs->dc.isac.mon_rxp == 2) && (cs->dc.isac.mon_rx[0] == 0xa0)) { 539 if ((cs->dc.isac.mon_rxp == 2) && (cs->dc.isac.mon_rx[0] == 0xa0)) {
540 switch(cs->dc.isac.mon_rx[1]) { 540 switch (cs->dc.isac.mon_rx[1]) {
541 case 0x80: 541 case 0x80:
542 debugl1(cs, "Arcofi 2160 detected"); 542 debugl1(cs, "Arcofi 2160 detected");
543 arcofi_present = 1; 543 arcofi_present = 1;
544 break; 544 break;
545 case 0x82: 545 case 0x82:
546 debugl1(cs, "Arcofi 2165 detected"); 546 debugl1(cs, "Arcofi 2165 detected");
547 arcofi_present = 2; 547 arcofi_present = 2;
548 break; 548 break;
549 case 0x84: 549 case 0x84:
550 debugl1(cs, "Arcofi 2163 detected"); 550 debugl1(cs, "Arcofi 2163 detected");
551 arcofi_present = 3; 551 arcofi_present = 3;
552 break; 552 break;
553 default: 553 default:
554 debugl1(cs, "unknown Arcofi response"); 554 debugl1(cs, "unknown Arcofi response");
555 break; 555 break;
556 } 556 }
557 } else 557 } else
558 debugl1(cs, "undefined Monitor response"); 558 debugl1(cs, "undefined Monitor response");
559 cs->dc.isac.mon_rxp = 0; 559 cs->dc.isac.mon_rxp = 0;
560 } else if (cs->dc.isac.mon_tx) { 560 } else if (cs->dc.isac.mon_tx) {
561 debugl1(cs, "Arcofi not detected"); 561 debugl1(cs, "Arcofi not detected");
562 } 562 }
563 if (arcofi_present) { 563 if (arcofi_present) {
564 if (cs->subtyp==ELSA_QS1000) { 564 if (cs->subtyp == ELSA_QS1000) {
565 cs->subtyp = ELSA_QS3000; 565 cs->subtyp = ELSA_QS3000;
566 printk(KERN_INFO 566 printk(KERN_INFO
567 "Elsa: %s detected modem at 0x%lx\n", 567 "Elsa: %s detected modem at 0x%lx\n",
568 Elsa_Types[cs->subtyp], 568 Elsa_Types[cs->subtyp],
569 cs->hw.elsa.base+8); 569 cs->hw.elsa.base + 8);
570 release_region(cs->hw.elsa.base, 8); 570 release_region(cs->hw.elsa.base, 8);
571 if (!request_region(cs->hw.elsa.base, 16, "elsa isdn modem")) { 571 if (!request_region(cs->hw.elsa.base, 16, "elsa isdn modem")) {
572 printk(KERN_WARNING 572 printk(KERN_WARNING
573 "HiSax: %s config port %lx-%lx already in use\n", 573 "HiSax: %s config port %lx-%lx already in use\n",
574 Elsa_Types[cs->subtyp], 574 Elsa_Types[cs->subtyp],
575 cs->hw.elsa.base + 8, 575 cs->hw.elsa.base + 8,
576 cs->hw.elsa.base + 16); 576 cs->hw.elsa.base + 16);
577 } 577 }
578 } else if (cs->subtyp==ELSA_PCC16) { 578 } else if (cs->subtyp == ELSA_PCC16) {
579 cs->subtyp = ELSA_PCF; 579 cs->subtyp = ELSA_PCF;
580 printk(KERN_INFO 580 printk(KERN_INFO
581 "Elsa: %s detected modem at 0x%lx\n", 581 "Elsa: %s detected modem at 0x%lx\n",
582 Elsa_Types[cs->subtyp], 582 Elsa_Types[cs->subtyp],
583 cs->hw.elsa.base+8); 583 cs->hw.elsa.base + 8);
584 release_region(cs->hw.elsa.base, 8); 584 release_region(cs->hw.elsa.base, 8);
585 if (!request_region(cs->hw.elsa.base, 16, "elsa isdn modem")) { 585 if (!request_region(cs->hw.elsa.base, 16, "elsa isdn modem")) {
586 printk(KERN_WARNING 586 printk(KERN_WARNING
587 "HiSax: %s config port %lx-%lx already in use\n", 587 "HiSax: %s config port %lx-%lx already in use\n",
588 Elsa_Types[cs->subtyp], 588 Elsa_Types[cs->subtyp],
589 cs->hw.elsa.base + 8, 589 cs->hw.elsa.base + 8,
590 cs->hw.elsa.base + 16); 590 cs->hw.elsa.base + 16);
591 } 591 }
592 } else 592 } else
593 printk(KERN_INFO 593 printk(KERN_INFO
594 "Elsa: %s detected modem at 0x%lx\n", 594 "Elsa: %s detected modem at 0x%lx\n",
595 Elsa_Types[cs->subtyp], 595 Elsa_Types[cs->subtyp],
596 cs->hw.elsa.base+8); 596 cs->hw.elsa.base + 8);
597 arcofi_fsm(cs, ARCOFI_START, &ARCOFI_XOP_0); 597 arcofi_fsm(cs, ARCOFI_START, &ARCOFI_XOP_0);
598 interruptible_sleep_on(&cs->dc.isac.arcofi_wait); 598 interruptible_sleep_on(&cs->dc.isac.arcofi_wait);
599 return(1); 599 return (1);
600 } 600 }
601 return(0); 601 return (0);
602} 602}
603#endif /* ARCOFI_USE */ 603#endif /* ARCOFI_USE */
604 604
@@ -627,7 +627,7 @@ elsa_led_handler(struct IsdnCardState *cs)
627 cs->hw.elsa.ctrl_reg &= ~ELSA_LINE_LED; 627 cs->hw.elsa.ctrl_reg &= ~ELSA_LINE_LED;
628 628
629 if ((cs->subtyp == ELSA_QS1000PCI) || 629 if ((cs->subtyp == ELSA_QS1000PCI) ||
630 (cs->subtyp == ELSA_QS3000PCI)) { 630 (cs->subtyp == ELSA_QS3000PCI)) {
631 u_char led = 0xff; 631 u_char led = 0xff;
632 if (cs->hw.elsa.ctrl_reg & ELSA_LINE_LED) 632 if (cs->hw.elsa.ctrl_reg & ELSA_LINE_LED)
633 led ^= ELSA_IPAC_LINE_LED; 633 led ^= ELSA_IPAC_LINE_LED;
@@ -650,111 +650,111 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
650 u_long flags; 650 u_long flags;
651 651
652 switch (mt) { 652 switch (mt) {
653 case CARD_RESET: 653 case CARD_RESET:
654 spin_lock_irqsave(&cs->lock, flags);
655 reset_elsa(cs);
656 spin_unlock_irqrestore(&cs->lock, flags);
657 return (0);
658 case CARD_RELEASE:
659 release_io_elsa(cs);
660 return (0);
661 case CARD_INIT:
662 spin_lock_irqsave(&cs->lock, flags);
663 cs->debug |= L1_DEB_IPAC;
664 reset_elsa(cs);
665 inithscxisac(cs, 1);
666 if ((cs->subtyp == ELSA_QS1000) ||
667 (cs->subtyp == ELSA_QS3000))
668 {
669 byteout(cs->hw.elsa.timer, 0);
670 }
671 if (cs->hw.elsa.trig)
672 byteout(cs->hw.elsa.trig, 0xff);
673 inithscxisac(cs, 2);
674 spin_unlock_irqrestore(&cs->lock, flags);
675 return (0);
676 case CARD_TEST:
677 if ((cs->subtyp == ELSA_PCMCIA) ||
678 (cs->subtyp == ELSA_PCMCIA_IPAC) ||
679 (cs->subtyp == ELSA_QS1000PCI)) {
680 return (0);
681 } else if (cs->subtyp == ELSA_QS3000PCI) {
682 ret = 0;
683 } else {
654 spin_lock_irqsave(&cs->lock, flags); 684 spin_lock_irqsave(&cs->lock, flags);
655 reset_elsa(cs); 685 cs->hw.elsa.counter = 0;
686 cs->hw.elsa.ctrl_reg |= ELSA_ENA_TIMER_INT;
687 cs->hw.elsa.status |= ELIRQF_TIMER_AKTIV;
688 byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);
689 byteout(cs->hw.elsa.timer, 0);
656 spin_unlock_irqrestore(&cs->lock, flags); 690 spin_unlock_irqrestore(&cs->lock, flags);
657 return(0); 691 msleep(110);
658 case CARD_RELEASE:
659 release_io_elsa(cs);
660 return(0);
661 case CARD_INIT:
662 spin_lock_irqsave(&cs->lock, flags); 692 spin_lock_irqsave(&cs->lock, flags);
663 cs->debug |= L1_DEB_IPAC; 693 cs->hw.elsa.ctrl_reg &= ~ELSA_ENA_TIMER_INT;
664 reset_elsa(cs); 694 byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);
665 inithscxisac(cs, 1); 695 cs->hw.elsa.status &= ~ELIRQF_TIMER_AKTIV;
666 if ((cs->subtyp == ELSA_QS1000) ||
667 (cs->subtyp == ELSA_QS3000))
668 {
669 byteout(cs->hw.elsa.timer, 0);
670 }
671 if (cs->hw.elsa.trig)
672 byteout(cs->hw.elsa.trig, 0xff);
673 inithscxisac(cs, 2);
674 spin_unlock_irqrestore(&cs->lock, flags); 696 spin_unlock_irqrestore(&cs->lock, flags);
675 return(0); 697 printk(KERN_INFO "Elsa: %d timer tics in 110 msek\n",
676 case CARD_TEST: 698 cs->hw.elsa.counter);
677 if ((cs->subtyp == ELSA_PCMCIA) || 699 if ((cs->hw.elsa.counter > 10) &&
678 (cs->subtyp == ELSA_PCMCIA_IPAC) || 700 (cs->hw.elsa.counter < 16)) {
679 (cs->subtyp == ELSA_QS1000PCI)) { 701 printk(KERN_INFO "Elsa: timer and irq OK\n");
680 return(0);
681 } else if (cs->subtyp == ELSA_QS3000PCI) {
682 ret = 0; 702 ret = 0;
683 } else { 703 } else {
684 spin_lock_irqsave(&cs->lock, flags); 704 printk(KERN_WARNING
685 cs->hw.elsa.counter = 0; 705 "Elsa: timer tic problem (%d/12) maybe an IRQ(%d) conflict\n",
686 cs->hw.elsa.ctrl_reg |= ELSA_ENA_TIMER_INT; 706 cs->hw.elsa.counter, cs->irq);
687 cs->hw.elsa.status |= ELIRQF_TIMER_AKTIV; 707 ret = 1;
688 byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);
689 byteout(cs->hw.elsa.timer, 0);
690 spin_unlock_irqrestore(&cs->lock, flags);
691 msleep(110);
692 spin_lock_irqsave(&cs->lock, flags);
693 cs->hw.elsa.ctrl_reg &= ~ELSA_ENA_TIMER_INT;
694 byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);
695 cs->hw.elsa.status &= ~ELIRQF_TIMER_AKTIV;
696 spin_unlock_irqrestore(&cs->lock, flags);
697 printk(KERN_INFO "Elsa: %d timer tics in 110 msek\n",
698 cs->hw.elsa.counter);
699 if ((cs->hw.elsa.counter > 10) &&
700 (cs->hw.elsa.counter < 16)) {
701 printk(KERN_INFO "Elsa: timer and irq OK\n");
702 ret = 0;
703 } else {
704 printk(KERN_WARNING
705 "Elsa: timer tic problem (%d/12) maybe an IRQ(%d) conflict\n",
706 cs->hw.elsa.counter, cs->irq);
707 ret = 1;
708 }
709 } 708 }
709 }
710#if ARCOFI_USE 710#if ARCOFI_USE
711 if (check_arcofi(cs)) { 711 if (check_arcofi(cs)) {
712 init_modem(cs); 712 init_modem(cs);
713 } 713 }
714#endif 714#endif
715 elsa_led_handler(cs); 715 elsa_led_handler(cs);
716 return(ret); 716 return (ret);
717 case (MDL_REMOVE | REQUEST): 717 case (MDL_REMOVE | REQUEST):
718 cs->hw.elsa.status &= 0; 718 cs->hw.elsa.status &= 0;
719 break; 719 break;
720 case (MDL_ASSIGN | REQUEST): 720 case (MDL_ASSIGN | REQUEST):
721 cs->hw.elsa.status |= ELSA_ASSIGN; 721 cs->hw.elsa.status |= ELSA_ASSIGN;
722 break; 722 break;
723 case MDL_INFO_SETUP: 723 case MDL_INFO_SETUP:
724 if ((long) arg) 724 if ((long) arg)
725 cs->hw.elsa.status |= 0x0200; 725 cs->hw.elsa.status |= 0x0200;
726 else 726 else
727 cs->hw.elsa.status |= 0x0100; 727 cs->hw.elsa.status |= 0x0100;
728 break; 728 break;
729 case MDL_INFO_CONN: 729 case MDL_INFO_CONN:
730 if ((long) arg) 730 if ((long) arg)
731 cs->hw.elsa.status |= 0x2000; 731 cs->hw.elsa.status |= 0x2000;
732 else 732 else
733 cs->hw.elsa.status |= 0x1000; 733 cs->hw.elsa.status |= 0x1000;
734 break; 734 break;
735 case MDL_INFO_REL: 735 case MDL_INFO_REL:
736 if ((long) arg) { 736 if ((long) arg) {
737 cs->hw.elsa.status &= ~0x2000; 737 cs->hw.elsa.status &= ~0x2000;
738 cs->hw.elsa.status &= ~0x0200; 738 cs->hw.elsa.status &= ~0x0200;
739 } else { 739 } else {
740 cs->hw.elsa.status &= ~0x1000; 740 cs->hw.elsa.status &= ~0x1000;
741 cs->hw.elsa.status &= ~0x0100; 741 cs->hw.elsa.status &= ~0x0100;
742 } 742 }
743 break; 743 break;
744#if ARCOFI_USE 744#if ARCOFI_USE
745 case CARD_AUX_IND: 745 case CARD_AUX_IND:
746 if (cs->hw.elsa.MFlag) { 746 if (cs->hw.elsa.MFlag) {
747 int len; 747 int len;
748 u_char *msg; 748 u_char *msg;
749 749
750 if (!arg) 750 if (!arg)
751 return(0); 751 return (0);
752 msg = arg; 752 msg = arg;
753 len = *msg; 753 len = *msg;
754 msg++; 754 msg++;
755 modem_write_cmd(cs, msg, len); 755 modem_write_cmd(cs, msg, len);
756 } 756 }
757 break; 757 break;
758#endif 758#endif
759 } 759 }
760 if (cs->typ == ISDN_CTYPE_ELSA) { 760 if (cs->typ == ISDN_CTYPE_ELSA) {
@@ -765,14 +765,14 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
765 cs->hw.elsa.status &= ~ELSA_BAD_PWR; 765 cs->hw.elsa.status &= ~ELSA_BAD_PWR;
766 } 766 }
767 elsa_led_handler(cs); 767 elsa_led_handler(cs);
768 return(ret); 768 return (ret);
769} 769}
770 770
771static unsigned char 771static unsigned char
772probe_elsa_adr(unsigned int adr, int typ) 772probe_elsa_adr(unsigned int adr, int typ)
773{ 773{
774 int i, in1, in2, p16_1 = 0, p16_2 = 0, p8_1 = 0, p8_2 = 0, pc_1 = 0, 774 int i, in1, in2, p16_1 = 0, p16_2 = 0, p8_1 = 0, p8_2 = 0, pc_1 = 0,
775 pc_2 = 0, pfp_1 = 0, pfp_2 = 0; 775 pc_2 = 0, pfp_1 = 0, pfp_2 = 0;
776 776
777 /* In case of the elsa pcmcia card, this region is in use, 777 /* In case of the elsa pcmcia card, this region is in use,
778 reserved for us by the card manager. So we do not check it 778 reserved for us by the card manager. So we do not check it
@@ -822,7 +822,7 @@ probe_elsa(struct IsdnCardState *cs)
822{ 822{
823 int i; 823 int i;
824 unsigned int CARD_portlist[] = 824 unsigned int CARD_portlist[] =
825 {0x160, 0x170, 0x260, 0x360, 0}; 825 {0x160, 0x170, 0x260, 0x360, 0};
826 826
827 for (i = 0; CARD_portlist[i]; i++) { 827 for (i = 0; CARD_portlist[i]; i++) {
828 if ((cs->subtyp = probe_elsa_adr(CARD_portlist[i], cs->typ))) 828 if ((cs->subtyp = probe_elsa_adr(CARD_portlist[i], cs->typ)))
@@ -867,15 +867,15 @@ setup_elsa_isa(struct IsdnCard *card)
867 val = bytein(cs->hw.elsa.cfg); 867 val = bytein(cs->hw.elsa.cfg);
868 if (cs->subtyp == ELSA_PC) { 868 if (cs->subtyp == ELSA_PC) {
869 const u_char CARD_IrqTab[8] = 869 const u_char CARD_IrqTab[8] =
870 {7, 3, 5, 9, 0, 0, 0, 0}; 870 {7, 3, 5, 9, 0, 0, 0, 0};
871 cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PC) >> 2]; 871 cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PC) >> 2];
872 } else if (cs->subtyp == ELSA_PCC8) { 872 } else if (cs->subtyp == ELSA_PCC8) {
873 const u_char CARD_IrqTab[8] = 873 const u_char CARD_IrqTab[8] =
874 {7, 3, 5, 9, 0, 0, 0, 0}; 874 {7, 3, 5, 9, 0, 0, 0, 0};
875 cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PCC8) >> 4]; 875 cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PCC8) >> 4];
876 } else { 876 } else {
877 const u_char CARD_IrqTab[8] = 877 const u_char CARD_IrqTab[8] =
878 {15, 10, 15, 3, 11, 5, 11, 9}; 878 {15, 10, 15, 3, 11, 5, 11, 9};
879 cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX) >> 3]; 879 cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX) >> 3];
880 } 880 }
881 val = bytein(cs->hw.elsa.ale) & ELSA_HW_RELEASE; 881 val = bytein(cs->hw.elsa.ale) & ELSA_HW_RELEASE;
@@ -894,7 +894,7 @@ setup_elsa_isa(struct IsdnCard *card)
894 val = bytein(cs->hw.elsa.ale) & ELSA_S0_POWER_BAD; 894 val = bytein(cs->hw.elsa.ale) & ELSA_S0_POWER_BAD;
895 if (val) { 895 if (val) {
896 printk(KERN_WARNING 896 printk(KERN_WARNING
897 "Elsa: Microlink S0 bus power bad\n"); 897 "Elsa: Microlink S0 bus power bad\n");
898 cs->hw.elsa.status |= ELSA_BAD_PWR; 898 cs->hw.elsa.status |= ELSA_BAD_PWR;
899 } 899 }
900 900
@@ -904,10 +904,10 @@ setup_elsa_isa(struct IsdnCard *card)
904#ifdef __ISAPNP__ 904#ifdef __ISAPNP__
905static struct isapnp_device_id elsa_ids[] __devinitdata = { 905static struct isapnp_device_id elsa_ids[] __devinitdata = {
906 { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133), 906 { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133),
907 ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133), 907 ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133),
908 (unsigned long) "Elsa QS1000" }, 908 (unsigned long) "Elsa QS1000" },
909 { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0134), 909 { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0134),
910 ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0134), 910 ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0134),
911 (unsigned long) "Elsa QS3000" }, 911 (unsigned long) "Elsa QS3000" },
912 { 0, } 912 { 0, }
913}; 913};
@@ -924,31 +924,31 @@ setup_elsa_isapnp(struct IsdnCard *card)
924#ifdef __ISAPNP__ 924#ifdef __ISAPNP__
925 if (!card->para[1] && isapnp_present()) { 925 if (!card->para[1] && isapnp_present()) {
926 struct pnp_dev *pnp_d; 926 struct pnp_dev *pnp_d;
927 while(ipid->card_vendor) { 927 while (ipid->card_vendor) {
928 if ((pnp_c = pnp_find_card(ipid->card_vendor, 928 if ((pnp_c = pnp_find_card(ipid->card_vendor,
929 ipid->card_device, pnp_c))) { 929 ipid->card_device, pnp_c))) {
930 pnp_d = NULL; 930 pnp_d = NULL;
931 if ((pnp_d = pnp_find_dev(pnp_c, 931 if ((pnp_d = pnp_find_dev(pnp_c,
932 ipid->vendor, ipid->function, pnp_d))) { 932 ipid->vendor, ipid->function, pnp_d))) {
933 int err; 933 int err;
934 934
935 printk(KERN_INFO "HiSax: %s detected\n", 935 printk(KERN_INFO "HiSax: %s detected\n",
936 (char *)ipid->driver_data); 936 (char *)ipid->driver_data);
937 pnp_disable_dev(pnp_d); 937 pnp_disable_dev(pnp_d);
938 err = pnp_activate_dev(pnp_d); 938 err = pnp_activate_dev(pnp_d);
939 if (err<0) { 939 if (err < 0) {
940 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", 940 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
941 __func__, err); 941 __func__, err);
942 return(0); 942 return (0);
943 } 943 }
944 card->para[1] = pnp_port_start(pnp_d, 0); 944 card->para[1] = pnp_port_start(pnp_d, 0);
945 card->para[0] = pnp_irq(pnp_d, 0); 945 card->para[0] = pnp_irq(pnp_d, 0);
946 946
947 if (!card->para[0] || !card->para[1]) { 947 if (!card->para[0] || !card->para[1]) {
948 printk(KERN_ERR "Elsa PnP:some resources are missing %ld/%lx\n", 948 printk(KERN_ERR "Elsa PnP:some resources are missing %ld/%lx\n",
949 card->para[0], card->para[1]); 949 card->para[0], card->para[1]);
950 pnp_disable_dev(pnp_d); 950 pnp_disable_dev(pnp_d);
951 return(0); 951 return (0);
952 } 952 }
953 if (ipid->function == ISAPNP_FUNCTION(0x133)) 953 if (ipid->function == ISAPNP_FUNCTION(0x133))
954 cs->subtyp = ELSA_QS1000; 954 cs->subtyp = ELSA_QS1000;
@@ -957,20 +957,20 @@ setup_elsa_isapnp(struct IsdnCard *card)
957 break; 957 break;
958 } else { 958 } else {
959 printk(KERN_ERR "Elsa PnP: PnP error card found, no device\n"); 959 printk(KERN_ERR "Elsa PnP: PnP error card found, no device\n");
960 return(0); 960 return (0);
961 } 961 }
962 } 962 }
963 ipid++; 963 ipid++;
964 pnp_c=NULL; 964 pnp_c = NULL;
965 } 965 }
966 if (!ipid->card_vendor) { 966 if (!ipid->card_vendor) {
967 printk(KERN_INFO "Elsa PnP: no ISAPnP card found\n"); 967 printk(KERN_INFO "Elsa PnP: no ISAPnP card found\n");
968 return(0); 968 return (0);
969 } 969 }
970 } 970 }
971#endif /* __ISAPNP__ */ 971#endif /* __ISAPNP__ */
972 972
973 if (card->para[1] && card->para[0]) { 973 if (card->para[1] && card->para[0]) {
974 cs->hw.elsa.base = card->para[1]; 974 cs->hw.elsa.base = card->para[1];
975 cs->irq = card->para[0]; 975 cs->irq = card->para[0];
976 if (!cs->subtyp) 976 if (!cs->subtyp)
@@ -1027,8 +1027,8 @@ setup_elsa_pcmcia(struct IsdnCard *card)
1027} 1027}
1028 1028
1029#ifdef CONFIG_PCI 1029#ifdef CONFIG_PCI
1030static struct pci_dev *dev_qs1000 __devinitdata = NULL; 1030static struct pci_dev *dev_qs1000 __devinitdata = NULL;
1031static struct pci_dev *dev_qs3000 __devinitdata = NULL; 1031static struct pci_dev *dev_qs3000 __devinitdata = NULL;
1032 1032
1033static int __devinit 1033static int __devinit
1034setup_elsa_pci(struct IsdnCard *card) 1034setup_elsa_pci(struct IsdnCard *card)
@@ -1037,33 +1037,33 @@ setup_elsa_pci(struct IsdnCard *card)
1037 1037
1038 cs->subtyp = 0; 1038 cs->subtyp = 0;
1039 if ((dev_qs1000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, 1039 if ((dev_qs1000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA,
1040 PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) { 1040 PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) {
1041 if (pci_enable_device(dev_qs1000)) 1041 if (pci_enable_device(dev_qs1000))
1042 return(0); 1042 return (0);
1043 cs->subtyp = ELSA_QS1000PCI; 1043 cs->subtyp = ELSA_QS1000PCI;
1044 cs->irq = dev_qs1000->irq; 1044 cs->irq = dev_qs1000->irq;
1045 cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1); 1045 cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1);
1046 cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3); 1046 cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3);
1047 } else if ((dev_qs3000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, 1047 } else if ((dev_qs3000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA,
1048 PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) { 1048 PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) {
1049 if (pci_enable_device(dev_qs3000)) 1049 if (pci_enable_device(dev_qs3000))
1050 return(0); 1050 return (0);
1051 cs->subtyp = ELSA_QS3000PCI; 1051 cs->subtyp = ELSA_QS3000PCI;
1052 cs->irq = dev_qs3000->irq; 1052 cs->irq = dev_qs3000->irq;
1053 cs->hw.elsa.cfg = pci_resource_start(dev_qs3000, 1); 1053 cs->hw.elsa.cfg = pci_resource_start(dev_qs3000, 1);
1054 cs->hw.elsa.base = pci_resource_start(dev_qs3000, 3); 1054 cs->hw.elsa.base = pci_resource_start(dev_qs3000, 3);
1055 } else { 1055 } else {
1056 printk(KERN_WARNING "Elsa: No PCI card found\n"); 1056 printk(KERN_WARNING "Elsa: No PCI card found\n");
1057 return(0); 1057 return (0);
1058 } 1058 }
1059 if (!cs->irq) { 1059 if (!cs->irq) {
1060 printk(KERN_WARNING "Elsa: No IRQ for PCI card found\n"); 1060 printk(KERN_WARNING "Elsa: No IRQ for PCI card found\n");
1061 return(0); 1061 return (0);
1062 } 1062 }
1063 1063
1064 if (!(cs->hw.elsa.base && cs->hw.elsa.cfg)) { 1064 if (!(cs->hw.elsa.base && cs->hw.elsa.cfg)) {
1065 printk(KERN_WARNING "Elsa: No IO-Adr for PCI card found\n"); 1065 printk(KERN_WARNING "Elsa: No IO-Adr for PCI card found\n");
1066 return(0); 1066 return (0);
1067 } 1067 }
1068 if ((cs->hw.elsa.cfg & 0xff) || (cs->hw.elsa.base & 0xf)) { 1068 if ((cs->hw.elsa.cfg & 0xff) || (cs->hw.elsa.base & 0xf)) {
1069 printk(KERN_WARNING "Elsa: You may have a wrong PCI bios\n"); 1069 printk(KERN_WARNING "Elsa: You may have a wrong PCI bios\n");
@@ -1071,8 +1071,8 @@ setup_elsa_pci(struct IsdnCard *card)
1071 printk(KERN_WARNING "Elsa: Documentation/isdn/README.HiSax\n"); 1071 printk(KERN_WARNING "Elsa: Documentation/isdn/README.HiSax\n");
1072 } 1072 }
1073 cs->hw.elsa.ale = cs->hw.elsa.base; 1073 cs->hw.elsa.ale = cs->hw.elsa.base;
1074 cs->hw.elsa.isac = cs->hw.elsa.base +1; 1074 cs->hw.elsa.isac = cs->hw.elsa.base + 1;
1075 cs->hw.elsa.hscx = cs->hw.elsa.base +1; 1075 cs->hw.elsa.hscx = cs->hw.elsa.base + 1;
1076 test_and_set_bit(HW_IPAC, &cs->HW_Flags); 1076 test_and_set_bit(HW_IPAC, &cs->HW_Flags);
1077 cs->hw.elsa.timer = 0; 1077 cs->hw.elsa.timer = 0;
1078 cs->hw.elsa.trig = 0; 1078 cs->hw.elsa.trig = 0;
@@ -1104,27 +1104,27 @@ setup_elsa_common(struct IsdnCard *card)
1104 int bytecnt; 1104 int bytecnt;
1105 1105
1106 switch (cs->subtyp) { 1106 switch (cs->subtyp) {
1107 case ELSA_PC: 1107 case ELSA_PC:
1108 case ELSA_PCC8: 1108 case ELSA_PCC8:
1109 case ELSA_PCC16: 1109 case ELSA_PCC16:
1110 case ELSA_QS1000: 1110 case ELSA_QS1000:
1111 case ELSA_PCMCIA: 1111 case ELSA_PCMCIA:
1112 case ELSA_PCMCIA_IPAC: 1112 case ELSA_PCMCIA_IPAC:
1113 bytecnt = 8; 1113 bytecnt = 8;
1114 break; 1114 break;
1115 case ELSA_PCFPRO: 1115 case ELSA_PCFPRO:
1116 case ELSA_PCF: 1116 case ELSA_PCF:
1117 case ELSA_QS3000: 1117 case ELSA_QS3000:
1118 case ELSA_QS3000PCI: 1118 case ELSA_QS3000PCI:
1119 bytecnt = 16; 1119 bytecnt = 16;
1120 break; 1120 break;
1121 case ELSA_QS1000PCI: 1121 case ELSA_QS1000PCI:
1122 bytecnt = 2; 1122 bytecnt = 2;
1123 break; 1123 break;
1124 default: 1124 default:
1125 printk(KERN_WARNING 1125 printk(KERN_WARNING
1126 "Unknown ELSA subtype %d\n", cs->subtyp); 1126 "Unknown ELSA subtype %d\n", cs->subtyp);
1127 return (0); 1127 return (0);
1128 } 1128 }
1129 /* In case of the elsa pcmcia card, this region is in use, 1129 /* In case of the elsa pcmcia card, this region is in use,
1130 reserved for us by the card manager. So we do not check it 1130 reserved for us by the card manager. So we do not check it
@@ -1140,8 +1140,8 @@ setup_elsa_common(struct IsdnCard *card)
1140 if (!request_region(cs->hw.elsa.cfg, 0x80, "elsa isdn pci")) { 1140 if (!request_region(cs->hw.elsa.cfg, 0x80, "elsa isdn pci")) {
1141 printk(KERN_WARNING 1141 printk(KERN_WARNING
1142 "HiSax: ELSA pci port %x-%x already in use\n", 1142 "HiSax: ELSA pci port %x-%x already in use\n",
1143 cs->hw.elsa.cfg, 1143 cs->hw.elsa.cfg,
1144 cs->hw.elsa.cfg + 0x80); 1144 cs->hw.elsa.cfg + 0x80);
1145 release_region(cs->hw.elsa.base, bytecnt); 1145 release_region(cs->hw.elsa.base, bytecnt);
1146 return (0); 1146 return (0);
1147 } 1147 }
@@ -1166,7 +1166,7 @@ setup_elsa_common(struct IsdnCard *card)
1166 return (0); 1166 return (0);
1167 } 1167 }
1168 } 1168 }
1169 HZDELAY((HZ/100) + 1); /* wait >=10 ms */ 1169 HZDELAY((HZ / 100) + 1); /* wait >=10 ms */
1170 if (TimerRun(cs)) { 1170 if (TimerRun(cs)) {
1171 printk(KERN_WARNING "Elsa: timer do not run down\n"); 1171 printk(KERN_WARNING "Elsa: timer do not run down\n");
1172 release_io_elsa(cs); 1172 release_io_elsa(cs);
@@ -1195,7 +1195,7 @@ setup_elsa_common(struct IsdnCard *card)
1195 ISACVersion(cs, "Elsa:"); 1195 ISACVersion(cs, "Elsa:");
1196 if (HscxVersion(cs, "Elsa:")) { 1196 if (HscxVersion(cs, "Elsa:")) {
1197 printk(KERN_WARNING 1197 printk(KERN_WARNING
1198 "Elsa: wrong HSCX versions check IO address\n"); 1198 "Elsa: wrong HSCX versions check IO address\n");
1199 release_io_elsa(cs); 1199 release_io_elsa(cs);
1200 return (0); 1200 return (0);
1201 } 1201 }
@@ -1244,7 +1244,7 @@ setup_elsa(struct IsdnCard *card)
1244 if (!rc) 1244 if (!rc)
1245 return (0); 1245 return (0);
1246 1246
1247 } else 1247 } else
1248 return (0); 1248 return (0);
1249 1249
1250 return setup_elsa_common(card); 1250 return setup_elsa_common(card);
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-10 01:53:55 -0500