patch-2.4.21 linux-2.4.21/drivers/isdn/hisax/st5481.h
Next file: linux-2.4.21/drivers/isdn/hisax/st5481_b.c
Previous file: linux-2.4.21/drivers/isdn/hisax/rawhdlc.h
Back to the patch index
Back to the overall index
- Lines: 70
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/isdn/hisax/st5481.h
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.20/drivers/isdn/hisax/st5481.h linux-2.4.21/drivers/isdn/hisax/st5481.h
@@ -227,7 +227,7 @@
#define INFO(format, arg...) \
printk(KERN_INFO __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg)
-#include "st5481_hdlc.h"
+#include "isdnhdlc.h"
#include "fsm.h"
#include "hisax_if.h"
#include <linux/skbuff.h>
@@ -236,7 +236,7 @@
* FIFO handling
*/
-/* Generic FIFO structure */
+/* Generic FIFO structure */
struct fifo {
u_char r,w,count,size;
spinlock_t lock;
@@ -270,7 +270,7 @@
index = -1;
} else {
// Return index where to get the next data to add to the FIFO
- index = fifo->w++ & (fifo->size-1);
+ index = fifo->w++ & (fifo->size-1);
fifo->count++;
}
spin_unlock_irqrestore(&fifo->lock, flags);
@@ -289,13 +289,13 @@
return -1;
}
- spin_lock_irqsave(&fifo->lock, flags);
+ spin_lock_irqsave(&fifo->lock, flags);
if (!fifo->count) {
// FIFO empty
index = -1;
} else {
// Return index where to get the next data from the FIFO
- index = fifo->r++ & (fifo->size-1);
+ index = fifo->r++ & (fifo->size-1);
fifo->count--;
}
spin_unlock_irqrestore(&fifo->lock, flags);
@@ -336,7 +336,7 @@
};
struct st5481_d_out {
- struct hdlc_vars hdlc_state;
+ struct isdnhdlc_vars hdlc_state;
struct urb *urb[2]; /* double buffering */
unsigned long busy;
struct sk_buff *tx_skb;
@@ -344,7 +344,7 @@
};
struct st5481_b_out {
- struct hdlc_vars hdlc_state;
+ struct isdnhdlc_vars hdlc_state;
struct urb *urb[2]; /* double buffering */
u_char flow_event;
u_long busy;
@@ -352,7 +352,7 @@
};
struct st5481_in {
- struct hdlc_vars hdlc_state;
+ struct isdnhdlc_vars hdlc_state;
struct urb *urb[2]; /* double buffering */
int mode;
int bufsize;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)