diff options
-rw-r--r-- | drivers/isdn/hisax/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/isdnhdlc.c | 25 | ||||
-rw-r--r-- | drivers/isdn/hisax/isdnhdlc.h | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/st5481_b.c | 3 |
4 files changed, 3 insertions, 28 deletions
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index cfd2718a490d..edf0e50990a7 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig | |||
@@ -402,6 +402,7 @@ config HISAX_ST5481 | |||
402 | tristate "ST5481 USB ISDN modem (EXPERIMENTAL)" | 402 | tristate "ST5481 USB ISDN modem (EXPERIMENTAL)" |
403 | depends on USB && EXPERIMENTAL | 403 | depends on USB && EXPERIMENTAL |
404 | select CRC_CCITT | 404 | select CRC_CCITT |
405 | select BITREVERSE | ||
405 | help | 406 | help |
406 | This enables the driver for ST5481 based USB ISDN adapters, | 407 | This enables the driver for ST5481 based USB ISDN adapters, |
407 | e.g. the BeWan Gazel 128 USB | 408 | e.g. the BeWan Gazel 128 USB |
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c index cbdf54c5af84..268dced6c34a 100644 --- a/drivers/isdn/hisax/isdnhdlc.c +++ b/drivers/isdn/hisax/isdnhdlc.c | |||
@@ -35,30 +35,6 @@ MODULE_LICENSE("GPL"); | |||
35 | 35 | ||
36 | /*-------------------------------------------------------------------*/ | 36 | /*-------------------------------------------------------------------*/ |
37 | 37 | ||
38 | /* bit swap table. | ||
39 | * Very handy for devices with different bit order, | ||
40 | * and neccessary for each transparent B-channel access for all | ||
41 | * devices which works with this HDLC decoder without bit reversal. | ||
42 | */ | ||
43 | const unsigned char isdnhdlc_bit_rev_tab[256] = { | ||
44 | 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, | ||
45 | 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, | ||
46 | 0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, | ||
47 | 0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, | ||
48 | 0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, | ||
49 | 0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, | ||
50 | 0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, | ||
51 | 0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, | ||
52 | 0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, | ||
53 | 0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, | ||
54 | 0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, | ||
55 | 0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, | ||
56 | 0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, | ||
57 | 0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, | ||
58 | 0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, | ||
59 | 0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF | ||
60 | }; | ||
61 | |||
62 | enum { | 38 | enum { |
63 | HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7, | 39 | HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7, |
64 | HDLC_GET_DATA,HDLC_FAST_FLAG | 40 | HDLC_GET_DATA,HDLC_FAST_FLAG |
@@ -621,7 +597,6 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, | |||
621 | return len; | 597 | return len; |
622 | } | 598 | } |
623 | 599 | ||
624 | EXPORT_SYMBOL(isdnhdlc_bit_rev_tab); | ||
625 | EXPORT_SYMBOL(isdnhdlc_rcv_init); | 600 | EXPORT_SYMBOL(isdnhdlc_rcv_init); |
626 | EXPORT_SYMBOL(isdnhdlc_decode); | 601 | EXPORT_SYMBOL(isdnhdlc_decode); |
627 | EXPORT_SYMBOL(isdnhdlc_out_init); | 602 | EXPORT_SYMBOL(isdnhdlc_out_init); |
diff --git a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h index 5655b5f9c48e..45167d2f8fb0 100644 --- a/drivers/isdn/hisax/isdnhdlc.h +++ b/drivers/isdn/hisax/isdnhdlc.h | |||
@@ -57,8 +57,6 @@ struct isdnhdlc_vars { | |||
57 | #define HDLC_CRC_ERROR 2 | 57 | #define HDLC_CRC_ERROR 2 |
58 | #define HDLC_LENGTH_ERROR 3 | 58 | #define HDLC_LENGTH_ERROR 3 |
59 | 59 | ||
60 | extern const unsigned char isdnhdlc_bit_rev_tab[256]; | ||
61 | |||
62 | extern void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc, int do_adapt56); | 60 | extern void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc, int do_adapt56); |
63 | 61 | ||
64 | extern int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, int slen,int *count, | 62 | extern int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, int slen,int *count, |
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c index 75d0f248e4ee..fa64115cd7c7 100644 --- a/drivers/isdn/hisax/st5481_b.c +++ b/drivers/isdn/hisax/st5481_b.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/usb.h> | 14 | #include <linux/usb.h> |
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
17 | #include <linux/bitrev.h> | ||
17 | #include "st5481.h" | 18 | #include "st5481.h" |
18 | 19 | ||
19 | static inline void B_L1L2(struct st5481_bcs *bcs, int pr, void *arg) | 20 | static inline void B_L1L2(struct st5481_bcs *bcs, int pr, void *arg) |
@@ -72,7 +73,7 @@ static void usb_b_out(struct st5481_bcs *bcs,int buf_nr) | |||
72 | register unsigned char *dest = urb->transfer_buffer+len; | 73 | register unsigned char *dest = urb->transfer_buffer+len; |
73 | register unsigned int count; | 74 | register unsigned int count; |
74 | for (count = 0; count < bytes_sent; count++) | 75 | for (count = 0; count < bytes_sent; count++) |
75 | *dest++ = isdnhdlc_bit_rev_tab[*src++]; | 76 | *dest++ = bitrev8(*src++); |
76 | } | 77 | } |
77 | len += bytes_sent; | 78 | len += bytes_sent; |
78 | } else { | 79 | } else { |