aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/hscx_irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/hisax/hscx_irq.c')
-rw-r--r--drivers/isdn/hisax/hscx_irq.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c
index 2387d76c721a..f398d4838937 100644
--- a/drivers/isdn/hisax/hscx_irq.c
+++ b/drivers/isdn/hisax/hscx_irq.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 *
@@ -84,7 +84,7 @@ hscx_fill_fifo(struct BCState *bcs)
84{ 84{
85 struct IsdnCardState *cs = bcs->cs; 85 struct IsdnCardState *cs = bcs->cs;
86 int more, count; 86 int more, count;
87 int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; 87 int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags) ? 64 : 32;
88 u_char *ptr; 88 u_char *ptr;
89 89
90 if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) 90 if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
@@ -125,7 +125,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
125 u_char r; 125 u_char r;
126 struct BCState *bcs = cs->bcs + hscx; 126 struct BCState *bcs = cs->bcs + hscx;
127 struct sk_buff *skb; 127 struct sk_buff *skb;
128 int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; 128 int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags) ? 64 : 32;
129 int count; 129 int count;
130 130
131 if (!test_bit(BC_FLG_INIT, &bcs->Flag)) 131 if (!test_bit(BC_FLG_INIT, &bcs->Flag))
@@ -159,7 +159,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
159 WriteHSCXCMDR(cs, hscx, 0x80); 159 WriteHSCXCMDR(cs, hscx, 0x80);
160 } else { 160 } else {
161 count = READHSCX(cs, hscx, HSCX_RBCL) & ( 161 count = READHSCX(cs, hscx, HSCX_RBCL) & (
162 test_bit(HW_IPAC, &cs->HW_Flags)? 0x3f: 0x1f); 162 test_bit(HW_IPAC, &cs->HW_Flags) ? 0x3f : 0x1f);
163 if (count == 0) 163 if (count == 0)
164 count = fifo_size; 164 count = fifo_size;
165 hscx_empty_fifo(bcs, count); 165 hscx_empty_fifo(bcs, count);
@@ -197,8 +197,8 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
197 hscx_fill_fifo(bcs); 197 hscx_fill_fifo(bcs);
198 return; 198 return;
199 } else { 199 } else {
200 if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && 200 if (test_bit(FLG_LLI_L1WAKEUP, &bcs->st->lli.flag) &&
201 (PACKET_NOACK != bcs->tx_skb->pkt_type)) { 201 (PACKET_NOACK != bcs->tx_skb->pkt_type)) {
202 u_long flags; 202 u_long flags;
203 spin_lock_irqsave(&bcs->aclock, flags); 203 spin_lock_irqsave(&bcs->aclock, flags);
204 bcs->ackcnt += bcs->hw.hscx.count; 204 bcs->ackcnt += bcs->hw.hscx.count;
@@ -206,7 +206,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
206 schedule_event(bcs, B_ACKPENDING); 206 schedule_event(bcs, B_ACKPENDING);
207 } 207 }
208 dev_kfree_skb_irq(bcs->tx_skb); 208 dev_kfree_skb_irq(bcs->tx_skb);
209 bcs->hw.hscx.count = 0; 209 bcs->hw.hscx.count = 0;
210 bcs->tx_skb = NULL; 210 bcs->tx_skb = NULL;
211 } 211 }
212 } 212 }
@@ -239,7 +239,7 @@ hscx_int_main(struct IsdnCardState *cs, u_char val)
239 bcs->err_tx++; 239 bcs->err_tx++;
240#endif 240#endif
241 /* Here we lost an TX interrupt, so 241 /* Here we lost an TX interrupt, so
242 * restart transmitting the whole frame. 242 * restart transmitting the whole frame.
243 */ 243 */
244 if (bcs->tx_skb) { 244 if (bcs->tx_skb) {
245 skb_push(bcs->tx_skb, bcs->hw.hscx.count); 245 skb_push(bcs->tx_skb, bcs->hw.hscx.count);
@@ -266,7 +266,7 @@ hscx_int_main(struct IsdnCardState *cs, u_char val)
266 hscx_fill_fifo(bcs); 266 hscx_fill_fifo(bcs);
267 else { 267 else {
268 /* Here we lost an TX interrupt, so 268 /* Here we lost an TX interrupt, so
269 * restart transmitting the whole frame. 269 * restart transmitting the whole frame.
270 */ 270 */
271#ifdef ERROR_STATISTIC 271#ifdef ERROR_STATISTIC
272 bcs->err_tx++; 272 bcs->err_tx++;