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

Commit a9de9248 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

[Bluetooth] Switch from OGF+OCF to using only opcodes 



The Bluetooth HCI commands are divided into logical OGF groups for
easier identification of their purposes. While this still makes sense
for the written specification, its makes the code only more complex
and harder to read. So instead of using separate OGF and OCF values
to identify the commands, use a common 16-bit opcode that combines
both values. As a side effect this also reduces the complexity of
OGF and OCF calculations during command header parsing.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 55b70a03

drivers/bluetooth/hci_bcsp.c

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data, 
	if (hciextn && chan == 5) {

		struct hci_command_hdr *hdr = (struct hci_command_hdr *) data;



		if (hci_opcode_ogf(__le16_to_cpu(hdr->opcode)) == OGF_VENDOR_CMD) {

		/* Vendor specific commands */

		if (hci_opcode_ogf(__le16_to_cpu(hdr->opcode)) == 0x3f) {

			u8 desc = *(data + HCI_COMMAND_HDR_SIZE);

			if ((desc & 0xf0) == 0xc0) {

				data += HCI_COMMAND_HDR_SIZE + 1;

include/net/bluetooth/hci.h

+351 −253
Original line number Diff line number Diff line
@@ -200,119 +200,18 @@ enum { 
#define HCI_LM_SECURE	0x0020



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

/* OGF & OCF values */



/* Informational Parameters */

#define OGF_INFO_PARAM	0x04



#define OCF_READ_LOCAL_VERSION	0x0001

struct hci_rp_read_loc_version {

	__u8     status;

	__u8     hci_ver;

	__le16   hci_rev;

	__u8     lmp_ver;

	__le16   manufacturer;

	__le16   lmp_subver;

} __attribute__ ((packed));



#define OCF_READ_LOCAL_FEATURES	0x0003

struct hci_rp_read_local_features {

	__u8 status;

	__u8 features[8];

} __attribute__ ((packed));



#define OCF_READ_BUFFER_SIZE	0x0005

struct hci_rp_read_buffer_size {

	__u8     status;

	__le16   acl_mtu;

	__u8     sco_mtu;

	__le16   acl_max_pkt;

	__le16   sco_max_pkt;

} __attribute__ ((packed));



#define OCF_READ_BD_ADDR	0x0009

struct hci_rp_read_bd_addr {

	__u8     status;

	bdaddr_t bdaddr;

} __attribute__ ((packed));



/* Host Controller and Baseband */

#define OGF_HOST_CTL	0x03

#define OCF_RESET		0x0003

#define OCF_READ_AUTH_ENABLE	0x001F

#define OCF_WRITE_AUTH_ENABLE	0x0020

	#define AUTH_DISABLED		0x00

	#define AUTH_ENABLED		0x01



#define OCF_READ_ENCRYPT_MODE	0x0021

#define OCF_WRITE_ENCRYPT_MODE	0x0022

	#define ENCRYPT_DISABLED	0x00

	#define ENCRYPT_P2P		0x01

	#define ENCRYPT_BOTH		0x02



#define OCF_WRITE_CA_TIMEOUT  	0x0016	

#define OCF_WRITE_PG_TIMEOUT  	0x0018



#define OCF_WRITE_SCAN_ENABLE 	0x001A

	#define SCAN_DISABLED		0x00

	#define SCAN_INQUIRY		0x01

	#define SCAN_PAGE		0x02



#define OCF_SET_EVENT_FLT	0x0005

struct hci_cp_set_event_flt {

	__u8     flt_type;

	__u8     cond_type;

	__u8     condition[0];

} __attribute__ ((packed));



/* Filter types */

#define HCI_FLT_CLEAR_ALL	0x00

#define HCI_FLT_INQ_RESULT	0x01

#define HCI_FLT_CONN_SETUP	0x02



/* CONN_SETUP Condition types */

#define HCI_CONN_SETUP_ALLOW_ALL	0x00

#define HCI_CONN_SETUP_ALLOW_CLASS	0x01

#define HCI_CONN_SETUP_ALLOW_BDADDR	0x02



/* CONN_SETUP Conditions */

#define HCI_CONN_SETUP_AUTO_OFF	0x01

#define HCI_CONN_SETUP_AUTO_ON	0x02



#define OCF_READ_CLASS_OF_DEV	0x0023

struct hci_rp_read_dev_class {

	__u8     status;

	__u8     dev_class[3];

} __attribute__ ((packed));



#define OCF_WRITE_CLASS_OF_DEV	0x0024

struct hci_cp_write_dev_class {

	__u8     dev_class[3];

} __attribute__ ((packed));



#define OCF_READ_VOICE_SETTING	0x0025

struct hci_rp_read_voice_setting {

	__u8     status;

	__le16   voice_setting;

} __attribute__ ((packed));



#define OCF_WRITE_VOICE_SETTING	0x0026

struct hci_cp_write_voice_setting {

	__le16   voice_setting;

#define HCI_OP_INQUIRY			0x0401

struct hci_cp_inquiry {

	__u8     lap[3];

	__u8     length;

	__u8     num_rsp;

} __attribute__ ((packed));



#define OCF_HOST_BUFFER_SIZE	0x0033

struct hci_cp_host_buffer_size {

	__le16   acl_mtu;

	__u8     sco_mtu;

	__le16   acl_max_pkt;

	__le16   sco_max_pkt;

} __attribute__ ((packed));

#define HCI_OP_INQUIRY_CANCEL		0x0402



/* Link Control */

#define OGF_LINK_CTL	0x01 

#define HCI_OP_EXIT_PERIODIC_INQ	0x0404



#define OCF_CREATE_CONN		0x0005

#define HCI_OP_CREATE_CONN		0x0405

struct hci_cp_create_conn {

	bdaddr_t bdaddr;

	__le16   pkt_type;
@@ -322,105 +221,138 @@ struct hci_cp_create_conn { 
	__u8     role_switch;

} __attribute__ ((packed));



#define OCF_CREATE_CONN_CANCEL	0x0008

struct hci_cp_create_conn_cancel {

	bdaddr_t bdaddr;

} __attribute__ ((packed));



#define OCF_ACCEPT_CONN_REQ	0x0009

struct hci_cp_accept_conn_req {

	bdaddr_t bdaddr;

	__u8     role;

} __attribute__ ((packed));



#define OCF_REJECT_CONN_REQ	0x000a

struct hci_cp_reject_conn_req {

	bdaddr_t bdaddr;

	__u8     reason;

} __attribute__ ((packed));



#define OCF_DISCONNECT	0x0006

#define HCI_OP_DISCONNECT		0x0406

struct hci_cp_disconnect {

	__le16   handle;

	__u8     reason;

} __attribute__ ((packed));



#define OCF_ADD_SCO	0x0007

#define HCI_OP_ADD_SCO			0x0407

struct hci_cp_add_sco {

	__le16   handle;

	__le16   pkt_type;

} __attribute__ ((packed));



#define OCF_INQUIRY		0x0001

struct hci_cp_inquiry {

	__u8     lap[3];

	__u8     length;

	__u8     num_rsp;

#define HCI_OP_CREATE_CONN_CANCEL	0x0408

struct hci_cp_create_conn_cancel {

	bdaddr_t bdaddr;

} __attribute__ ((packed));



#define OCF_INQUIRY_CANCEL	0x0002

#define HCI_OP_ACCEPT_CONN_REQ		0x0409

struct hci_cp_accept_conn_req {

	bdaddr_t bdaddr;

	__u8     role;

} __attribute__ ((packed));



#define OCF_EXIT_PERIODIC_INQ	0x0004

#define HCI_OP_REJECT_CONN_REQ		0x040a

struct hci_cp_reject_conn_req {

	bdaddr_t bdaddr;

	__u8     reason;

} __attribute__ ((packed));



#define OCF_LINK_KEY_REPLY	0x000B

#define HCI_OP_LINK_KEY_REPLY		0x040b

struct hci_cp_link_key_reply {

	bdaddr_t bdaddr;

	__u8     link_key[16];

} __attribute__ ((packed));



#define OCF_LINK_KEY_NEG_REPLY	0x000C

#define HCI_OP_LINK_KEY_NEG_REPLY	0x040c

struct hci_cp_link_key_neg_reply {

	bdaddr_t bdaddr;

} __attribute__ ((packed));



#define OCF_PIN_CODE_REPLY	0x000D

#define HCI_OP_PIN_CODE_REPLY		0x040d

struct hci_cp_pin_code_reply {

	bdaddr_t bdaddr;

	__u8     pin_len;

	__u8     pin_code[16];

} __attribute__ ((packed));



#define OCF_PIN_CODE_NEG_REPLY	0x000E

#define HCI_OP_PIN_CODE_NEG_REPLY	0x040e

struct hci_cp_pin_code_neg_reply {

	bdaddr_t bdaddr;

} __attribute__ ((packed));



#define OCF_CHANGE_CONN_PTYPE	0x000F

#define HCI_OP_CHANGE_CONN_PTYPE	0x040f

struct hci_cp_change_conn_ptype {

	__le16   handle;

	__le16   pkt_type;

} __attribute__ ((packed));



#define OCF_AUTH_REQUESTED	0x0011

#define HCI_OP_AUTH_REQUESTED		0x0411

struct hci_cp_auth_requested {

	__le16   handle;

} __attribute__ ((packed));



#define OCF_SET_CONN_ENCRYPT	0x0013

#define HCI_OP_SET_CONN_ENCRYPT		0x0413

struct hci_cp_set_conn_encrypt {

	__le16   handle;

	__u8     encrypt;

} __attribute__ ((packed));



#define OCF_CHANGE_CONN_LINK_KEY 0x0015

#define HCI_OP_CHANGE_CONN_LINK_KEY	0x0415

struct hci_cp_change_conn_link_key {

	__le16   handle;

} __attribute__ ((packed));



#define OCF_READ_REMOTE_FEATURES 0x001B

#define HCI_OP_REMOTE_NAME_REQ		0x0419

struct hci_cp_remote_name_req {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_mode;

	__le16   clock_offset;

} __attribute__ ((packed));



#define HCI_OP_REMOTE_NAME_REQ_CANCEL	0x041a

struct hci_cp_remote_name_req_cancel {

	bdaddr_t bdaddr;

} __attribute__ ((packed));



#define HCI_OP_READ_REMOTE_FEATURES	0x041b

struct hci_cp_read_remote_features {

	__le16   handle;

} __attribute__ ((packed));



#define OCF_READ_REMOTE_VERSION 0x001D

#define HCI_OP_READ_REMOTE_EXT_FEATURES	0x041c

struct hci_cp_read_remote_ext_features {

	__le16   handle;

	__u8     page;

} __attribute__ ((packed));



#define HCI_OP_READ_REMOTE_VERSION	0x041d

struct hci_cp_read_remote_version {

	__le16   handle;

} __attribute__ ((packed));



/* Link Policy */

#define OGF_LINK_POLICY	0x02   

#define HCI_OP_SETUP_SYNC_CONN		0x0428

struct hci_cp_setup_sync_conn {

	__le16   handle;

	__le32   tx_bandwidth;

	__le32   rx_bandwidth;

	__le16   max_latency;

	__le16   voice_setting;

	__u8     retrans_effort;

	__le16   pkt_type;

} __attribute__ ((packed));



#define HCI_OP_ACCEPT_SYNC_CONN_REQ	0x0429

struct hci_cp_accept_sync_conn_req {

	bdaddr_t bdaddr;

	__le32   tx_bandwidth;

	__le32   rx_bandwidth;

	__le16   max_latency;

	__le16   content_format;

	__u8     retrans_effort;

	__le16   pkt_type;

} __attribute__ ((packed));



#define HCI_OP_REJECT_SYNC_CONN_REQ	0x042a

struct hci_cp_reject_sync_conn_req {

	bdaddr_t bdaddr;

	__u8     reason;

} __attribute__ ((packed));



#define OCF_SNIFF_MODE		0x0003

#define HCI_OP_SNIFF_MODE		0x0803

struct hci_cp_sniff_mode {

	__le16   handle;

	__le16   max_interval;
@@ -429,12 +361,12 @@ struct hci_cp_sniff_mode { 
	__le16   timeout;

} __attribute__ ((packed));



#define OCF_EXIT_SNIFF_MODE	0x0004

#define HCI_OP_EXIT_SNIFF_MODE		0x0804

struct hci_cp_exit_sniff_mode {

	__le16   handle;

} __attribute__ ((packed));



#define OCF_ROLE_DISCOVERY	0x0009

#define HCI_OP_ROLE_DISCOVERY		0x0809

struct hci_cp_role_discovery {

	__le16   handle;

} __attribute__ ((packed));
@@ -444,7 +376,13 @@ struct hci_rp_role_discovery { 
	__u8     role;

} __attribute__ ((packed));



#define OCF_READ_LINK_POLICY	0x000C

#define HCI_OP_SWITCH_ROLE		0x080b

struct hci_cp_switch_role {

	bdaddr_t bdaddr;

	__u8     role;

} __attribute__ ((packed));



#define HCI_OP_READ_LINK_POLICY		0x080c

struct hci_cp_read_link_policy {

	__le16   handle;

} __attribute__ ((packed));
@@ -454,13 +392,7 @@ struct hci_rp_read_link_policy { 
	__le16   policy;

} __attribute__ ((packed));



#define OCF_SWITCH_ROLE		0x000B

struct hci_cp_switch_role {

	bdaddr_t bdaddr;

	__u8     role;

} __attribute__ ((packed));



#define OCF_WRITE_LINK_POLICY	0x000D

#define HCI_OP_WRITE_LINK_POLICY	0x080d

struct hci_cp_write_link_policy {

	__le16   handle;

	__le16   policy;
@@ -470,7 +402,7 @@ struct hci_rp_write_link_policy { 
	__le16   handle;

} __attribute__ ((packed));



#define OCF_SNIFF_SUBRATE	0x0011

#define HCI_OP_SNIFF_SUBRATE		0x0811

struct hci_cp_sniff_subrate {

	__le16   handle;

	__le16   max_latency;
@@ -478,56 +410,153 @@ struct hci_cp_sniff_subrate { 
	__le16   min_local_timeout;

} __attribute__ ((packed));



/* Status params */

#define OGF_STATUS_PARAM	0x05

#define HCI_OP_SET_EVENT_MASK		0x0c01

struct hci_cp_set_event_mask {

	__u8     mask[8];

} __attribute__ ((packed));



#define HCI_OP_RESET			0x0c03



#define HCI_OP_SET_EVENT_FLT		0x0c05

struct hci_cp_set_event_flt {

	__u8     flt_type;

	__u8     cond_type;

	__u8     condition[0];

} __attribute__ ((packed));



/* Testing commands */

#define OGF_TESTING_CMD		0x3E

/* Filter types */

#define HCI_FLT_CLEAR_ALL	0x00

#define HCI_FLT_INQ_RESULT	0x01

#define HCI_FLT_CONN_SETUP	0x02



/* Vendor specific commands */

#define OGF_VENDOR_CMD		0x3F

/* CONN_SETUP Condition types */

#define HCI_CONN_SETUP_ALLOW_ALL	0x00

#define HCI_CONN_SETUP_ALLOW_CLASS	0x01

#define HCI_CONN_SETUP_ALLOW_BDADDR	0x02



/* ---- HCI Events ---- */

#define HCI_EV_INQUIRY_COMPLETE	0x01

/* CONN_SETUP Conditions */

#define HCI_CONN_SETUP_AUTO_OFF	0x01

#define HCI_CONN_SETUP_AUTO_ON	0x02



#define HCI_EV_INQUIRY_RESULT	0x02

struct inquiry_info {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

	__u8     pscan_mode;

#define HCI_OP_WRITE_LOCAL_NAME		0x0c13

struct hci_cp_write_local_name {

	__u8     name[248];

} __attribute__ ((packed));



#define HCI_OP_READ_LOCAL_NAME		0x0c14

struct hci_rp_read_local_name {

	__u8     status;

	__u8     name[248];

} __attribute__ ((packed));



#define HCI_OP_WRITE_CA_TIMEOUT		0x0c16



#define HCI_OP_WRITE_PG_TIMEOUT		0x0c18



#define HCI_OP_WRITE_SCAN_ENABLE 	0x0c1a

	#define SCAN_DISABLED		0x00

	#define SCAN_INQUIRY		0x01

	#define SCAN_PAGE		0x02



#define HCI_OP_READ_AUTH_ENABLE		0x0c1f



#define HCI_OP_WRITE_AUTH_ENABLE	0x0c20

	#define AUTH_DISABLED		0x00

	#define AUTH_ENABLED		0x01



#define HCI_OP_READ_ENCRYPT_MODE	0x0c21



#define HCI_OP_WRITE_ENCRYPT_MODE	0x0c22

	#define ENCRYPT_DISABLED	0x00

	#define ENCRYPT_P2P		0x01

	#define ENCRYPT_BOTH		0x02



#define HCI_OP_READ_CLASS_OF_DEV	0x0c23

struct hci_rp_read_class_of_dev {

	__u8     status;

	__u8     dev_class[3];

	__le16   clock_offset;

} __attribute__ ((packed));



#define HCI_EV_INQUIRY_RESULT_WITH_RSSI	0x22

struct inquiry_info_with_rssi {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

#define HCI_OP_WRITE_CLASS_OF_DEV	0x0c24

struct hci_cp_write_class_of_dev {

	__u8     dev_class[3];

	__le16   clock_offset;

	__s8     rssi;

} __attribute__ ((packed));

struct inquiry_info_with_rssi_and_pscan_mode {



#define HCI_OP_READ_VOICE_SETTING	0x0c25

struct hci_rp_read_voice_setting {

	__u8     status;

	__le16   voice_setting;

} __attribute__ ((packed));



#define HCI_OP_WRITE_VOICE_SETTING	0x0c26

struct hci_cp_write_voice_setting {

	__le16   voice_setting;

} __attribute__ ((packed));



#define HCI_OP_HOST_BUFFER_SIZE		0x0c33

struct hci_cp_host_buffer_size {

	__le16   acl_mtu;

	__u8     sco_mtu;

	__le16   acl_max_pkt;

	__le16   sco_max_pkt;

} __attribute__ ((packed));



#define HCI_OP_READ_LOCAL_VERSION	0x1001

struct hci_rp_read_local_version {

	__u8     status;

	__u8     hci_ver;

	__le16   hci_rev;

	__u8     lmp_ver;

	__le16   manufacturer;

	__le16   lmp_subver;

} __attribute__ ((packed));



#define HCI_OP_READ_LOCAL_COMMANDS	0x1002

struct hci_rp_read_local_commands {

	__u8     status;

	__u8     commands[64];

} __attribute__ ((packed));



#define HCI_OP_READ_LOCAL_FEATURES	0x1003

struct hci_rp_read_local_features {

	__u8     status;

	__u8     features[8];

} __attribute__ ((packed));



#define HCI_OP_READ_LOCAL_EXT_FEATURES	0x1004

struct hci_rp_read_local_ext_features {

	__u8     status;

	__u8     page;

	__u8     max_page;

	__u8     features[8];

} __attribute__ ((packed));



#define HCI_OP_READ_BUFFER_SIZE		0x1005

struct hci_rp_read_buffer_size {

	__u8     status;

	__le16   acl_mtu;

	__u8     sco_mtu;

	__le16   acl_max_pkt;

	__le16   sco_max_pkt;

} __attribute__ ((packed));



#define HCI_OP_READ_BD_ADDR		0x1009

struct hci_rp_read_bd_addr {

	__u8     status;

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

	__u8     pscan_mode;

	__u8     dev_class[3];

	__le16   clock_offset;

	__s8     rssi;

} __attribute__ ((packed));



#define HCI_EV_EXTENDED_INQUIRY_RESULT	0x2F

struct extended_inquiry_info {

/* ---- HCI Events ---- */

#define HCI_EV_INQUIRY_COMPLETE		0x01



#define HCI_EV_INQUIRY_RESULT		0x02

struct inquiry_info {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

	__u8     pscan_mode;

	__u8     dev_class[3];

	__le16   clock_offset;

	__s8     rssi;

	__u8     data[240];

} __attribute__ ((packed));



#define HCI_EV_CONN_COMPLETE		0x03
@@ -559,6 +588,13 @@ struct hci_ev_auth_complete { 
	__le16   handle;

} __attribute__ ((packed));



#define HCI_EV_REMOTE_NAME		0x07

struct hci_ev_remote_name {

	__u8     status;

	bdaddr_t bdaddr;

	__u8     name[248];

} __attribute__ ((packed));



#define HCI_EV_ENCRYPT_CHANGE		0x08

struct hci_ev_encrypt_change {

	__u8     status;
@@ -566,13 +602,29 @@ struct hci_ev_encrypt_change { 
	__u8     encrypt;

} __attribute__ ((packed));



#define HCI_EV_CHANGE_CONN_LINK_KEY_COMPLETE	0x09

struct hci_ev_change_conn_link_key_complete {

#define HCI_EV_CHANGE_LINK_KEY_COMPLETE	0x09

struct hci_ev_change_link_key_complete {

	__u8     status;

	__le16   handle;

} __attribute__ ((packed));



#define HCI_EV_REMOTE_FEATURES		0x0b

struct hci_ev_remote_features {

	__u8     status;

	__le16   handle;

	__u8     features[8];

} __attribute__ ((packed));



#define HCI_EV_QOS_SETUP_COMPLETE	0x0D

#define HCI_EV_REMOTE_VERSION		0x0c

struct hci_ev_remote_version {

	__u8     status;

	__le16   handle;

	__u8     lmp_ver;

	__le16   manufacturer;

	__le16   lmp_subver;

} __attribute__ ((packed));



#define HCI_EV_QOS_SETUP_COMPLETE	0x0d

struct hci_qos {

	__u8     service_type;

	__u32    token_rate;
@@ -586,25 +638,19 @@ struct hci_ev_qos_setup_complete { 
	struct   hci_qos qos;

} __attribute__ ((packed));



#define HCI_EV_CMD_COMPLETE 	0x0E

#define HCI_EV_CMD_COMPLETE		0x0e

struct hci_ev_cmd_complete {

	__u8     ncmd;

	__le16   opcode;

} __attribute__ ((packed));



#define HCI_EV_CMD_STATUS 	0x0F

#define HCI_EV_CMD_STATUS		0x0f

struct hci_ev_cmd_status {

	__u8     status;

	__u8     ncmd;

	__le16   opcode;

} __attribute__ ((packed));



#define HCI_EV_NUM_COMP_PKTS	0x13

struct hci_ev_num_comp_pkts {

	__u8     num_hndl;

	/* variable length part */

} __attribute__ ((packed));



#define HCI_EV_ROLE_CHANGE		0x12

struct hci_ev_role_change {

	__u8     status;
@@ -612,6 +658,12 @@ struct hci_ev_role_change { 
	__u8     role;

} __attribute__ ((packed));



#define HCI_EV_NUM_COMP_PKTS		0x13

struct hci_ev_num_comp_pkts {

	__u8     num_hndl;

	/* variable length part */

} __attribute__ ((packed));



#define HCI_EV_MODE_CHANGE		0x14

struct hci_ev_mode_change {

	__u8     status;
@@ -637,36 +689,71 @@ struct hci_ev_link_key_notify { 
	__u8     key_type;

} __attribute__ ((packed));



#define HCI_EV_REMOTE_FEATURES	0x0B

struct hci_ev_remote_features {

#define HCI_EV_CLOCK_OFFSET		0x1c

struct hci_ev_clock_offset {

	__u8     status;

	__le16   handle;

	__u8     features[8];

	__le16   clock_offset;

} __attribute__ ((packed));



#define HCI_EV_REMOTE_VERSION	0x0C

struct hci_ev_remote_version {

#define HCI_EV_PSCAN_REP_MODE		0x20

struct hci_ev_pscan_rep_mode {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

} __attribute__ ((packed));



#define HCI_EV_INQUIRY_RESULT_WITH_RSSI	0x22

struct inquiry_info_with_rssi {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

	__u8     dev_class[3];

	__le16   clock_offset;

	__s8     rssi;

} __attribute__ ((packed));

struct inquiry_info_with_rssi_and_pscan_mode {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

	__u8     pscan_mode;

	__u8     dev_class[3];

	__le16   clock_offset;

	__s8     rssi;

} __attribute__ ((packed));



#define HCI_EV_REMOTE_EXT_FEATURES	0x23

struct hci_ev_remote_ext_features {

	__u8     status;

	__le16   handle;

	__u8     lmp_ver;

	__le16   manufacturer;

	__le16   lmp_subver;

	__u8     page;

	__u8     max_page;

	__u8     features[8];

} __attribute__ ((packed));



#define HCI_EV_CLOCK_OFFSET	0x01C

struct hci_ev_clock_offset {

#define HCI_EV_SYNC_CONN_COMPLETE	0x2c

struct hci_ev_sync_conn_complete {

	__u8     status;

	__le16   handle;

	__le16   clock_offset;

	bdaddr_t bdaddr;

	__u8     link_type;

	__u8     tx_interval;

	__u8     retrans_window;

	__le16   rx_pkt_len;

	__le16   tx_pkt_len;

	__u8     air_mode;

} __attribute__ ((packed));



#define HCI_EV_PSCAN_REP_MODE	0x20

struct hci_ev_pscan_rep_mode {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

#define HCI_EV_SYNC_CONN_CHANGED	0x2d

struct hci_ev_sync_conn_changed {

	__u8     status;

	__le16   handle;

	__u8     tx_interval;

	__u8     retrans_window;

	__le16   rx_pkt_len;

	__le16   tx_pkt_len;

} __attribute__ ((packed));



#define HCI_EV_SNIFF_SUBRATE	0x2E

#define HCI_EV_SNIFF_SUBRATE		0x2e

struct hci_ev_sniff_subrate {

	__u8     status;

	__le16   handle;
@@ -676,8 +763,19 @@ struct hci_ev_sniff_subrate { 
	__le16   max_local_timeout;

} __attribute__ ((packed));



#define HCI_EV_EXTENDED_INQUIRY_RESULT	0x2f

struct extended_inquiry_info {

	bdaddr_t bdaddr;

	__u8     pscan_rep_mode;

	__u8     pscan_period_mode;

	__u8     dev_class[3];

	__le16   clock_offset;

	__s8     rssi;

	__u8     data[240];

} __attribute__ ((packed));



/* Internal events generated by Bluetooth stack */

#define HCI_EV_STACK_INTERNAL	0xFD

#define HCI_EV_STACK_INTERNAL	0xfd

struct hci_ev_stack_internal {

	__u16    type;

	__u8     data[0];

include/net/bluetooth/hci_core.h

+8 −4
Original line number Diff line number Diff line
@@ -71,7 +71,10 @@ struct hci_dev { 
	__u16		id;

	__u8		type;

	bdaddr_t	bdaddr;

	__u8		dev_name[248];

	__u8		dev_class[3];

	__u8		features[8];

	__u8		commands[64];

	__u8		hci_ver;

	__u16		hci_rev;

	__u16		manufacturer;
@@ -314,6 +317,7 @@ void hci_add_sco(struct hci_conn *conn, __u16 handle); 
struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);

int hci_conn_del(struct hci_conn *conn);

void hci_conn_hash_flush(struct hci_dev *hdev);

void hci_conn_check_pending(struct hci_dev *hdev);



struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *src);

int hci_conn_auth(struct hci_conn *conn);
@@ -617,11 +621,11 @@ int hci_unregister_cb(struct hci_cb *hcb); 
int hci_register_notifier(struct notifier_block *nb);

int hci_unregister_notifier(struct notifier_block *nb);



int hci_send_cmd(struct hci_dev *hdev, __u16 ogf, __u16 ocf, __u32 plen, void *param);

int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);

int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags);

int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb);



void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 ogf, __u16 ocf);

void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);



void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data);

net/bluetooth/hci_conn.c

+27 −16
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void hci_acl_connect(struct hci_conn *conn) 
	else

		cp.role_switch	= 0x00;



	hci_send_cmd(hdev, OGF_LINK_CTL, OCF_CREATE_CONN, sizeof(cp), &cp);

	hci_send_cmd(hdev, HCI_OP_CREATE_CONN, sizeof(cp), &cp);

}



static void hci_acl_connect_cancel(struct hci_conn *conn)
@@ -95,8 +95,7 @@ static void hci_acl_connect_cancel(struct hci_conn *conn) 
		return;



	bacpy(&cp.bdaddr, &conn->dst);

	hci_send_cmd(conn->hdev, OGF_LINK_CTL,

				OCF_CREATE_CONN_CANCEL, sizeof(cp), &cp);

	hci_send_cmd(conn->hdev, HCI_OP_CREATE_CONN_CANCEL, sizeof(cp), &cp);

}



void hci_acl_disconn(struct hci_conn *conn, __u8 reason)
@@ -109,8 +108,7 @@ void hci_acl_disconn(struct hci_conn *conn, __u8 reason) 


	cp.handle = cpu_to_le16(conn->handle);

	cp.reason = reason;

	hci_send_cmd(conn->hdev, OGF_LINK_CTL,

				OCF_DISCONNECT, sizeof(cp), &cp);

	hci_send_cmd(conn->hdev, HCI_OP_DISCONNECT, sizeof(cp), &cp);

}



void hci_add_sco(struct hci_conn *conn, __u16 handle)
@@ -126,7 +124,7 @@ void hci_add_sco(struct hci_conn *conn, __u16 handle) 
	cp.handle   = cpu_to_le16(handle);

	cp.pkt_type = cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);



	hci_send_cmd(hdev, OGF_LINK_CTL, OCF_ADD_SCO, sizeof(cp), &cp);

	hci_send_cmd(hdev, HCI_OP_ADD_SCO, sizeof(cp), &cp);

}



static void hci_conn_timeout(unsigned long arg)
@@ -348,7 +346,7 @@ int hci_conn_auth(struct hci_conn *conn) 
	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {

		struct hci_cp_auth_requested cp;

		cp.handle = cpu_to_le16(conn->handle);

		hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_AUTH_REQUESTED, sizeof(cp), &cp);

		hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp);

	}

	return 0;

}
@@ -369,7 +367,7 @@ int hci_conn_encrypt(struct hci_conn *conn) 
		struct hci_cp_set_conn_encrypt cp;

		cp.handle  = cpu_to_le16(conn->handle);

		cp.encrypt = 1;

		hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp);

		hci_send_cmd(conn->hdev, HCI_OP_SET_CONN_ENCRYPT, sizeof(cp), &cp);

	}

	return 0;

}
@@ -383,7 +381,7 @@ int hci_conn_change_link_key(struct hci_conn *conn) 
	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {

		struct hci_cp_change_conn_link_key cp;

		cp.handle = cpu_to_le16(conn->handle);

		hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_CHANGE_CONN_LINK_KEY, sizeof(cp), &cp);

		hci_send_cmd(conn->hdev, HCI_OP_CHANGE_CONN_LINK_KEY, sizeof(cp), &cp);

	}

	return 0;

}
@@ -401,7 +399,7 @@ int hci_conn_switch_role(struct hci_conn *conn, uint8_t role) 
		struct hci_cp_switch_role cp;

		bacpy(&cp.bdaddr, &conn->dst);

		cp.role = role;

		hci_send_cmd(conn->hdev, OGF_LINK_POLICY, OCF_SWITCH_ROLE, sizeof(cp), &cp);

		hci_send_cmd(conn->hdev, HCI_OP_SWITCH_ROLE, sizeof(cp), &cp);

	}

	return 0;

}
@@ -423,8 +421,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn) 
	if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {

		struct hci_cp_exit_sniff_mode cp;

		cp.handle = cpu_to_le16(conn->handle);

		hci_send_cmd(hdev, OGF_LINK_POLICY,

				OCF_EXIT_SNIFF_MODE, sizeof(cp), &cp);

		hci_send_cmd(hdev, HCI_OP_EXIT_SNIFF_MODE, sizeof(cp), &cp);

	}



timer:
@@ -455,8 +452,7 @@ void hci_conn_enter_sniff_mode(struct hci_conn *conn) 
		cp.max_latency        = cpu_to_le16(0);

		cp.min_remote_timeout = cpu_to_le16(0);

		cp.min_local_timeout  = cpu_to_le16(0);

		hci_send_cmd(hdev, OGF_LINK_POLICY,

				OCF_SNIFF_SUBRATE, sizeof(cp), &cp);

		hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);

	}



	if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
@@ -466,8 +462,7 @@ void hci_conn_enter_sniff_mode(struct hci_conn *conn) 
		cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);

		cp.attempt      = cpu_to_le16(4);

		cp.timeout      = cpu_to_le16(1);

		hci_send_cmd(hdev, OGF_LINK_POLICY,

				OCF_SNIFF_MODE, sizeof(cp), &cp);

		hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);

	}

}
@@ -493,6 +488,22 @@ void hci_conn_hash_flush(struct hci_dev *hdev) 
	}

}



/* Check pending connect attempts */

void hci_conn_check_pending(struct hci_dev *hdev)

{

	struct hci_conn *conn;



	BT_DBG("hdev %s", hdev->name);



	hci_dev_lock(hdev);



	conn = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);

	if (conn)

		hci_acl_connect(conn);



	hci_dev_unlock(hdev);

}



int hci_get_conn_list(void __user *arg)

{

	struct hci_conn_list_req req, *cl;

net/bluetooth/hci_core.c

+27 −21

File changed.

Preview size limit exceeded, changes collapsed.