Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 408c1ce2 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

[Bluetooth] Move CRC table into RFCOMM core 



This patch moves rfcomm_crc_table[] into the RFCOMM core, because there
is no need to keep it in a separate file.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 741b2252

include/net/bluetooth/rfcomm.h

+0 −3
Original line number Diff line number Diff line
@@ -275,9 +275,6 @@ static inline void rfcomm_session_hold(struct rfcomm_session *s) 
	atomic_inc(&s->refcnt);

}



/* ---- RFCOMM chechsum ---- */

extern u8 rfcomm_crc_table[];



/* ---- RFCOMM sockets ---- */

struct sockaddr_rc {

	sa_family_t	rc_family;

net/bluetooth/rfcomm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ 


obj-$(CONFIG_BT_RFCOMM) += rfcomm.o



rfcomm-y			:= core.o sock.o crc.o

rfcomm-y			:= core.o sock.o

rfcomm-$(CONFIG_BT_RFCOMM_TTY)	+= tty.o

net/bluetooth/rfcomm/core.c

+43 −0
Original line number Diff line number Diff line
@@ -133,6 +133,49 @@ static inline void rfcomm_session_put(struct rfcomm_session *s) 


/* ---- RFCOMM FCS computation ---- */



/* reversed, 8-bit, poly=0x07 */

static unsigned char rfcomm_crc_table[256] = { 

	0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75,

	0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b,

	0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69,

	0x12, 0x83, 0xf1, 0x60, 0x15, 0x84, 0xf6, 0x67,



	0x38, 0xa9, 0xdb, 0x4a, 0x3f, 0xae, 0xdc, 0x4d,

	0x36, 0xa7, 0xd5, 0x44, 0x31, 0xa0, 0xd2, 0x43,

	0x24, 0xb5, 0xc7, 0x56, 0x23, 0xb2, 0xc0, 0x51,

	0x2a, 0xbb, 0xc9, 0x58, 0x2d, 0xbc, 0xce, 0x5f,



	0x70, 0xe1, 0x93, 0x02, 0x77, 0xe6, 0x94, 0x05,

	0x7e, 0xef, 0x9d, 0x0c, 0x79, 0xe8, 0x9a, 0x0b,

	0x6c, 0xfd, 0x8f, 0x1e, 0x6b, 0xfa, 0x88, 0x19,

	0x62, 0xf3, 0x81, 0x10, 0x65, 0xf4, 0x86, 0x17,



	0x48, 0xd9, 0xab, 0x3a, 0x4f, 0xde, 0xac, 0x3d,

	0x46, 0xd7, 0xa5, 0x34, 0x41, 0xd0, 0xa2, 0x33,

	0x54, 0xc5, 0xb7, 0x26, 0x53, 0xc2, 0xb0, 0x21,

	0x5a, 0xcb, 0xb9, 0x28, 0x5d, 0xcc, 0xbe, 0x2f,



	0xe0, 0x71, 0x03, 0x92, 0xe7, 0x76, 0x04, 0x95,

	0xee, 0x7f, 0x0d, 0x9c, 0xe9, 0x78, 0x0a, 0x9b,

	0xfc, 0x6d, 0x1f, 0x8e, 0xfb, 0x6a, 0x18, 0x89,

	0xf2, 0x63, 0x11, 0x80, 0xf5, 0x64, 0x16, 0x87,



	0xd8, 0x49, 0x3b, 0xaa, 0xdf, 0x4e, 0x3c, 0xad,

	0xd6, 0x47, 0x35, 0xa4, 0xd1, 0x40, 0x32, 0xa3,

	0xc4, 0x55, 0x27, 0xb6, 0xc3, 0x52, 0x20, 0xb1,

	0xca, 0x5b, 0x29, 0xb8, 0xcd, 0x5c, 0x2e, 0xbf,



	0x90, 0x01, 0x73, 0xe2, 0x97, 0x06, 0x74, 0xe5,

	0x9e, 0x0f, 0x7d, 0xec, 0x99, 0x08, 0x7a, 0xeb,

	0x8c, 0x1d, 0x6f, 0xfe, 0x8b, 0x1a, 0x68, 0xf9,

	0x82, 0x13, 0x61, 0xf0, 0x85, 0x14, 0x66, 0xf7,



	0xa8, 0x39, 0x4b, 0xda, 0xaf, 0x3e, 0x4c, 0xdd,

	0xa6, 0x37, 0x45, 0xd4, 0xa1, 0x30, 0x42, 0xd3,

	0xb4, 0x25, 0x57, 0xc6, 0xb3, 0x22, 0x50, 0xc1,

	0xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf

};



/* CRC on 2 bytes */

#define __crc(data) (rfcomm_crc_table[rfcomm_crc_table[0xff ^ data[0]] ^ data[1]])

net/bluetooth/rfcomm/crc.c

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/* 

   RFCOMM implementation for Linux Bluetooth stack (BlueZ).

   Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>

   Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org>



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License version 2 as

   published by the Free Software Foundation;



   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.

   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY

   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 

   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 

   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 

   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 

   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 

   SOFTWARE IS DISCLAIMED.

*/



/*

 * RFCOMM FCS calculation.

 *

 * $Id: crc.c,v 1.2 2002/09/21 09:54:32 holtmann Exp $

 */



/* reversed, 8-bit, poly=0x07 */

unsigned char rfcomm_crc_table[256] = { 

	0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75,

	0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b,

	0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69,

	0x12, 0x83, 0xf1, 0x60, 0x15, 0x84, 0xf6, 0x67,



	0x38, 0xa9, 0xdb, 0x4a, 0x3f, 0xae, 0xdc, 0x4d,

	0x36, 0xa7, 0xd5, 0x44, 0x31, 0xa0, 0xd2, 0x43,

	0x24, 0xb5, 0xc7, 0x56, 0x23, 0xb2, 0xc0, 0x51,

	0x2a, 0xbb, 0xc9, 0x58, 0x2d, 0xbc, 0xce, 0x5f,



	0x70, 0xe1, 0x93, 0x02, 0x77, 0xe6, 0x94, 0x05,

	0x7e, 0xef, 0x9d, 0x0c, 0x79, 0xe8, 0x9a, 0x0b,

	0x6c, 0xfd, 0x8f, 0x1e, 0x6b, 0xfa, 0x88, 0x19,

	0x62, 0xf3, 0x81, 0x10, 0x65, 0xf4, 0x86, 0x17,



	0x48, 0xd9, 0xab, 0x3a, 0x4f, 0xde, 0xac, 0x3d,

	0x46, 0xd7, 0xa5, 0x34, 0x41, 0xd0, 0xa2, 0x33,

	0x54, 0xc5, 0xb7, 0x26, 0x53, 0xc2, 0xb0, 0x21,

	0x5a, 0xcb, 0xb9, 0x28, 0x5d, 0xcc, 0xbe, 0x2f,



	0xe0, 0x71, 0x03, 0x92, 0xe7, 0x76, 0x04, 0x95,

	0xee, 0x7f, 0x0d, 0x9c, 0xe9, 0x78, 0x0a, 0x9b,

	0xfc, 0x6d, 0x1f, 0x8e, 0xfb, 0x6a, 0x18, 0x89,

	0xf2, 0x63, 0x11, 0x80, 0xf5, 0x64, 0x16, 0x87,



	0xd8, 0x49, 0x3b, 0xaa, 0xdf, 0x4e, 0x3c, 0xad,

	0xd6, 0x47, 0x35, 0xa4, 0xd1, 0x40, 0x32, 0xa3,

	0xc4, 0x55, 0x27, 0xb6, 0xc3, 0x52, 0x20, 0xb1,

	0xca, 0x5b, 0x29, 0xb8, 0xcd, 0x5c, 0x2e, 0xbf,



	0x90, 0x01, 0x73, 0xe2, 0x97, 0x06, 0x74, 0xe5,

	0x9e, 0x0f, 0x7d, 0xec, 0x99, 0x08, 0x7a, 0xeb,

	0x8c, 0x1d, 0x6f, 0xfe, 0x8b, 0x1a, 0x68, 0xf9,

	0x82, 0x13, 0x61, 0xf0, 0x85, 0x14, 0x66, 0xf7,



	0xa8, 0x39, 0x4b, 0xda, 0xaf, 0x3e, 0x4c, 0xdd,

	0xa6, 0x37, 0x45, 0xd4, 0xa1, 0x30, 0x42, 0xd3,

	0xb4, 0x25, 0x57, 0xc6, 0xb3, 0x22, 0x50, 0xc1,

	0xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf

};