From: Peter K. <pk...@us...> - 2001-05-17 15:44:27
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Removed unused code. The diff of the modified file(s): --- bcsp.h 2001/05/15 14:37:52 1.1 +++ bcsp.h 2001/05/17 15:44:27 1.2 @@ -1,6 +1,5 @@ /* - * bcsp.h -- Define of macros and functions used in the BCSP - * protocol stack + * bcsp.h -- Define of macros and functions used in the BCSP protocol stack * * Copyright (C) 2001 Axis Communications AB * @@ -87,14 +86,6 @@ #define BCSP_GET_IDENTIFIER(bcsp) ((bcsp)->packet[1] & 0x0f)=20 #define BCSP_GET_PAYLOAD_LENGTH(bcsp) (((bcsp)->packet[2] << 4) | (((bcsp)= ->packet[1] >> 4) & 0xff)) #define BCSP_GET_CHECKSUM(bcsp) ((bcsp)->packet[3]) - - -#if 0 -#define CHAR2INT16(c1,c0) ((((c1) & 0xff) << 8) + ((c0) & 0xff)) -#define CHAR2INT32(c3,c2,c1,c0) ((((c3) & 0xff) << 24) + \ - (((c2) & 0xff) << 16) + \ - (((c1) & 0xff) << 8) + ((c0) &0xff)) -#endif =20 /****************** TYPE DEFINITION SECTION ******************************= ***/ =20 |
From: Peter K. <pk...@us...> - 2001-05-17 15:59:47
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added send_txack() and signal_rxack(). The diff of the modified file(s): --- bcsp.h 2001/05/17 15:44:27 1.2 +++ bcsp.h 2001/05/17 15:59:46 1.3 @@ -128,12 +128,14 @@ s32 mux_send(struct bcsp *bcsp); s32 mux_receive(struct bcsp *bcsp); s32 mux_send(struct bcsp *bcsp); +s32 send_txack(u8 txack); =20 /************************* functions in sequence.c ***********************= ***/ =20 void sequence_init(void); s32 sequence_receive(struct bcsp *bcsp); s32 sequence_send(u8 *data, u32 len, u8 chn); +void signal_rxack(u8 ack); =20 /************************* functions in datagram.c ***********************= ****/ =20 |
From: Mats F. <ma...@us...> - 2001-05-18 09:14:22
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added shutdown function for BCSP The diff of the modified file(s): --- bcsp.h 2001/05/17 15:59:46 1.3 +++ bcsp.h 2001/05/18 09:14:21 1.4 @@ -106,6 +106,7 @@ /************************* functions in bcsp.c ***************************= ***/ =20 void bcsp_init(void); +void bcsp_shutdown(void); void bcsp_syncronized(void); s32 bcsp_write_top(u8 *data, u32 len); s32 bcsp_write_lower(u8 *data, u32 len); @@ -133,6 +134,7 @@ /************************* functions in sequence.c ***********************= ***/ =20 void sequence_init(void); +void sequence_shutdown(void); s32 sequence_receive(struct bcsp *bcsp); s32 sequence_send(u8 *data, u32 len, u8 chn); void signal_rxack(u8 ack); |
From: Peter K. <pk...@us...> - 2001-05-18 16:04:17
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Made all global function names start with bcsp_. The diff of the modified file(s): --- bcsp.h 2001/05/18 09:14:21 1.4 +++ bcsp.h 2001/05/18 16:04:16 1.5 @@ -112,38 +112,38 @@ s32 bcsp_write_lower(u8 *data, u32 len); s32 bcsp_receive_top(u8 *data, u32 len, u8 chn); s32 bcsp_receive_lower(u8 *data, u32 len); -void init_bcsp_packet(struct bcsp *bcsp); +void bcsp_init_packet(struct bcsp *bcsp); =20 /************************* functions in slip.c ***************************= ***/ =20 -s32 slip_send(struct bcsp* bcsp); -s32 slip_receive(struct bcsp* bcsp, const u8* packet, u32 len); +s32 bcsp_slip_send(struct bcsp* bcsp); +s32 bcsp_slip_receive(struct bcsp* bcsp, const u8* packet, u32 len); =20 /************************* functions in integrity.c **********************= ****/ =20 -s32 integrity_send(struct bcsp *bcsp); -s32 integrity_receive(struct bcsp *bcsp); +s32 bcsp_integrity_send(struct bcsp *bcsp); +s32 bcsp_integrity_receive(struct bcsp *bcsp); =20 /************************* functions in mux.c ****************************= ***/ =20 -s32 mux_send(struct bcsp *bcsp); -s32 mux_receive(struct bcsp *bcsp); -s32 mux_send(struct bcsp *bcsp); -s32 send_txack(u8 txack); +s32 bcsp_mux_send(struct bcsp *bcsp); +s32 bcsp_mux_receive(struct bcsp *bcsp); +s32 bcsp_mux_send(struct bcsp *bcsp); +s32 bcsp_send_txack(u8 txack); =20 /************************* functions in sequence.c ***********************= ***/ =20 -void sequence_init(void); -void sequence_shutdown(void); -s32 sequence_receive(struct bcsp *bcsp); -s32 sequence_send(u8 *data, u32 len, u8 chn); -void signal_rxack(u8 ack); +void bcsp_sequence_init(void); +void bcsp_sequence_shutdown(void); +s32 bcsp_sequence_receive(struct bcsp *bcsp); +s32 bcsp_sequence_send(u8 *data, u32 len, u8 chn); +void bcsp_signal_rxack(u8 ack); =20 /************************* functions in datagram.c ***********************= ****/ =20 -s32 datagram_receive(struct bcsp *bcsp); -s32 datagram_send(u8 *data, u32 len, u8 chn); -s32 send_sync(void); +s32 bcsp_datagram_receive(struct bcsp *bcsp); +s32 bcsp_datagram_send(u8 *data, u32 len, u8 chn); +s32 bcsp_send_sync(void); =20 #endif /****************** END OF FILE bcsp.h ***********************************= ***/ |
From: Mats F. <ma...@us...> - 2001-05-25 14:23:39
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.5 1.6=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added defines for the SYNC and CONF packets The diff of the modified file(s): --- bcsp.h 2001/05/18 16:04:16 1.5 +++ bcsp.h 2001/05/25 14:23:38 1.6 @@ -56,6 +56,11 @@ #define TRUE 1 #endif =20 +#define SYNC 0xEDEDDCDA +#define SYNC_RSP 0xEEEFAFAC +#define CONF 0xEDACEFAD +#define CONF_RSP 0xD0D0ADDE + #define BCSP_FLAG_SEQ 0x07 #define BCSP_FLAG_ACK 0x38 #define BCSP_FLAG_CRC 0x40 @@ -143,7 +148,7 @@ =20 s32 bcsp_datagram_receive(struct bcsp *bcsp); s32 bcsp_datagram_send(u8 *data, u32 len, u8 chn); -s32 bcsp_send_sync(void); +s32 bcsp_send_sync(u32 type); =20 #endif /****************** END OF FILE bcsp.h ***********************************= ***/ |
From: Mattias A. <mat...@us...> - 2001-06-06 15:01:13
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Added function bcsp_issyncronized * Use return val in bcsp_syncronized * Added bcsp_datagram_init/shutdown function The diff of the modified file(s): --- bcsp.h 2001/05/25 14:23:38 1.6 +++ bcsp.h 2001/06/06 15:01:11 1.7 @@ -110,8 +110,9 @@ =20 /************************* functions in bcsp.c ***************************= ***/ =20 -void bcsp_init(void); +s32 bcsp_init(void); void bcsp_shutdown(void); +u32 bcsp_issyncronized(void); void bcsp_syncronized(void); s32 bcsp_write_top(u8 *data, u32 len); s32 bcsp_write_lower(u8 *data, u32 len); @@ -146,6 +147,8 @@ =20 /************************* functions in datagram.c ***********************= ****/ =20 +void bcsp_datagram_init(void); +void bcsp_datagram_shutdown(void); s32 bcsp_datagram_receive(struct bcsp *bcsp); s32 bcsp_datagram_send(u8 *data, u32 len, u8 chn); s32 bcsp_send_sync(u32 type); |
From: Peter K. <pk...@us...> - 2001-09-06 15:56:56
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.8 1.9=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Moved BCSP channel definitions to bcsp.h * Corrected spelling of BCSP_EVT_CHN. The diff of the modified file(s): --- bcsp.h 2001/08/16 13:01:22 1.8 +++ bcsp.h 2001/09/06 15:56:56 1.9 @@ -60,6 +60,14 @@ #define TRUE 1 #endif =20 +#define BCSP_BCCMD_CHN 2 +#define BCSP_HQ_CHN 3 +#define BCSP_CMD_CHN 5 +#define BCSP_EVT_CHN 5 +#define BCSP_ACL_CHN 6 +#define BCSP_SCO_CHN 7 +#define BCSP_DFU_CHN 12 + #define SYNC 0xEDEDDCDA #define SYNC_RSP 0xEEEFAFAC #define CONF 0xEDACEFAD |
From: Peter K. <pk...@us...> - 2001-09-18 12:10:49
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.9 1.10=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Made bcsp_slip_receive() call bcsp_integrity_receive() instead of having bcsp_receive_lower() do it. * Moved bcsp_dbg() to bcsp_slip.c and renamed it to slip_debug(). Previously there was a chance of it displaying incorrect seq and ack values for outgoing packets (as it used the slip encoded values). The diff of the modified file(s): --- bcsp.h 2001/09/06 15:56:56 1.9 +++ bcsp.h 2001/09/18 12:10:49 1.10 @@ -135,7 +135,7 @@ /************************* functions in slip.c ***************************= ***/ =20 s32 bcsp_slip_send(struct bcsp* bcsp); -s32 bcsp_slip_receive(struct bcsp* bcsp, const u8* packet, u32 len); +s32 bcsp_slip_receive(const u8* packet, u32 len); =20 /************************* functions in integrity.c **********************= ****/ =20 |
From: Peter K. <pk...@us...> - 2001-09-18 12:19:54
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Make BCSP_GET_*() and BCSP_SET_*() use GET_BITS() and SET_BITS(). The diff of the modified file(s): --- bcsp.h 2001/09/18 12:10:49 1.10 +++ bcsp.h 2001/09/18 12:19:53 1.11 @@ -46,8 +46,10 @@ =20 #ifdef __KERNEL__ #include <linux/types.h> +#include <linux/bluetooth/btcommon.h> #else #include "local.h" +#include "include/btcommon.h" #endif =20 /****************** CONSTANT AND MACRO SECTION ***************************= ***/ @@ -73,11 +75,6 @@ #define CONF 0xEDACEFAD #define CONF_RSP 0xD0D0ADDE =20 -#define BCSP_FLAG_SEQ 0x07 -#define BCSP_FLAG_ACK 0x38 -#define BCSP_FLAG_CRC 0x40 -#define BCSP_FLAG_TYPE 0x80 - #define BCSP_CRC_NOT_PRESENT 0 #define BCSP_CRC_PRESENT 1 =20 @@ -90,18 +87,18 @@ #define ERR_CHECKSUM 1 #define ERR_PAYLOAD_LENGTH 2 =20 -#define BCSP_GET_SEQ(bcsp) ((bcsp)->flags & BCSP_FLAG_SEQ) -#define BCSP_SET_SEQ(bcsp, x) do { (bcsp)->flags =3D ((bcsp)->fl= ags & ~BCSP_FLAG_SEQ) | ((x) & BCSP_FLAG_SEQ); } while (0) -#define BCSP_GET_ACK(bcsp) (((bcsp)->flags & BCSP_FLAG_ACK) >= > 3) -#define BCSP_SET_ACK(bcsp, x) do { (bcsp)->flags =3D ((((x) & 0x= 7) << 3) | ((bcsp)->flags & 0xc7)); } while (0) -#define BCSP_GET_CRC_PRESENT(bcsp) ((bcsp)->flags & BCSP_FLAG_CRC ? B= CSP_CRC_PRESENT : BCSP_CRC_NOT_PRESENT) -#define BCSP_SET_CRC_PRESENT(bcsp, x) do { ; } while (0) -#define BCSP_GET_PROTOCOL_TYPE(bcsp) ((bcsp)->flags & BCSP_FLAG_TYPE ? = BCSP_RELIABLE : BCSP_UNRELIABLE) -#define BCSP_SET_PROTOCOL_TYPE(bcsp, x) do {(bcsp)->flags =3D ((bcsp)->fla= gs & 0x7f) | ((x & 0x1) << 7); } while (0) +#define BCSP_GET_SEQ(bcsp) GET_BITS((bcsp)->flags, 0, 3) +#define BCSP_SET_SEQ(bcsp, x) SET_BITS((bcsp)->flags, 0, 3, x) +#define BCSP_GET_ACK(bcsp) GET_BITS((bcsp)->flags, 3, 3) +#define BCSP_SET_ACK(bcsp, x) SET_BITS((bcsp)->flags, 3, 3, x) +#define BCSP_GET_CRC_PRESENT(bcsp) (GET_BITS((bcsp)->flags, 6, 1) ? B= CSP_CRC_PRESENT : BCSP_CRC_NOT_PRESENT) +#define BCSP_SET_CRC_PRESENT(bcsp, x) SET_BITS((bcsp)->flags, 6, 1, x) +#define BCSP_GET_PROTOCOL_TYPE(bcsp) (GET_BITS((bcsp)->flags, 7, 1) ? B= CSP_RELIABLE : BCSP_UNRELIABLE) +#define BCSP_SET_PROTOCOL_TYPE(bcsp, x) SET_BITS((bcsp)->flags, 7, 1, x) =20 #define BCSP_GET_FLAGS(bcsp) ((bcsp)->packet[0]) -#define BCSP_GET_IDENTIFIER(bcsp) ((bcsp)->packet[1] & 0x0f)=20 -#define BCSP_GET_PAYLOAD_LENGTH(bcsp) (((bcsp)->packet[2] << 4) | (((bcsp)= ->packet[1] >> 4) & 0xff)) +#define BCSP_GET_IDENTIFIER(bcsp) ((bcsp)->packet[1] & 0x0F)=20 +#define BCSP_GET_PAYLOAD_LENGTH(bcsp) (((bcsp)->packet[2] << 4) | (((bcsp)= ->packet[1] >> 4) & 0xFF)) #define BCSP_GET_CHECKSUM(bcsp) ((bcsp)->packet[3]) =20 /****************** TYPE DEFINITION SECTION ******************************= ***/ |