Attachment #235099 for bug #265066

View | Details | Raw Unified | Return to bug 265066
Collapse All | Expand All

Lines 615-622 process_hc_baseband_params(ng_hci_unit_p unit, u_int16_t ocf, Link Here

(-)b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c (+2 lines)
615	case NG_HCI_OCF_READ_LOCAL_NAME:	615	case NG_HCI_OCF_READ_LOCAL_NAME:
616	case NG_HCI_OCF_READ_UNIT_CLASS:	616	case NG_HCI_OCF_READ_UNIT_CLASS:
617	case NG_HCI_OCF_WRITE_UNIT_CLASS:	617	case NG_HCI_OCF_WRITE_UNIT_CLASS:
		618	case NG_HCI_OCF_WRITE_SIMPLE_PAIRING:
618	case NG_HCI_OCF_READ_LE_HOST_SUPPORTED:	619	case NG_HCI_OCF_READ_LE_HOST_SUPPORTED:
619	case NG_HCI_OCF_WRITE_LE_HOST_SUPPORTED:	620	case NG_HCI_OCF_WRITE_LE_HOST_SUPPORTED:
		621	case NG_HCI_OCF_WRITE_SECURE_CONNECTIONS_HOST_SUPPORT:
620	/* These do not need post processing */	622	/* These do not need post processing */
621	break;	623	break;
622		624

Lines 121-126 ng_hci_process_event(ng_hci_unit_p unit, struct mbuf *event) Link Here

(-)b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c (+1 lines)
121	case NG_HCI_EVENT_VENDOR:	121	case NG_HCI_EVENT_VENDOR:
122	case NG_HCI_EVENT_REMOTE_NAME_REQ_COMPL:	122	case NG_HCI_EVENT_REMOTE_NAME_REQ_COMPL:
123	case NG_HCI_EVENT_READ_REMOTE_VER_INFO_COMPL:	123	case NG_HCI_EVENT_READ_REMOTE_VER_INFO_COMPL:
		124	case NG_HCI_EVENT_IO_CAPABILITY_REQUEST:
124	/* These do not need post processing */	125	/* These do not need post processing */
125	NG_FREE_M(event);	126	NG_FREE_M(event);
126	break;	127	break;

Lines 115-120 Link Here

(-)b/sys/netgraph/bluetooth/include/ng_hci.h (+53 lines)
115	#define NG_HCI_LMP_FLOW_CONTROL_LAG0 0x10	115	#define NG_HCI_LMP_FLOW_CONTROL_LAG0 0x10
116	#define NG_HCI_LMP_FLOW_CONTROL_LAG1 0x20	116	#define NG_HCI_LMP_FLOW_CONTROL_LAG1 0x20
117	#define NG_HCI_LMP_FLOW_CONTROL_LAG2 0x40	117	#define NG_HCI_LMP_FLOW_CONTROL_LAG2 0x40
		118	/* ------------------- byte 6 --------------------*/
		119	#define NG_HCI_LMP_SIMPLE_SECURE_CONNECT 0x08
118		120
119	/* Link types */	121	/* Link types */
120	#define NG_HCI_LINK_SCO 0x00 /* Voice */	122	#define NG_HCI_LINK_SCO 0x00 /* Voice */
Lines 797-802 typedef struct { Link Here
797	} __attribute__ ((packed)) ng_hci_read_clock_offset_cp;	799	} __attribute__ ((packed)) ng_hci_read_clock_offset_cp;
798	/* No return parameter(s) */	800	/* No return parameter(s) */
799		801
		802	#define NG_HCI_IO_CAPABILITY_REQUEST_REPLY 0x002b
		803	typedef struct {
		804	bdaddr_t bdaddr;
		805	u_int8_t io_capability;
		806	u_int8_t oob_data_present;
		807	u_int8_t authentication_requirements;
		808	} __attribute__ ((packed)) ng_hci_io_capability_request_reply_cp;
		809
		810	typedef struct {
		811	u_int8_t status;
		812	bdaddr_t bdaddr;
		813	} __attribute__ ((packed)) ng_hci_io_capability_request_reply_rp;
		814
		815	#define NG_HCI_USER_CONFIRMATION_REQUEST_REPLY 0x002c
		816	typedef struct {
		817	bdaddr_t bdaddr;
		818	} __attribute__ ((packed)) ng_hci_user_confirmation_request_reply_cp;
		819
		820	typedef struct {
		821	u_int8_t status;
		822	bdaddr_t bdaddr;
		823	} __attribute__ ((packed)) ng_hci_user_confirmation_request_reply_rp;
		824
		825
800	/**************************************************************************	826	/**************************************************************************
801	**************************************************************************	827	**************************************************************************
802	** Link policy commands and return parameters	828	** Link policy commands and return parameters
Lines 1311-1316 typedef struct { Link Here
1311		1337
1312	typedef ng_hci_status_rp ng_hci_write_page_scan_rp;	1338	typedef ng_hci_status_rp ng_hci_write_page_scan_rp;
1313		1339
		1340	#define NG_HCI_OCF_WRITE_SIMPLE_PAIRING 0x0056
		1341	typedef struct {
		1342	u_int8_t simple_pairing; /* 1 -> enabled, 0 -> disabled */
		1343	} __attribute__ ((packed)) ng_hci_write_simple_pairing_cp;
		1344
		1345	typedef ng_hci_status_rp ng_hcy_write_simple_pairing_rp;
		1346
1314	#define NG_HCI_OCF_READ_LE_HOST_SUPPORTED 0x6c	1347	#define NG_HCI_OCF_READ_LE_HOST_SUPPORTED 0x6c
1315	typedef struct {	1348	typedef struct {
1316	u_int8_t status; /* 0x00 - success */	1349	u_int8_t status; /* 0x00 - success */
Lines 1326-1331 typedef struct { Link Here
1326		1359
1327	typedef ng_hci_status_rp ng_hci_write_le_host_supported_rp;	1360	typedef ng_hci_status_rp ng_hci_write_le_host_supported_rp;
1328		1361
		1362	#define NG_HCI_OCF_WRITE_SECURE_CONNECTIONS_HOST_SUPPORT 0x7a
		1363	typedef struct {
		1364	u_int8_t support; /* 0 - disabled, 1 - enabled */
		1365	} __attribute__ ((packed)) ng_hci_write_secure_connections_host_support_cp;
		1366
		1367	typedef ng_hci_status_rp ng_hci_write_secure_connections_host_support_rp;
		1368
1329	/**************************************************************************	1369	/**************************************************************************
1330	**************************************************************************	1370	**************************************************************************
1331	** Informational commands and return parameters	1371	** Informational commands and return parameters
Lines 1800-1805 typedef struct { Link Here
1800	u_int8_t features[NG_HCI_FEATURES_SIZE]; /* LMP features bitmsk*/	1840	u_int8_t features[NG_HCI_FEATURES_SIZE]; /* LMP features bitmsk*/
1801	} __attribute__ ((packed)) ng_hci_read_remote_features_compl_ep;	1841	} __attribute__ ((packed)) ng_hci_read_remote_features_compl_ep;
1802		1842
		1843
1803	#define NG_HCI_EVENT_READ_REMOTE_VER_INFO_COMPL 0x0c	1844	#define NG_HCI_EVENT_READ_REMOTE_VER_INFO_COMPL 0x0c
1804	typedef struct {	1845	typedef struct {
1805	u_int8_t status; /* 0x00 - success */	1846	u_int8_t status; /* 0x00 - success */
Lines 1939-1944 typedef struct { Link Here
1939	bdaddr_t bdaddr; /* destination address */	1980	bdaddr_t bdaddr; /* destination address */
1940	u_int8_t page_scan_rep_mode; /* page scan repetition mode */	1981	u_int8_t page_scan_rep_mode; /* page scan repetition mode */
1941	} __attribute__ ((packed)) ng_hci_page_scan_rep_mode_change_ep;	1982	} __attribute__ ((packed)) ng_hci_page_scan_rep_mode_change_ep;
		1983
		1984	#define NG_HCI_EVENT_IO_CAPABILITY_REQUEST 0x31
		1985	typedef struct {
		1986	bdaddr_t bdaddr;
		1987	} __attribute__ ((packed)) ng_hci_io_capability_request_ep;
		1988
		1989	#define NG_HCI_EVENT_USER_CONFIRMATION_REQUEST 0x33
		1990	typedef struct {
		1991	bdaddr_t bdaddr;
		1992	u_int32_t numeric_value;
		1993	} __attribute__ ((packed)) ng_hci_user_confirmation_request_ep;
		1994
1942	#define NG_HCI_EVENT_LE 0x3e	1995	#define NG_HCI_EVENT_LE 0x3e
1943	typedef struct {	1996	typedef struct {
1944	u_int8_t subevent_code;	1997	u_int8_t subevent_code;

Return to bug 265066