Merge "cpplint: fix whitespace/comma" into main (4cfaedf2) · Commits · e / os / android_packages_modules_Bluetooth

system/embdrv/sbc/decoder/include/oi_stddefs.h

+29 −39

Original line number	Diff line number	Diff line
		@@ -39,27 +39,21 @@ extern "C" {
		#endif

		#ifndef FALSE
		#define FALSE 0 /*< This define statement sets FALSE as a preprocessor alias for 0. /
		#define FALSE 0 /* This define statement sets FALSE as a preprocessor alias for 0. */
		#endif

		#ifndef TRUE
		#define TRUE \
		(!FALSE) /**< This define statement sets TRUE as a preprocessor alias for \
		!FALSE. */
		#define TRUE (!FALSE) /* This define statement sets TRUE as a preprocessor alias for !FALSE. */
		#endif

		#ifdef HEW_TOOLCHAIN
		#ifdef NULL
		#undef NULL /*< Override HEW toolchain NULL definition /
		#undef NULL /* Override HEW toolchain NULL definition */
		#endif
		#define NULL \
		0 /*< HEW toolchain does not allow us to compare (void) type to function \
		pointer */
		#define NULL 0 /* HEW toolchain does not allow us to compare (void) type to function pointer /
		#else
		#ifndef NULL
		#define NULL \
		((void)0) /*< This define statement sets NULL as a preprocessor alias \
		for (void)0 /
		#define NULL ((void)0) / This define statement sets NULL as a preprocessor alias for (void)0 /
		#endif
		#endif

		@@ -67,22 +61,18 @@ extern "C" {
		* @name Maximum and minimum values for basic types
		* @{
		*/
		#define OI_INT8_MIN ((int8_t)0x80) /*< decimal value: -128 /
		#define OI_INT8_MAX ((int8_t)0x7F) /*< decimal value: 127 /
		#define OI_INT16_MIN ((int16_t)0x8000) /*< decimal value: -32768 /
		#define OI_INT16_MAX ((int16_t)0x7FFF) /*< decimal value: 32767 /
		#define OI_INT32_MIN \
		((int32_t)0x80000000) /**< decimal value: -2,147,483,648 \
		*/
		#define OI_INT32_MAX \
		((int32_t)0x7FFFFFFF) /**< decimal value: 2,147,483,647 \
		*/
		#define OI_UINT8_MIN ((uint8_t)0) /*< decimal value: 0 /
		#define OI_UINT8_MAX ((uint8_t)0xFF) /*< decimal value: 255 /
		#define OI_UINT16_MIN ((uint16_t)0) /*< decimal value: 0 /
		#define OI_UINT16_MAX ((uint16_t)0xFFFF) /*< decimal value: 65535 /
		#define OI_UINT32_MIN ((uint32_t)0) /*< decimal value: 0 /
		#define OI_UINT32_MAX ((uint32_t)0xFFFFFFFF) /*< decimal value: 4,294,967,295 /
		#define OI_INT8_MIN ((int8_t)0x80) /* decimal value: -128 */
		#define OI_INT8_MAX ((int8_t)0x7F) /* decimal value: 127 */
		#define OI_INT16_MIN ((int16_t)0x8000) /* decimal value: -32768 */
		#define OI_INT16_MAX ((int16_t)0x7FFF) /* decimal value: 32767 */
		#define OI_INT32_MIN ((int32_t)0x80000000) /* decimal value: -2 147 483 648 */
		#define OI_INT32_MAX ((int32_t)0x7FFFFFFF) /* decimal value: 2 147 483 647 */
		#define OI_UINT8_MIN ((uint8_t)0) /* decimal value: 0 */
		#define OI_UINT8_MAX ((uint8_t)0xFF) /* decimal value: 255 */
		#define OI_UINT16_MIN ((uint16_t)0) /* decimal value: 0 */
		#define OI_UINT16_MAX ((uint16_t)0xFFFF) /* decimal value: 65535 */
		#define OI_UINT32_MIN ((uint32_t)0) /* decimal value: 0 */
		#define OI_UINT32_MAX ((uint32_t)0xFFFFFFFF) /* decimal value: 4 294 967 295 */

		/**
		* @}
		@@ -95,8 +85,8 @@ extern "C" {

		/** unsigned 64-bit integer as a structure of two unsigned 32-bit integers */
		typedef struct {
		uint32_t I1; /*< most significant 32 bits /
		uint32_t I2; /*< least significant 32 bits /
		uint32_t I1; /* most significant 32 bits */
		uint32_t I2; /* least significant 32 bits */
		} OI_UINT64;

		#define OI_UINT64_MIN \
		@@ -108,8 +98,8 @@ typedef struct {
		* signed 32-bit integer
		*/
		typedef struct {
		int32_t I1; /*< most significant 32 bits as a signed integer /
		uint32_t I2; /*< least significant 32 bits as an unsigned integer /
		int32_t I1; /* most significant 32 bits as a signed integer */
		uint32_t I2; /* least significant 32 bits as an unsigned integer */
		} OI_INT64;

		#define OI_INT64_MIN \
		@@ -119,10 +109,10 @@ typedef struct {

		/** unsigned 128-bit integer as a structure of four unsigned 32-bit integers */
		typedef struct {
		uint32_t I1; /*< most significant 32 bits /
		uint32_t I2; /*< second-most significant 32 bits /
		uint32_t I3; /*< third-most significant 32 bits /
		uint32_t I4; /*< least significant 32 bits /
		uint32_t I1; /* most significant 32 bits */
		uint32_t I2; /* second-most significant 32 bits */
		uint32_t I3; /* third-most significant 32 bits */
		uint32_t I4; /* least significant 32 bits */
		} OI_UINT128;

		#define OI_UINT128_MIN \
		@@ -133,10 +123,10 @@ typedef struct {
		/* signed 128-bit integer as a structure of three unsigned 32-bit integers and
		* one signed 32-bit integer */
		typedef struct {
		int32_t I1; /*< most significant 32 bits as a signed integer /
		uint32_t I2; /*< second-most significant 32 bits as an unsigned integer /
		uint32_t I3; /*< third-most significant 32 bits as an unsigned integer /
		uint32_t I4; /*< least significant 32 bits as an unsigned integer /
		int32_t I1; /* most significant 32 bits as a signed integer */
		uint32_t I2; /* second-most significant 32 bits as an unsigned integer */
		uint32_t I3; /* third-most significant 32 bits as an unsigned integer */
		uint32_t I4; /* least significant 32 bits as an unsigned integer */
		} OI_INT128;

		#define OI_INT128_MIN \

system/embdrv/sbc/encoder/include/sbc_dct.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,7 @@
		#if (SBC_ARM_ASM_OPT == TRUE)
		#define SBC_MULT_32_16_SIMPLIFIED(s16In2, s32In1, s32OutLow) \
		{ \
		__asm { \
		MUL s32OutLow,(int32_t)s16In2, (s32In1>>15) } \
		__asm { MUL s32OutLow, (int32_t)s16In2, (s32In1>>15) } \
		}
		#else
		#if (SBC_DSP_OPT == TRUE)

system/stack/btm/security_device_record.h

+18 −20

Original line number	Diff line number	Diff line
		@@ -104,8 +104,7 @@ enum tBLE_RAND_ADDR_TYPE : uint8_t {

		class tBTM_BLE_ADDR_INFO {
		public:
		RawAddress pseudo_addr; /* LE pseudo address of the device if different from
		device address */
		RawAddress pseudo_addr; /* LE pseudo address of the device if different from device address */
		public:
		tBLE_ADDR_TYPE AddressType() const { return ble_addr_type_; }
		void SetAddressType(tBLE_ADDR_TYPE ble_addr_type) {
		@@ -354,8 +353,7 @@ public:
		uint16_t hci_handle; /* Handle to BR/EDR ACL connection when exists */
		uint16_t ble_hci_handle; /* use in DUMO connection */

		uint16_t suggested_tx_octets; /* Recently suggested tx octets for data length
		extension */
		uint16_t suggested_tx_octets; /* Recently suggested tx octets for data length extension */
		uint16_t clock_offset; /* Latest known clock offset */

		// whether the peer device can read GAP characteristics only visible in

system/stack/include/btm_ble_sec_api_types.h

+6 −9

Original line number	Diff line number	Diff line
		@@ -69,8 +69,7 @@ typedef union {
		tBTM_LE_PENC_KEYS penc_key; /* received peer encryption key */
		tBTM_LE_PCSRK_KEYS pcsrk_key; /* received peer device SRK */
		tBTM_LE_PID_KEYS pid_key; /* peer device ID key */
		tBTM_LE_LENC_KEYS lenc_key; /* local encryption reproduction keys
		* LTK = = d1(ER,DIV,0) */
		tBTM_LE_LENC_KEYS lenc_key; /* local encryption reproduction keys LTK = = d1(ER, DIV, 0) */
		tBTM_LE_LCSRK_KEYS lcsrk_key; /* local device CSRK = d1(ER,DIV,1)*/
		} tBTM_LE_KEY_VALUE;

		@@ -83,9 +82,7 @@ typedef union {
		tBTM_LE_IO_REQ io_req; /* BTM_LE_IO_REQ_EVT */
		uint32_t key_notif; /* BTM_LE_KEY_NOTIF_EVT */
		/* BTM_LE_NC_REQ_EVT */
		/* no callback data for
		* BTM_LE_KEY_REQ_EVT
		* and BTM_LE_OOB_REQ_EVT */
		/* no callback data for BTM_LE_KEY_REQ_EVT and BTM_LE_OOB_REQ_EVT */
		tBTM_LE_COMPLT complt; /* BTM_LE_COMPLT_EVT */
		tSMP_OOB_DATA_TYPE req_oob_type;
		tBTM_LE_KEY key;

system/bta/le_audio/storage_helper_test.cc

+61 −61

File changed.

Contains only whitespace changes.