svn commit: r360092 - in head: sys/netgraph/bluetooth/hci usr.sbin/bluetooth/hccontrol

[Hans Petter Selasky]

Author: hselasky
Date: Sun Apr 19 10:24:15 2020
New Revision: 360092
URL: https://svnweb.freebsd.org/changeset/base/360092

Log:
  Bring HCI error messages up-to-date.
  See Bluetooth v5.6 core specification Vol.1 Part F: Controller error codes.
  
  Submitted by:	Marc Veldman <marc at bumblingdork.com>
  PR:		245737
  MFC after:	1 week
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/netgraph/bluetooth/hci/ng_hci_misc.c
  head/usr.sbin/bluetooth/hccontrol/util.c

Modified: head/sys/netgraph/bluetooth/hci/ng_hci_misc.c
==============================================================================
--- head/sys/netgraph/bluetooth/hci/ng_hci_misc.c	Sun Apr 19 09:28:59 2020	(r360091)
+++ head/sys/netgraph/bluetooth/hci/ng_hci_misc.c	Sun Apr 19 10:24:15 2020	(r360092)
@@ -491,7 +491,35 @@ ng_hci_str_error(u_int16_t code)
 	/* 0x26 */ "Unit key used",
 	/* 0x27 */ "QoS is not supported",
 	/* 0x28 */ "Instant passed",
-	/* 0x29 */ "Paring with unit key not supported",
+	/* 0x29 */ "Pairing with unit key not supported",
+	/* 0x2a */ "Different Transaction Collision",
+	/* 0x2b */ "Unknown error (Reserved for future use)",
+	/* 0x2c */ "QoS Unacceptable Parameter",
+	/* 0x2d */ "QoS Rejected",
+	/* 0x2e */ "Channel Classification Not Supported",
+	/* 0x2f */ "Insufficient Security",
+	/* 0x30 */ "Parameter Out Of Mandatory Range",
+	/* 0x31 */ "Unknown error (Reserved for future use)",
+	/* 0x32 */ "Role Switch Pending",
+	/* 0x33 */ "Unknown error (Reserved for future use)",
+	/* 0x34 */ "Reserved Slot Violation",
+	/* 0x35 */ "Role Switch Failed",
+	/* 0x36 */ "Extended Inquiry Response Too Large",
+	/* 0x37 */ "Secure Simple Pairing Not Supported By Host",
+	/* 0x38 */ "Host Busy - Pairing",
+	/* 0x39 */ "Connection Rejected due to No Suitable Channel Found",
+	/* 0x3a */ "Controller Busy",
+	/* 0x3b */ "Unacceptable Connection Parameters",
+	/* 0x3c */ "Advertising Timeout",
+	/* 0x3d */ "Connection Terminated due to MIC Failure",
+	/* 0x3e */ "Connection Failed to be Established / Synchronization Timeout",
+	/* 0x3f */ "MAC Connection Failed",
+	/* 0x40 */ "Coarse Clock Adjustment Rejected but Will Try to Adjust Using Clock Dragging",
+	/* 0x41 */ "Type0 Submap Not Defined",
+	/* 0x42 */ "Unknown Advertising Identifier",
+	/* 0x43 */ "Limit Reached",
+	/* 0x44 */ "Operation Cancelled by Host",
+	/* 0x45 */ "Packet Too Long",
 	/* SHOULD ALWAYS BE LAST */ "Unknown error"
 	};
 

Modified: head/usr.sbin/bluetooth/hccontrol/util.c
==============================================================================
--- head/usr.sbin/bluetooth/hccontrol/util.c	Sun Apr 19 09:28:59 2020	(r360091)
+++ head/usr.sbin/bluetooth/hccontrol/util.c	Sun Apr 19 10:24:15 2020	(r360092)
@@ -439,7 +439,35 @@ hci_status2str(int status)
 		/* 0x26 */ "Unit key used",
 		/* 0x27 */ "QoS is not supported",
 		/* 0x28 */ "Instant passed",
-		/* 0x29 */ "Pairing with unit key not supported"
+		/* 0x29 */ "Pairing with unit key not supported",
+		/* 0x2a */ "Different Transaction Collision",
+		/* 0x2b */ "Unknown error (Reserved for future use)",
+		/* 0x2c */ "QoS Unacceptable Parameter",
+		/* 0x2d */ "QoS Rejected",
+		/* 0x2e */ "Channel Classification Not Supported",
+		/* 0x2f */ "Insufficient Security",
+		/* 0x30 */ "Parameter Out Of Mandatory Range",
+		/* 0x31 */ "Unknown error (Reserved for future use)",
+		/* 0x32 */ "Role Switch Pending",
+		/* 0x33 */ "Unknown error (Reserved for future use)",
+		/* 0x34 */ "Reserved Slot Violation",
+		/* 0x35 */ "Role Switch Failed",
+		/* 0x36 */ "Extended Inquiry Response Too Large",
+		/* 0x37 */ "Secure Simple Pairing Not Supported By Host",
+		/* 0x38 */ "Host Busy - Pairing",
+		/* 0x39 */ "Connection Rejected due to No Suitable Channel Found",
+		/* 0x3a */ "Controller Busy",
+		/* 0x3b */ "Unacceptable Connection Parameters",
+		/* 0x3c */ "Advertising Timeout",
+		/* 0x3d */ "Connection Terminated due to MIC Failure",
+		/* 0x3e */ "Connection Failed to be Established / Synchronization Timeout",
+		/* 0x3f */ "MAC Connection Failed",
+		/* 0x40 */ "Coarse Clock Adjustment Rejected but Will Try to Adjust Using Clock Dragging",
+		/* 0x41 */ "Type0 Submap Not Defined",
+		/* 0x42 */ "Unknown Advertising Identifier",
+		/* 0x43 */ "Limit Reached",
+		/* 0x44 */ "Operation Cancelled by Host",
+		/* 0x45 */ "Packet Too Long"
 	};
 
 	return (status >= SIZE(t)? "Unknown error" : t[status]);