Attachment 213068 Details for Bug 245354 – Adds possible features to hci_features2str()

[patch] Adds possible features to hci_features2str()

features.diff (text/plain), 3.39 KB, created by Marc Veldman on 2020-04-04 17:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Veldman

Created: 2020-04-04 17:50:55 UTC

Size: 3.39 KB

patch

obsolete

>Index: usr.sbin/bluetooth/hccontrol/info.c
>===================================================================
>--- usr.sbin/bluetooth/hccontrol/info.c	(revision 359632)
>+++ usr.sbin/bluetooth/hccontrol/info.c	(working copy)
>@@ -78,7 +78,7 @@
> {
> 	ng_hci_read_local_features_rp	rp;
> 	int				n;
>-	char				buffer[1024];
>+	char				buffer[2048];
> 
> 	n = sizeof(rp);
> 	if (hci_simple_request(s, NG_HCI_OPCODE(NG_HCI_OGF_INFO,
>Index: usr.sbin/bluetooth/hccontrol/link_control.c
>===================================================================
>--- usr.sbin/bluetooth/hccontrol/link_control.c	(revision 359632)
>+++ usr.sbin/bluetooth/hccontrol/link_control.c	(working copy)
>@@ -612,7 +612,7 @@
> 	char				 b[512];
> 	ng_hci_read_remote_features_cp	 cp;
> 	ng_hci_event_pkt_t		*e = (ng_hci_event_pkt_t *) b; 
>-	char				 buffer[1024];
>+	char				 buffer[2048];
> 
> 	/* parse command parameters */
> 	switch (argc) {
>Index: usr.sbin/bluetooth/hccontrol/node.c
>===================================================================
>--- usr.sbin/bluetooth/hccontrol/node.c	(revision 359632)
>+++ usr.sbin/bluetooth/hccontrol/node.c	(working copy)
>@@ -153,7 +153,7 @@
> {
> 	struct ng_btsocket_hci_raw_node_features	r;
> 	int						n;
>-	char						buffer[1024];
>+	char						buffer[2048];
> 
> 	memset(&r, 0, sizeof(r));
> 	if (ioctl(s, SIOC_HCI_RAW_NODE_GET_FEATURES, &r, sizeof(r)) < 0)
>Index: usr.sbin/bluetooth/hccontrol/util.c
>===================================================================
>--- usr.sbin/bluetooth/hccontrol/util.c	(revision 359632)
>+++ usr.sbin/bluetooth/hccontrol/util.c	(working copy)
>@@ -289,7 +289,57 @@
> 		/* 4 */ "<Flow control lag (bit0)> ",
> 		/* 5 */ "<Flow control lag (bit1)> ",
> 		/* 6 */ "<Flow control lag (bit2)> ",
>-		/* 7 */ "<Unknown2.7> "
>+		/* 7 */ "<Broadcast Encryption> "
>+	},
>+	{ /* byte 3 */
>+		/* 0 */ "<Unknown 3.0> ",
>+		/* 1 */ "<EDR ACL 2 Mb/s> ",
>+		/* 2 */ "<EDR ACL 3 Mb/s> ",
>+		/* 3 */ "<Enhanced inquiry scan> ",
>+		/* 4 */ "<Interlaced inquiry scan> ",
>+		/* 5 */ "<Interlaced page scan> ",
>+		/* 6 */ "<RSSI with inquiry results> ",
>+		/* 7 */ "<Extended SCO link (EV3 packets)> "
>+	},
>+	{ /* byte 4 */
>+		/* 0 */ "<EV4 packets> ",
>+		/* 1 */ "<EV5 packets> ",
>+		/* 2 */ "<Unknown 4.2> ",
>+		/* 3 */ "<AFH capable slave> ",
>+		/* 4 */ "<AFH classification slave> ",
>+		/* 5 */ "<BR/EDR Not Supported> ",
>+		/* 6 */ "<LE Supported (Controller)> ",
>+		/* 7 */ "<3-Slot EDR ACL packets> "
>+	},
>+	{ /* byte 5 */
>+		/* 0 */ "<5-Slot EDR ACL packets> ",
>+		/* 1 */ "<Sniff subrating> ",
>+		/* 2 */ "<Pause encryption> ",
>+		/* 3 */ "<AFH capable master> ",
>+		/* 4 */ "<AFH classification master> ",
>+		/* 5 */ "<EDR eSCO 2 Mb/s mode> ",
>+		/* 6 */ "<EDR eSCO 3 Mb/s mode> ",
>+		/* 7 */ "<3-Slot EDR eSCO packets> "
>+	},
>+	{ /* byte 6 */
>+		/* 0 */ "<Enhanced Inquiry Response> ",
>+		/* 1 */ "<Simultaneous LE and BR/EDR (Controller)> ",
>+		/* 2 */ "<Unknown 6.2> ",
>+		/* 3 */ "<Secure Simple Pairing (Controller Support)> ",
>+		/* 4 */ "<Encapsulated PDU> ",
>+		/* 5 */ "<Erroneous Data Reporting> ",
>+		/* 6 */ "<Non-flushable Packed Boundary Flag> ",
>+		/* 7 */ "<Unknown 6.7> "
>+	},
>+	{ /* byte 7 */
>+		/* 0 */ "<HCI_Link_Supervision_Timeout_Changed event> ",
>+		/* 1 */ "<Variable Inquiry TX Power Level> ",
>+		/* 2 */ "<Enhanced Power Control> ",
>+		/* 3 */ "<Unknown 7.3> ",
>+		/* 4 */ "<Unknown 7.4> ",
>+		/* 5 */ "<Unknown 7.5> ",
>+		/* 6 */ "<Unknown 7.6> ",
>+		/* 7 */ "<Extended features> "
> 	}};
> 
> 	if (buffer != NULL && size > 0) {

Actions: View | Diff

Attachments on bug 245354: 213068