aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2020-05-18 08:45:24 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2020-05-18 08:45:24 +0000
commit1c51f8afbba8cfc9e166fd18361d340d55836b85 (patch)
treeada9cb1b6b3fc48efc932eabaee2a1961b93a7b5
parentd6d5d1aac041076578e8e5b0f8350a89a0f10759 (diff)
downloadsrc-1c51f8afbba8cfc9e166fd18361d340d55836b85.tar.gz
src-1c51f8afbba8cfc9e166fd18361d340d55836b85.zip
MFC r360092:
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@bumblingdork.com> PR: 245737 Sponsored by: Mellanox Technologies
Notes
Notes: svn path=/stable/10/; revision=361157
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_misc.c30
-rw-r--r--usr.sbin/bluetooth/hccontrol/util.c30
2 files changed, 58 insertions, 2 deletions
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index 2209fbde0493..e7228f4d89da 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -488,7 +488,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"
};
diff --git a/usr.sbin/bluetooth/hccontrol/util.c b/usr.sbin/bluetooth/hccontrol/util.c
index c0c64969059d..da4294463508 100644
--- a/usr.sbin/bluetooth/hccontrol/util.c
+++ b/usr.sbin/bluetooth/hccontrol/util.c
@@ -426,7 +426,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]);