diff options
author | Matthew Xie <mattx@google.com> | 2012-09-18 16:19:52 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 16:19:53 -0700 |
commit | f80d3d045eab5f002be4b5e8a3d2d376fdf7581a (patch) | |
tree | 4a1f17241e1af019e8d3328852bf93423258a23c /stack/include/rfcdefs.h | |
parent | d659d3ca8cbb1edc5d1dd42ef367e9336f0f269b (diff) | |
parent | ad2d45b15aae80ba254277c3d1fa036207d8b926 (diff) | |
download | external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.zip external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.tar.gz external_bluetooth_bluedroid-f80d3d045eab5f002be4b5e8a3d2d376fdf7581a.tar.bz2 |
Merge "Revert "Header file and whitespace cleanups"" into jb-mr1-dev
Diffstat (limited to 'stack/include/rfcdefs.h')
-rw-r--r-- | stack/include/rfcdefs.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/stack/include/rfcdefs.h b/stack/include/rfcdefs.h index 98ab965..4dacda1 100644 --- a/stack/include/rfcdefs.h +++ b/stack/include/rfcdefs.h @@ -16,7 +16,7 @@ #define PORT_MAX_RFC_PORTS 31 /* -** If nothing is negotiated MTU should be 127 +** If nothing is negotiated MTU should be 127 */ #define RFCOMM_DEFAULT_MTU 127 @@ -86,10 +86,10 @@ } #define RFCOMM_FRAME_IS_CMD(initiator, cr) \ - (( (initiator) && !(cr)) || (!(initiator) && (cr))) + (( (initiator) && !(cr)) || (!(initiator) && (cr))) #define RFCOMM_FRAME_IS_RSP(initiator, cr) \ - (( (initiator) && (cr)) || (!(initiator) && !(cr))) + (( (initiator) && (cr)) || (!(initiator) && !(cr))) #define RFCOMM_CR(initiator, is_command) \ (( ( (initiator) && (is_command)) \ @@ -129,9 +129,9 @@ #define RFCOMM_MSC_RTR 0x08 /* Ready to receive*/ #define RFCOMM_MSC_IC 0x40 /* Incomming call indicator*/ #define RFCOMM_MSC_DV 0x80 /* Data Valid*/ - -#define RFCOMM_MSC_SHIFT_BREAK 4 -#define RFCOMM_MSC_BREAK_MASK 0xF0 + +#define RFCOMM_MSC_SHIFT_BREAK 4 +#define RFCOMM_MSC_BREAK_MASK 0xF0 #define RFCOMM_MSC_BREAK_PRESENT_MASK 0x02 #define RFCOMM_BAUD_RATE_2400 0x00 @@ -143,26 +143,26 @@ #define RFCOMM_BAUD_RATE_57600 0x06 #define RFCOMM_BAUD_RATE_115200 0x07 #define RFCOMM_BAUD_RATE_230400 0x08 - + #define RFCOMM_5_BITS 0x00 #define RFCOMM_6_BITS 0x01 #define RFCOMM_7_BITS 0x02 #define RFCOMM_8_BITS 0x03 - + #define RFCOMM_RPN_BITS_MASK 0x03 #define RFCOMM_RPN_BITS_SHIFT 0 - + #define RFCOMM_ONESTOPBIT 0x00 #define RFCOMM_ONE5STOPBITS 0x01 - + #define RFCOMM_RPN_STOP_BITS_MASK 0x01 #define RFCOMM_RPN_STOP_BITS_SHIFT 2 - + #define RFCOMM_PARITY_NO 0x00 #define RFCOMM_PARITY_YES 0x01 #define RFCOMM_RPN_PARITY_MASK 0x01 #define RFCOMM_RPN_PARITY_SHIFT 3 - + #define RFCOMM_ODD_PARITY 0x00 #define RFCOMM_EVEN_PARITY 0x01 #define RFCOMM_MARK_PARITY 0x02 |