* [PATCH 0/4] 2.6.7-mm2, Add common CRC16 module
@ 2004-06-24 12:52 Andrey Panin
2004-06-24 12:52 ` [PATCH 1/4] 2.6.7-mm2, Use it in async PPP driver Andrey Panin
0 siblings, 1 reply; 7+ messages in thread
From: Andrey Panin @ 2004-06-24 12:52 UTC (permalink / raw)
To: Andrew Morton, linux-kernel
Currently we have 8 copies of CRC16 calculation table in different device
drivers, this patch creates common crc16.c module to replace them.
Please take a look.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
include/linux/crc16.h | 15 ++++++++++
lib/Kconfig | 8 +++++
lib/Makefile | 1
lib/crc16.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 93 insertions(+)
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/include/linux/crc16.h linux-2.6.7-mm2/include/linux/crc16.h
--- linux-2.6.7-mm2.vanilla/include/linux/crc16.h 1970-01-01 03:00:00.000000000 +0300
+++ linux-2.6.7-mm2/include/linux/crc16.h 2004-06-24 14:38:55.000000000 +0400
@@ -0,0 +1,15 @@
+#ifndef _LINUX_CRC16_H
+#define _LINUX_CRC16_H
+
+#include <linux/types.h>
+
+extern u16 const crc16_table[256];
+
+extern u16 crc16(u16 crc, const u8 *buffer, size_t len);
+
+static inline u16 crc16_byte(u16 crc, const u8 c)
+{
+ return (crc >> 8) ^ crc16_table[(crc ^ c) & 0xff];
+}
+
+#endif /* _LINUX_CRC16_H */
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/lib/crc16.c linux-2.6.7-mm2/lib/crc16.c
--- linux-2.6.7-mm2.vanilla/lib/crc16.c 1970-01-01 03:00:00.000000000 +0300
+++ linux-2.6.7-mm2/lib/crc16.c 2004-06-24 14:38:56.000000000 +0400
@@ -0,0 +1,69 @@
+/*
+ * linux/lib/crc16.c
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2. See the file COPYING for more details.
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/crc16.h>
+
+/*
+ * This mysterious table is just the CRC of each possible byte. It can be
+ * computed using the standard bit-at-a-time methods. The polynomial can
+ * be seen in entry 128, 0x8408. This corresponds to x^0 + x^5 + x^12.
+ * Add the implicit x^16, and you have the standard CRC-CCITT.
+ */
+u16 const crc16_table[256] = {
+ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
+ 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
+ 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
+ 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
+ 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
+ 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
+ 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
+ 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
+ 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+ 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
+ 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
+ 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
+ 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
+ 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
+ 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
+ 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
+ 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
+ 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+ 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
+ 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
+ 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
+ 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
+ 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
+ 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
+ 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
+ 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
+ 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+ 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
+ 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
+ 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
+ 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
+ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
+};
+EXPORT_SYMBOL(crc16_table);
+
+/**
+ * crc16 - recompute the CRC for the data buffer
+ * @crc - previous CRC value
+ * @buffer - data pointer
+ * @len - number of bytes in the buffer
+ */
+u16 crc16(u16 crc, u8 const *buffer, size_t len)
+{
+ while (len--)
+ crc = crc16_byte(crc, *buffer++);
+ return crc;
+}
+EXPORT_SYMBOL(crc16);
+
+MODULE_DESCRIPTION("CRC16 calculations");
+MODULE_LICENSE("GPL");
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/lib/Kconfig linux-2.6.7-mm2/lib/Kconfig
--- linux-2.6.7-mm2.vanilla/lib/Kconfig 2004-06-24 14:35:04.000000000 +0400
+++ linux-2.6.7-mm2/lib/Kconfig 2004-06-24 14:38:55.000000000 +0400
@@ -4,6 +4,14 @@
menu "Library routines"
+config CRC16
+ tristate "CRC16 functions"
+ help
+ This option is provided for the case where no in-kernel-tree
+ modules require CRC16 functions, but a module built outside the
+ kernel tree does. Such modules that use library CRC16 functions
+ require M here.
+
config CRC32
tristate "CRC32 functions"
help
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/lib/Makefile linux-2.6.7-mm2/lib/Makefile
--- linux-2.6.7-mm2.vanilla/lib/Makefile 2004-06-24 14:35:04.000000000 +0400
+++ linux-2.6.7-mm2/lib/Makefile 2004-06-24 14:38:56.000000000 +0400
@@ -18,6 +18,7 @@ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
lib-y += dec_and_lock.o
endif
+obj-$(CONFIG_CRC16) += crc16.o
obj-$(CONFIG_CRC32) += crc32.o
obj-$(CONFIG_LIBCRC32C) += libcrc32c.o
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] 2.6.7-mm2, Use it in async PPP driver
2004-06-24 12:52 [PATCH 0/4] 2.6.7-mm2, Add common CRC16 module Andrey Panin
@ 2004-06-24 12:52 ` Andrey Panin
2004-06-24 12:52 ` [PATCH 2/4] 2.6.7-mm2, Use it in IRDA drivers Andrey Panin
0 siblings, 1 reply; 7+ messages in thread
From: Andrey Panin @ 2004-06-24 12:52 UTC (permalink / raw)
To: Andrew Morton, linux-kernel
This patch makes async PPP driver use common crc16 code.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
drivers/net/Kconfig | 1 +
drivers/net/ppp_async.c | 38 +-------------------------------------
include/linux/ppp_defs.h | 4 +++-
3 files changed, 5 insertions(+), 38 deletions(-)
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/drivers/net/Kconfig linux-2.6.7-mm2/drivers/net/Kconfig
--- linux-2.6.7-mm2.vanilla/drivers/net/Kconfig 2004-06-24 14:31:58.000000000 +0400
+++ linux-2.6.7-mm2/drivers/net/Kconfig 2004-06-24 15:12:10.000000000 +0400
@@ -2413,6 +2413,7 @@ config PPP_FILTER
config PPP_ASYNC
tristate "PPP support for async serial ports"
depends on PPP
+ select CRC16
---help---
Say Y (or M) here if you want to be able to use PPP over standard
asynchronous serial ports, such as COM1 or COM2 on a PC. If you use
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/drivers/net/ppp_async.c linux-2.6.7-mm2/drivers/net/ppp_async.c
--- linux-2.6.7-mm2.vanilla/drivers/net/ppp_async.c 2004-06-24 14:31:58.000000000 +0400
+++ linux-2.6.7-mm2/drivers/net/ppp_async.c 2004-06-24 15:12:10.000000000 +0400
@@ -24,6 +24,7 @@
#include <linux/tty.h>
#include <linux/netdevice.h>
#include <linux/poll.h>
+#include <linux/crc16.h>
#include <linux/ppp_defs.h>
#include <linux/if_ppp.h>
#include <linux/ppp_channel.h>
@@ -501,43 +502,6 @@ static void ppp_async_process(unsigned l
* Procedures for encapsulation and framing.
*/
-u16 ppp_crc16_table[256] = {
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
-EXPORT_SYMBOL(ppp_crc16_table);
-#define fcstab ppp_crc16_table /* for PPP_FCS macro */
-
/*
* Procedure to encode the data for async serial transmission.
* Does octet stuffing (escaping), puts the address/control bytes
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm2.vanilla/include/linux/ppp_defs.h linux-2.6.7-mm2/include/linux/ppp_defs.h
--- linux-2.6.7-mm2.vanilla/include/linux/ppp_defs.h 2004-06-24 14:33:18.000000000 +0400
+++ linux-2.6.7-mm2/include/linux/ppp_defs.h 2004-06-24 15:12:10.000000000 +0400
@@ -42,6 +42,8 @@
#ifndef _PPP_DEFS_H_
#define _PPP_DEFS_H_
+#include <linux/crc16.h>
+
/*
* The basic PPP frame.
*/
@@ -95,7 +97,7 @@
#define PPP_INITFCS 0xffff /* Initial FCS value */
#define PPP_GOODFCS 0xf0b8 /* Good final FCS value */
-#define PPP_FCS(fcs, c) (((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff])
+#define PPP_FCS(fcs, c) crc16_byte(fcs, c)
/*
* Extended asyncmap - allows any character to be escaped.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/4] 2.6.7-mm2, Use it in IRDA drivers
2004-06-24 12:52 ` [PATCH 1/4] 2.6.7-mm2, Use it in async PPP driver Andrey Panin
@ 2004-06-24 12:52 ` Andrey Panin
2004-06-24 12:52 ` [PATCH 3/4] 2.6.7-mm2, Use it in ISDN drivers Andrey Panin
0 siblings, 1 reply; 7+ messages in thread
From: Andrey Panin @ 2004-06-24 12:52 UTC (permalink / raw)
To: Andrew Morton, linux-kernel
This patch makes IRDA subsystem use common crc16 code.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
include/net/irda/crc.h | 10 ++-----
net/irda/Kconfig | 1
net/irda/Makefile | 2 -
net/irda/crc.c | 68 -------------------------------------------------
4 files changed, 5 insertions(+), 76 deletions(-)
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/include/net/irda/crc.h linux-2.6.7-rc1-mm1/include/net/irda/crc.h
--- linux-2.6.7-rc1-mm1.vanilla/include/net/irda/crc.h Wed Apr 28 22:56:46 2004
+++ linux-2.6.7-rc1-mm1/include/net/irda/crc.h Sat May 8 13:59:27 2004
@@ -15,19 +15,15 @@
#define IRDA_CRC_H
#include <linux/types.h>
+#include <linux/crc16.h>
#define INIT_FCS 0xffff /* Initial FCS value */
#define GOOD_FCS 0xf0b8 /* Good final FCS value */
-extern __u16 const irda_crc16_table[];
-
/* Recompute the FCS with one more character appended. */
-static inline __u16 irda_fcs(__u16 fcs, __u8 c)
-{
- return (((fcs) >> 8) ^ irda_crc16_table[((fcs) ^ (c)) & 0xff]);
-}
+#define irda_fcs(fcs, c) crc16_byte(fcs, c)
/* Recompute the FCS with len bytes appended. */
-__u16 irda_calc_crc16( __u16 fcs, __u8 const *buf, size_t len);
+#define irda_calc_crc16(fcs, buf, len) crc16(fcs, buf, len)
#endif
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/net/irda/Kconfig linux-2.6.7-rc1-mm1/net/irda/Kconfig
--- linux-2.6.7-rc1-mm1.vanilla/net/irda/Kconfig Wed Apr 28 22:57:09 2004
+++ linux-2.6.7-rc1-mm1/net/irda/Kconfig Sat May 8 14:13:30 2004
@@ -5,6 +5,7 @@
menuconfig IRDA
depends on NET
tristate "IrDA (infrared) subsystem support"
+ select CRC16
---help---
Say Y here if you want to build support for the IrDA (TM) protocols.
The Infrared Data Associations (tm) specifies standards for wireless
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/net/irda/Makefile linux-2.6.7-rc1-mm1/net/irda/Makefile
--- linux-2.6.7-rc1-mm1.vanilla/net/irda/Makefile Wed Apr 28 22:57:09 2004
+++ linux-2.6.7-rc1-mm1/net/irda/Makefile Sat May 8 13:57:16 2004
@@ -9,7 +9,7 @@ obj-$(CONFIG_IRCOMM) += ircomm/
irda-y := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \
- irttp.o irda_device.o irias_object.o crc.o wrapper.o af_irda.o \
+ irttp.o irda_device.o irias_object.o wrapper.o af_irda.o \
discovery.o parameters.o irmod.o
irda-$(CONFIG_PROC_FS) += irproc.o
irda-$(CONFIG_SYSCTL) += irsysctl.o
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/net/irda/crc.c linux-2.6.7-rc1-mm1/net/irda/crc.c
--- linux-2.6.7-rc1-mm1.vanilla/net/irda/crc.c Wed Apr 28 22:57:09 2004
+++ linux-2.6.7-rc1-mm1/net/irda/crc.c Thu Jan 1 03:00:00 1970
@@ -1,68 +0,0 @@
-/*********************************************************************
- *
- * Filename: crc.c
- * Version: 0.1
- * Description: CRC calculation routines
- * Status: Experimental.
- * Author: Dag Brattli <dagb@cs.uit.no>
- * Created at: Mon Aug 4 20:40:53 1997
- * Modified at: Sun May 2 20:28:08 1999
- * Modified by: Dag Brattli <dagb@cs.uit.no>
- * Sources: ppp.c by Michael Callahan <callahan@maths.ox.ac.uk>
- * Al Longyear <longyear@netcom.com>
- *
- ********************************************************************/
-
-#include <net/irda/crc.h>
-#include <linux/module.h>
-
-/*
- * This mysterious table is just the CRC of each possible byte. It can be
- * computed using the standard bit-at-a-time methods. The polynomial can
- * be seen in entry 128, 0x8408. This corresponds to x^0 + x^5 + x^12.
- * Add the implicit x^16, and you have the standard CRC-CCITT.
- */
-__u16 const irda_crc16_table[256] =
-{
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
-EXPORT_SYMBOL(irda_crc16_table);
-
-__u16 irda_calc_crc16( __u16 fcs, __u8 const *buf, size_t len)
-{
- while (len--)
- fcs = irda_fcs(fcs, *buf++);
- return fcs;
-}
-EXPORT_SYMBOL(irda_calc_crc16);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/4] 2.6.7-mm2, Use it in ISDN drivers
2004-06-24 12:52 ` [PATCH 2/4] 2.6.7-mm2, Use it in IRDA drivers Andrey Panin
@ 2004-06-24 12:52 ` Andrey Panin
2004-06-24 12:52 ` [PATCH 4/4] 2.6.7-mm2, Use it in AX.25 drivers Andrey Panin
0 siblings, 1 reply; 7+ messages in thread
From: Andrey Panin @ 2004-06-24 12:52 UTC (permalink / raw)
To: Andrew Morton, linux-kernel
This patch makes various ISDN drivers use common crc16 code.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
drivers/isdn/hisax/Kconfig | 2 +
drivers/isdn/hisax/isdnhdlc.c | 49 +++------------------------------------
drivers/isdn/hisax/netjet.c | 36 ----------------------------
drivers/isdn/hisax/st5481_hdlc.c | 48 +++-----------------------------------
drivers/isdn/tpam/Kconfig | 1
drivers/isdn/tpam/tpam_crcpc.c | 42 +++------------------------------
6 files changed, 15 insertions(+), 163 deletions(-)
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/Kconfig linux-2.6.7-rc1-mm1/drivers/isdn/hisax/Kconfig
--- linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/Kconfig Wed Apr 28 22:55:36 2004
+++ linux-2.6.7-rc1-mm1/drivers/isdn/hisax/Kconfig Sat May 8 15:35:28 2004
@@ -4,6 +4,7 @@ menu "Passive cards"
config ISDN_DRV_HISAX
tristate "HiSax SiemensChipSet driver support"
+ select CRC16
---help---
This is a driver supporting the Siemens chipset on various
ISDN-cards (like AVM A1, Elsa ISDN cards, Teles S0-16.0, Teles
@@ -399,6 +400,7 @@ comment "HiSax sub driver modules"
config HISAX_ST5481
tristate "ST5481 USB ISDN modem (EXPERIMENTAL)"
depends on USB && EXPERIMENTAL
+ select CRC16
help
This enables the driver for ST5481 based USB ISDN adapters,
e.g. the BeWan Gazel 128 USB
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/isdnhdlc.c linux-2.6.7-rc1-mm1/drivers/isdn/hisax/isdnhdlc.c
--- linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/isdnhdlc.c Wed Apr 28 22:55:35 2004
+++ linux-2.6.7-rc1-mm1/drivers/isdn/hisax/isdnhdlc.c Sat May 8 15:20:15 2004
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/crc16.h>
#include "isdnhdlc.h"
/*-------------------------------------------------------------------*/
@@ -58,43 +59,6 @@ const unsigned char isdnhdlc_bit_rev_tab
0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF
};
-/* Table for CRC16. Internal used only. */
-static const unsigned short int crc16_tab[] = {
- 0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,
- 0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
- 0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,
- 0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876,
- 0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd,
- 0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5,
- 0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c,
- 0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974,
- 0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb,
- 0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3,
- 0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a,
- 0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72,
- 0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9,
- 0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1,
- 0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738,
- 0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70,
- 0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7,
- 0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff,
- 0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036,
- 0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e,
- 0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5,
- 0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd,
- 0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134,
- 0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c,
- 0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3,
- 0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb,
- 0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232,
- 0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a,
- 0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1,
- 0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9,
- 0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,
- 0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78
-};
-
-
enum {
HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7,
HDLC_GET_DATA,HDLC_FAST_FLAG
@@ -339,12 +303,10 @@ int isdnhdlc_decode (struct isdnhdlc_var
return status;
}
if(hdlc->data_bits==8){
- unsigned cval;
-
hdlc->data_bits = 0;
hdlc->data_received = 1;
- cval = (hdlc->crc^hdlc->shift_reg) & 0xff;
- hdlc->crc = (hdlc->crc>>8)^crc16_tab[cval];
+ hdlc->crc = crc16_byte(hdlc->crc, hdlc->shift_reg);
+
// good byte received
if (dsize--) {
dst[hdlc->dstpos++] = hdlc->shift_reg;
@@ -520,10 +482,7 @@ int isdnhdlc_encode(struct isdnhdlc_vars
break;
}
if(hdlc->bit_shift==8){
- unsigned cval;
-
- cval = (hdlc->crc^hdlc->shift_reg) & 0xff;
- hdlc->crc = (hdlc->crc>>8)^crc16_tab[cval];
+ hdlc->crc = crc16_byte(hdlc->crc, hdlc->shift_reg);
}
if(hdlc->shift_reg & 0x01){
hdlc->hdlc_bits1++;
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/netjet.c linux-2.6.7-rc1-mm1/drivers/isdn/hisax/netjet.c
--- linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/netjet.c Wed Apr 28 22:55:35 2004
+++ linux-2.6.7-rc1-mm1/drivers/isdn/hisax/netjet.c Sat May 8 15:05:16 2004
@@ -58,42 +58,6 @@ NETjet_ReadICfifo(struct IsdnCardState *
insb(cs->hw.njet.isac, data, size);
}
-__u16 fcstab[256] =
-{
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
-
void
NETjet_WriteICfifo(struct IsdnCardState *cs, u_char *data, int size)
{
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/st5481_hdlc.c linux-2.6.7-rc1-mm1/drivers/isdn/hisax/st5481_hdlc.c
--- linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/hisax/st5481_hdlc.c Wed Apr 28 22:55:36 2004
+++ linux-2.6.7-rc1-mm1/drivers/isdn/hisax/st5481_hdlc.c Sat May 8 15:17:41 2004
@@ -10,44 +10,9 @@
*
*/
+#include <linux/crc16.h>
#include "st5481_hdlc.h"
-static const unsigned short int crc16_tab[] = {
- 0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,
- 0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
- 0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,
- 0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876,
- 0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd,
- 0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5,
- 0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c,
- 0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974,
- 0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb,
- 0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3,
- 0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a,
- 0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72,
- 0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9,
- 0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1,
- 0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738,
- 0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70,
- 0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7,
- 0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff,
- 0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036,
- 0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e,
- 0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5,
- 0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd,
- 0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134,
- 0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c,
- 0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3,
- 0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb,
- 0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232,
- 0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a,
- 0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1,
- 0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9,
- 0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,
- 0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78
-};
-
-
enum {
HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7,
@@ -295,12 +260,10 @@ int hdlc_decode(struct hdlc_vars *hdlc,
return status;
}
if(hdlc->data_bits==8){
- unsigned cval;
-
hdlc->data_bits = 0;
hdlc->data_received = 1;
- cval = (hdlc->crc^hdlc->shift_reg) & 0xff;
- hdlc->crc = (hdlc->crc>>8)^crc16_tab[cval];
+ hdlc->crc = crc16_byte(hdlc->crc, hdlc->shift_reg);
+
// good byte received
if (dsize--) {
dst[hdlc->dstpos++] = hdlc->shift_reg;
@@ -476,10 +439,7 @@ int hdlc_encode(struct hdlc_vars *hdlc,
break;
}
if(hdlc->bit_shift==8){
- unsigned cval;
-
- cval = (hdlc->crc^hdlc->shift_reg) & 0xff;
- hdlc->crc = (hdlc->crc>>8)^crc16_tab[cval];
+ hdlc->crc = crc16_byte(hdlc->crc, hdlc->shift_reg);
}
if(hdlc->shift_reg & 0x01){
hdlc->hdlc_bits1++;
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/tpam/Kconfig linux-2.6.7-rc1-mm1/drivers/isdn/tpam/Kconfig
--- linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/tpam/Kconfig Wed Apr 28 22:55:37 2004
+++ linux-2.6.7-rc1-mm1/drivers/isdn/tpam/Kconfig Sat May 8 15:26:57 2004
@@ -4,6 +4,7 @@
config ISDN_DRV_TPAM
tristate "Auvertech TurboPAM support (EXPERIMENTAL)"
depends on EXPERIMENTAL && ISDN_I4L && PCI
+ select CRC16
help
This enables support for the Auvertech TurboPAM ISDN-card.
For running this card, additional firmware is necessary, which has
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/tpam/tpam_crcpc.c linux-2.6.7-rc1-mm1/drivers/isdn/tpam/tpam_crcpc.c
--- linux-2.6.7-rc1-mm1.vanilla/drivers/isdn/tpam/tpam_crcpc.c Wed Apr 28 22:55:37 2004
+++ linux-2.6.7-rc1-mm1/drivers/isdn/tpam/tpam_crcpc.c Sat May 8 14:37:35 2004
@@ -27,6 +27,7 @@ Revision History:
---------------------------------------------------------------------------*/
+#include <linux/crc16.h>
#include "tpam.h"
#define HDLC_CTRL_CHAR_CMPL_MASK 0x20 /* HDLC control character complement mask */
@@ -38,41 +39,6 @@ Revision History:
#define TRUE 1
#define FALSE 0
-static u16 t_ap_hdlc_like_fcs [256] = {
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
-
static u8 ap_t_ctrl_char_complemented[256]; /* list of characters to complement */
static void ap_hdlc_like_ctrl_char_list (u32 ctrl_char) {
@@ -119,7 +85,7 @@ void hdlc_encode_modem(u8 *buffer_in, u3
/*
* FCS calculation
*/
- fcs = (fcs>>8) ^ t_ap_hdlc_like_fcs[((u8)(fcs^data)) & 0xff];
+ fcs = crc16_byte(fcs, data);
ESCAPE_CHAR(p_data_out, data);
}
@@ -155,7 +121,7 @@ void hdlc_no_accm_encode(u8 *buffer_in,
while (lng_in--) {
data = *buffer_in++;
/* calculate FCS */
- fcs = (fcs>>8) ^ t_ap_hdlc_like_fcs[((u8)(fcs^data)) & 0xff];
+ fcs = crc16_byte(fcs, data);
*p_data_out++ = data;
}
@@ -185,7 +151,7 @@ u32 hdlc_no_accm_decode(u8 *buffer_in, u
while (lng_in--) {
data = *buffer_in++;
/* calculate FCS */
- fcs = (fcs>>8) ^ t_ap_hdlc_like_fcs[((u8)(fcs^data)) & 0xff];
+ fcs = crc16_byte(fcs, data);
}
if (fcs == HDLC_FCS_OK)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/4] 2.6.7-mm2, Use it in AX.25 drivers
2004-06-24 12:52 ` [PATCH 3/4] 2.6.7-mm2, Use it in ISDN drivers Andrey Panin
@ 2004-06-24 12:52 ` Andrey Panin
2004-06-28 16:53 ` Thomas Sailer
0 siblings, 1 reply; 7+ messages in thread
From: Andrey Panin @ 2004-06-24 12:52 UTC (permalink / raw)
To: Andrew Morton, linux-kernel
This patch makes AX.25 drivers use common crc16 code.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
drivers/net/hamradio/Kconfig | 4 +++
drivers/net/hamradio/baycom_epp.c | 48 ++------------------------------------
drivers/net/hamradio/hdlcdrv.c | 47 ++-----------------------------------
3 files changed, 10 insertions(+), 89 deletions(-)
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/net/hamradio/Kconfig linux-2.6.7-rc1-mm1/drivers/net/hamradio/Kconfig
--- linux-2.6.7-rc1-mm1.vanilla/drivers/net/hamradio/Kconfig Wed Apr 28 22:55:28 2004
+++ linux-2.6.7-rc1-mm1/drivers/net/hamradio/Kconfig Sat May 8 16:01:05 2004
@@ -113,6 +113,7 @@ config SCC_TRXECHO
config BAYCOM_SER_FDX
tristate "BAYCOM ser12 fullduplex driver for AX.25"
depends on AX25
+ select CRC16
---help---
This is one of two drivers for Baycom style simple amateur radio
modems that connect to a serial interface. The driver supports the
@@ -132,6 +133,7 @@ config BAYCOM_SER_FDX
config BAYCOM_SER_HDX
tristate "BAYCOM ser12 halfduplex driver for AX.25"
depends on AX25
+ select CRC16
---help---
This is one of two drivers for Baycom style simple amateur radio
modems that connect to a serial interface. The driver supports the
@@ -149,6 +151,7 @@ config BAYCOM_SER_HDX
config BAYCOM_PAR
tristate "BAYCOM picpar and par96 driver for AX.25"
depends on PARPORT && AX25
+ select CRC16
---help---
This is a driver for Baycom style simple amateur radio modems that
connect to a parallel interface. The driver supports the picpar and
@@ -163,6 +166,7 @@ config BAYCOM_PAR
config BAYCOM_EPP
tristate "BAYCOM epp driver for AX.25"
depends on PARPORT && AX25 && !64BIT
+ select CRC16
---help---
This is a driver for Baycom style simple amateur radio modems that
connect to a parallel interface. The driver supports the EPP
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/net/hamradio/baycom_epp.c linux-2.6.7-rc1-mm1/drivers/net/hamradio/baycom_epp.c
--- linux-2.6.7-rc1-mm1.vanilla/drivers/net/hamradio/baycom_epp.c Wed Apr 28 22:55:28 2004
+++ linux-2.6.7-rc1-mm1/drivers/net/hamradio/baycom_epp.c Sat May 8 15:56:07 2004
@@ -58,6 +58,7 @@
/* prototypes for ax25_encapsulate and ax25_rebuild_header */
#include <net/ax25.h>
#endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
+#include <linux/crc16.h>
/* --------------------------------------------------------------------- */
@@ -260,40 +261,6 @@ struct baycom_state {
* by Dieter Deyke
*/
-static const unsigned short crc_ccitt_table[] = {
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
/*---------------------------------------------------------------------------*/
@@ -314,23 +281,14 @@ static inline void append_crc_ccitt(unsi
static inline int check_crc_ccitt(const unsigned char *buf, int cnt)
{
- unsigned int crc = 0xffff;
-
- for (; cnt > 0; cnt--)
- crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buf++) & 0xff];
- return (crc & 0xffff) == 0xf0b8;
+ return (crc16(0xffff, buf, cnt) & 0xffff) == 0xf0b8;
}
/*---------------------------------------------------------------------------*/
static inline int calc_crc_ccitt(const unsigned char *buf, int cnt)
{
- unsigned int crc = 0xffff;
-
- for (; cnt > 0; cnt--)
- crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buf++) & 0xff];
- crc ^= 0xffff;
- return (crc & 0xffff);
+ return (crc16(0xffff, buf, cnt) ^ 0xffff) & 0xffff;
}
/* ---------------------------------------------------------------------- */
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/net/hamradio/hdlcdrv.c linux-2.6.7-rc1-mm1/drivers/net/hamradio/hdlcdrv.c
--- linux-2.6.7-rc1-mm1.vanilla/drivers/net/hamradio/hdlcdrv.c Wed Apr 28 22:55:28 2004
+++ linux-2.6.7-rc1-mm1/drivers/net/hamradio/hdlcdrv.c Sat May 8 15:53:17 2004
@@ -66,6 +66,7 @@
#include <linux/ip.h>
#include <linux/udp.h>
#include <linux/tcp.h>
+#include <linux/crc16.h>
/* --------------------------------------------------------------------- */
@@ -99,50 +100,12 @@ static char ax25_nocall[AX25_ADDR_LEN] =
* by Dieter Deyke
*/
-static const unsigned short crc_ccitt_table[] = {
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
/*---------------------------------------------------------------------------*/
static inline void append_crc_ccitt(unsigned char *buffer, int len)
{
- unsigned int crc = 0xffff;
-
- for (;len>0;len--)
- crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buffer++) & 0xff];
- crc ^= 0xffff;
+ unsigned int crc = crc16(0xffff, buffer, len) ^ 0xffff;
*buffer++ = crc;
*buffer++ = crc >> 8;
}
@@ -151,11 +114,7 @@ static inline void append_crc_ccitt(unsi
static inline int check_crc_ccitt(const unsigned char *buf, int cnt)
{
- unsigned int crc = 0xffff;
-
- for (; cnt > 0; cnt--)
- crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buf++) & 0xff];
- return (crc & 0xffff) == 0xf0b8;
+ return (crc16(0xffff, buf, cnt) & 0xffff) == 0xf0b8;
}
/*---------------------------------------------------------------------------*/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] 2.6.7-mm2, Use it in AX.25 drivers
2004-06-24 12:52 ` [PATCH 4/4] 2.6.7-mm2, Use it in AX.25 drivers Andrey Panin
@ 2004-06-28 16:53 ` Thomas Sailer
2004-06-29 6:36 ` Andrey Panin
0 siblings, 1 reply; 7+ messages in thread
From: Thomas Sailer @ 2004-06-28 16:53 UTC (permalink / raw)
To: Andrey Panin; +Cc: Andrew Morton, linux-kernel
On Thu, 2004-06-24 at 14:52, Andrey Panin wrote:
> This patch makes AX.25 drivers use common crc16 code.
Hrm, isn't this bit of a misnamer?
While the polynomial usually known as "CCITT" or "X25" is
x^16+x^12+x^5+x^0, CRC-16 usually means the polynomial
x^16+x^15+x^2+x^0. So to avoid confusion I suggest renaming it from
CRC16 to CRCCCITT or similar...
Tom
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] 2.6.7-mm2, Use it in AX.25 drivers
2004-06-28 16:53 ` Thomas Sailer
@ 2004-06-29 6:36 ` Andrey Panin
0 siblings, 0 replies; 7+ messages in thread
From: Andrey Panin @ 2004-06-29 6:36 UTC (permalink / raw)
To: Thomas Sailer; +Cc: Andrew Morton, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 666 bytes --]
On 180, 06 28, 2004 at 06:53:54PM +0200, Thomas Sailer wrote:
> On Thu, 2004-06-24 at 14:52, Andrey Panin wrote:
> > This patch makes AX.25 drivers use common crc16 code.
>
> Hrm, isn't this bit of a misnamer?
>
> While the polynomial usually known as "CCITT" or "X25" is
> x^16+x^12+x^5+x^0, CRC-16 usually means the polynomial
> x^16+x^15+x^2+x^0. So to avoid confusion I suggest renaming it from
> CRC16 to CRCCCITT or similar...
Yeah I see, it's really CCITT CRC and it's really misnamed :(
I'll post a patch to fix it (probably tomorrow).
--
Andrey Panin | Linux and UNIX system administrator
pazke@donpac.ru | PGP key: wwwkeys.pgp.net
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2004-06-29 6:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-24 12:52 [PATCH 0/4] 2.6.7-mm2, Add common CRC16 module Andrey Panin
2004-06-24 12:52 ` [PATCH 1/4] 2.6.7-mm2, Use it in async PPP driver Andrey Panin
2004-06-24 12:52 ` [PATCH 2/4] 2.6.7-mm2, Use it in IRDA drivers Andrey Panin
2004-06-24 12:52 ` [PATCH 3/4] 2.6.7-mm2, Use it in ISDN drivers Andrey Panin
2004-06-24 12:52 ` [PATCH 4/4] 2.6.7-mm2, Use it in AX.25 drivers Andrey Panin
2004-06-28 16:53 ` Thomas Sailer
2004-06-29 6:36 ` Andrey Panin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox