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

Commit 32748db0 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: Move Extended Inquiry Response defines to hci.h 



The EIR defines are needed also outside of mgmt.c (e.g. in hci_event.c
to check if EIR data has the complete name) so it's better to have them
in a single public place, i.e. hci.h.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b57c1a56

include/net/bluetooth/hci.h

+13 −0
Original line number Diff line number Diff line
@@ -284,6 +284,19 @@ enum { 
#define HCI_FLOW_CTL_MODE_PACKET_BASED	0x00

#define HCI_FLOW_CTL_MODE_BLOCK_BASED	0x01



/* Extended Inquiry Response field types */

#define EIR_FLAGS		0x01 /* flags */

#define EIR_UUID16_SOME		0x02 /* 16-bit UUID, more available */

#define EIR_UUID16_ALL		0x03 /* 16-bit UUID, all listed */

#define EIR_UUID32_SOME		0x04 /* 32-bit UUID, more available */

#define EIR_UUID32_ALL		0x05 /* 32-bit UUID, all listed */

#define EIR_UUID128_SOME	0x06 /* 128-bit UUID, more available */

#define EIR_UUID128_ALL		0x07 /* 128-bit UUID, all listed */

#define EIR_NAME_SHORT		0x08 /* shortened local name */

#define EIR_NAME_COMPLETE	0x09 /* complete local name */

#define EIR_TX_POWER		0x0A /* transmit power level */

#define EIR_DEVICE_ID		0x10 /* device ID */



/* -----  HCI Commands ---- */

#define HCI_OP_NOP			0x0000

net/bluetooth/mgmt.c

+0 −12
Original line number Diff line number Diff line
@@ -303,18 +303,6 @@ static u32 get_current_settings(struct hci_dev *hdev) 
	return settings;

}



#define EIR_FLAGS		0x01 /* flags */

#define EIR_UUID16_SOME		0x02 /* 16-bit UUID, more available */

#define EIR_UUID16_ALL		0x03 /* 16-bit UUID, all listed */

#define EIR_UUID32_SOME		0x04 /* 32-bit UUID, more available */

#define EIR_UUID32_ALL		0x05 /* 32-bit UUID, all listed */

#define EIR_UUID128_SOME	0x06 /* 128-bit UUID, more available */

#define EIR_UUID128_ALL		0x07 /* 128-bit UUID, all listed */

#define EIR_NAME_SHORT		0x08 /* shortened local name */

#define EIR_NAME_COMPLETE	0x09 /* complete local name */

#define EIR_TX_POWER		0x0A /* transmit power level */

#define EIR_DEVICE_ID		0x10 /* device ID */



#define PNP_INFO_SVCLASS_ID		0x1200



static u8 bluetooth_base_uuid[] = {