aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/isdn/gigaset/Kconfig1
-rw-r--r--drivers/isdn/gigaset/asyncdata.c5
-rw-r--r--drivers/isdn/gigaset/common.c37
-rw-r--r--drivers/isdn/gigaset/gigaset.h4
-rw-r--r--drivers/isdn/gigaset/isocdata.c5
5 files changed, 7 insertions, 45 deletions
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 5b203fe21dcd..708d47a6484b 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -5,6 +5,7 @@ config ISDN_DRV_GIGASET
5 tristate "Siemens Gigaset support (isdn)" 5 tristate "Siemens Gigaset support (isdn)"
6 depends on ISDN_I4L 6 depends on ISDN_I4L
7 select CRC_CCITT 7 select CRC_CCITT
8 select BITREVERSE
8 help 9 help
9 Say m here if you have a Gigaset or Sinus isdn device. 10 Say m here if you have a Gigaset or Sinus isdn device.
10 11
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index ce3cd77094b3..88e958f176d2 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -15,6 +15,7 @@
15 15
16#include "gigaset.h" 16#include "gigaset.h"
17#include <linux/crc-ccitt.h> 17#include <linux/crc-ccitt.h>
18#include <linux/bitrev.h>
18 19
19//#define GIG_M10x_STUFF_VOICE_DATA 20//#define GIG_M10x_STUFF_VOICE_DATA
20 21
@@ -302,7 +303,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
302 inputstate |= INS_skip_frame; 303 inputstate |= INS_skip_frame;
303 break; 304 break;
304 } 305 }
305 *__skb_put(skb, 1) = gigaset_invtab[c]; 306 *__skb_put(skb, 1) = bitrev8(c);
306 } 307 }
307 308
308 if (unlikely(!numbytes)) 309 if (unlikely(!numbytes))
@@ -543,7 +544,7 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail)
543 cp = skb->data; 544 cp = skb->data;
544 len = skb->len; 545 len = skb->len;
545 while (len--) { 546 while (len--) {
546 c = gigaset_invtab[*cp++]; 547 c = bitrev8(*cp++);
547 if (c == DLE_FLAG) 548 if (c == DLE_FLAG)
548 *(skb_put(iraw_skb, 1)) = c; 549 *(skb_put(iraw_skb, 1)) = c;
549 *(skb_put(iraw_skb, 1)) = c; 550 *(skb_put(iraw_skb, 1)) = c;
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index defd5743dba6..95eff3b2917a 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -33,43 +33,6 @@ MODULE_PARM_DESC(debug, "debug level");
33#define VALID_ID 0x02 33#define VALID_ID 0x02
34#define ASSIGNED 0x04 34#define ASSIGNED 0x04
35 35
36/* bitwise byte inversion table */
37__u8 gigaset_invtab[256] = {
38 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
39 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
40 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
41 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
42 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
43 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
44 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
45 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
46 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
47 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
48 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
49 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
50 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
51 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
52 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
53 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
54 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
55 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
56 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
57 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
58 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
59 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
60 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
61 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
62 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
63 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
64 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
65 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
66 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
67 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
68 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
69 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
70};
71EXPORT_SYMBOL_GPL(gigaset_invtab);
72
73void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg, 36void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
74 size_t len, const unsigned char *buf) 37 size_t len, const unsigned char *buf)
75{ 38{
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 06298cc52bf5..a0317abaeb11 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -876,10 +876,6 @@ static inline void gigaset_rcv_error(struct sk_buff *procskb,
876 } 876 }
877} 877}
878 878
879
880/* bitwise byte inversion table */
881extern __u8 gigaset_invtab[]; /* in common.c */
882
883/* append received bytes to inbuf */ 879/* append received bytes to inbuf */
884int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src, 880int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
885 unsigned numbytes); 881 unsigned numbytes);
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 8667daaa1a82..df988eb0e36f 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -14,6 +14,7 @@
14 14
15#include "gigaset.h" 15#include "gigaset.h"
16#include <linux/crc-ccitt.h> 16#include <linux/crc-ccitt.h>
17#include <linux/bitrev.h>
17 18
18/* access methods for isowbuf_t */ 19/* access methods for isowbuf_t */
19/* ============================ */ 20/* ============================ */
@@ -487,7 +488,7 @@ static inline int trans_buildframe(struct isowbuf_t *iwb,
487 gig_dbg(DEBUG_STREAM, "put %d bytes", count); 488 gig_dbg(DEBUG_STREAM, "put %d bytes", count);
488 write = atomic_read(&iwb->write); 489 write = atomic_read(&iwb->write);
489 do { 490 do {
490 c = gigaset_invtab[*in++]; 491 c = bitrev8(*in++);
491 iwb->data[write++] = c; 492 iwb->data[write++] = c;
492 write %= BAS_OUTBUFSIZE; 493 write %= BAS_OUTBUFSIZE;
493 } while (--count > 0); 494 } while (--count > 0);
@@ -876,7 +877,7 @@ static inline void trans_receive(unsigned char *src, unsigned count,
876 while (count > 0) { 877 while (count > 0) {
877 dst = skb_put(skb, count < dobytes ? count : dobytes); 878 dst = skb_put(skb, count < dobytes ? count : dobytes);
878 while (count > 0 && dobytes > 0) { 879 while (count > 0 && dobytes > 0) {
879 *dst++ = gigaset_invtab[*src++]; 880 *dst++ = bitrev8(*src++);
880 count--; 881 count--;
881 dobytes--; 882 dobytes--;
882 } 883 }