Commit a80d2c54 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: MGMT: Use BIT macro when defining bitfields 



This makes use of BIT macro when defining bitfields which makes it
clearer what bit it is toggling.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent fd84c569

include/net/bluetooth/mgmt.h

+40 −40
Original line number Diff line number Diff line
@@ -91,26 +91,26 @@ struct mgmt_rp_read_index_list { 
#define MGMT_MAX_NAME_LENGTH		(HCI_MAX_NAME_LENGTH + 1)

#define MGMT_MAX_SHORT_NAME_LENGTH	(HCI_MAX_SHORT_NAME_LENGTH + 1)



#define MGMT_SETTING_POWERED		0x00000001

#define MGMT_SETTING_CONNECTABLE	0x00000002

#define MGMT_SETTING_FAST_CONNECTABLE	0x00000004

#define MGMT_SETTING_DISCOVERABLE	0x00000008

#define MGMT_SETTING_BONDABLE		0x00000010

#define MGMT_SETTING_LINK_SECURITY	0x00000020

#define MGMT_SETTING_SSP		0x00000040

#define MGMT_SETTING_BREDR		0x00000080

#define MGMT_SETTING_HS			0x00000100

#define MGMT_SETTING_LE			0x00000200

#define MGMT_SETTING_ADVERTISING	0x00000400

#define MGMT_SETTING_SECURE_CONN	0x00000800

#define MGMT_SETTING_DEBUG_KEYS		0x00001000

#define MGMT_SETTING_PRIVACY		0x00002000

#define MGMT_SETTING_CONFIGURATION	0x00004000

#define MGMT_SETTING_STATIC_ADDRESS	0x00008000

#define MGMT_SETTING_PHY_CONFIGURATION	0x00010000

#define MGMT_SETTING_WIDEBAND_SPEECH	0x00020000

#define MGMT_SETTING_CIS_CENTRAL	0x00040000

#define MGMT_SETTING_CIS_PERIPHERAL	0x00080000

#define MGMT_SETTING_POWERED		BIT(0)

#define MGMT_SETTING_CONNECTABLE	BIT(1)

#define MGMT_SETTING_FAST_CONNECTABLE	BIT(2)

#define MGMT_SETTING_DISCOVERABLE	BIT(3)

#define MGMT_SETTING_BONDABLE		BIT(4)

#define MGMT_SETTING_LINK_SECURITY	BIT(5)

#define MGMT_SETTING_SSP		BIT(6)

#define MGMT_SETTING_BREDR		BIT(7)

#define MGMT_SETTING_HS			BIT(8)

#define MGMT_SETTING_LE			BIT(9)

#define MGMT_SETTING_ADVERTISING	BIT(10)

#define MGMT_SETTING_SECURE_CONN	BIT(11)

#define MGMT_SETTING_DEBUG_KEYS		BIT(12)

#define MGMT_SETTING_PRIVACY		BIT(13)

#define MGMT_SETTING_CONFIGURATION	BIT(14)

#define MGMT_SETTING_STATIC_ADDRESS	BIT(15)

#define MGMT_SETTING_PHY_CONFIGURATION	BIT(16)

#define MGMT_SETTING_WIDEBAND_SPEECH	BIT(17)

#define MGMT_SETTING_CIS_CENTRAL	BIT(18)

#define MGMT_SETTING_CIS_PERIPHERAL	BIT(19)



#define MGMT_OP_READ_INFO		0x0004

#define MGMT_READ_INFO_SIZE		0
@@ -635,21 +635,21 @@ struct mgmt_rp_get_phy_configuration { 
} __packed;

#define MGMT_GET_PHY_CONFIGURATION_SIZE	0



#define MGMT_PHY_BR_1M_1SLOT	0x00000001

#define MGMT_PHY_BR_1M_3SLOT	0x00000002

#define MGMT_PHY_BR_1M_5SLOT	0x00000004

#define MGMT_PHY_EDR_2M_1SLOT	0x00000008

#define MGMT_PHY_EDR_2M_3SLOT	0x00000010

#define MGMT_PHY_EDR_2M_5SLOT	0x00000020

#define MGMT_PHY_EDR_3M_1SLOT	0x00000040

#define MGMT_PHY_EDR_3M_3SLOT	0x00000080

#define MGMT_PHY_EDR_3M_5SLOT	0x00000100

#define MGMT_PHY_LE_1M_TX		0x00000200

#define MGMT_PHY_LE_1M_RX		0x00000400

#define MGMT_PHY_LE_2M_TX		0x00000800

#define MGMT_PHY_LE_2M_RX		0x00001000

#define MGMT_PHY_LE_CODED_TX	0x00002000

#define MGMT_PHY_LE_CODED_RX	0x00004000

#define MGMT_PHY_BR_1M_1SLOT		BIT(0)

#define MGMT_PHY_BR_1M_3SLOT		BIT(1)

#define MGMT_PHY_BR_1M_5SLOT		BIT(2)

#define MGMT_PHY_EDR_2M_1SLOT		BIT(3)

#define MGMT_PHY_EDR_2M_3SLOT		BIT(4)

#define MGMT_PHY_EDR_2M_5SLOT		BIT(5)

#define MGMT_PHY_EDR_3M_1SLOT		BIT(6)

#define MGMT_PHY_EDR_3M_3SLOT		BIT(7)

#define MGMT_PHY_EDR_3M_5SLOT		BIT(8)

#define MGMT_PHY_LE_1M_TX		BIT(9)

#define MGMT_PHY_LE_1M_RX		BIT(10)

#define MGMT_PHY_LE_2M_TX		BIT(11)

#define MGMT_PHY_LE_2M_RX		BIT(12)

#define MGMT_PHY_LE_CODED_TX		BIT(13)

#define MGMT_PHY_LE_CODED_RX		BIT(14)



#define MGMT_PHY_BREDR_MASK (MGMT_PHY_BR_1M_1SLOT | MGMT_PHY_BR_1M_3SLOT | \

			     MGMT_PHY_BR_1M_5SLOT | MGMT_PHY_EDR_2M_1SLOT | \
@@ -974,11 +974,11 @@ struct mgmt_ev_auth_failed { 
	__u8	status;

} __packed;



#define MGMT_DEV_FOUND_CONFIRM_NAME		0x01

#define MGMT_DEV_FOUND_LEGACY_PAIRING		0x02

#define MGMT_DEV_FOUND_NOT_CONNECTABLE		0x04

#define MGMT_DEV_FOUND_INITIATED_CONN		0x08

#define MGMT_DEV_FOUND_NAME_REQUEST_FAILED	0x10

#define MGMT_DEV_FOUND_CONFIRM_NAME		BIT(0)

#define MGMT_DEV_FOUND_LEGACY_PAIRING		BIT(1)

#define MGMT_DEV_FOUND_NOT_CONNECTABLE		BIT(2)

#define MGMT_DEV_FOUND_INITIATED_CONN		BIT(3)

#define MGMT_DEV_FOUND_NAME_REQUEST_FAILED	BIT(4)



#define MGMT_EV_DEVICE_FOUND		0x0012

struct mgmt_ev_device_found {