Modified the error codes description as per core V4.2, Vol 2, Part D.
Provided fix for checkpatch errors.
Gowtham Anandha Babu (3):
monitor/packet: Fix ERROR CODES as per core_v4.2
parser/hci: Fix ERROR CODES as per core_v4.2
monitor/packet: Fix possbile checkpatch errors
monitor/packet.c | 23 ++++++++++++-----------
tools/parser/hci.c | 6 +++---
2 files changed, 15 insertions(+), 14 deletions(-)
--
1.9.1
Hi Gowtham,
On Mon, Jan 12, 2015 at 10:08 AM, Gowtham Anandha Babu
<[email protected]> wrote:
> Modified the error codes description as per core V4.2, Vol 2, Part D.
> Provided fix for checkpatch errors.
>
> Gowtham Anandha Babu (3):
> monitor/packet: Fix ERROR CODES as per core_v4.2
> parser/hci: Fix ERROR CODES as per core_v4.2
> monitor/packet: Fix possbile checkpatch errors
>
> monitor/packet.c | 23 ++++++++++++-----------
> tools/parser/hci.c | 6 +++---
> 2 files changed, 15 insertions(+), 14 deletions(-)
>
> --
> 1.9.1
Applied, thanks.
--
Luiz Augusto von Dentz
---
monitor/packet.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/monitor/packet.c b/monitor/packet.c
index 87b97ad..ebff682 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -1052,7 +1052,7 @@ static void print_voice_setting(uint16_t setting)
str = "Linear";
break;
case 0x01:
- str ="u-law";
+ str = "u-law";
break;
case 0x02:
str = "A-law";
@@ -1096,7 +1096,7 @@ static void print_voice_setting(uint16_t setting)
str = "CVSD";
break;
case 0x01:
- str ="u-law";
+ str = "u-law";
break;
case 0x02:
str = "A-law";
@@ -2184,7 +2184,7 @@ static void print_channel_map(const uint8_t *map)
if (count > 1) {
print_field(" Channel %u-%u",
- start, start + count - 1 );
+ start, start + count - 1);
count = 0;
} else if (count > 0) {
print_field(" Channel %u", start);
@@ -2575,7 +2575,7 @@ static const struct {
LE_STATE_MASTER_SLAVE },
{ 39, LE_STATE_CONN_SLAVE | LE_STATE_HIGH_DIRECT_ADV |
LE_STATE_SLAVE_SLAVE },
- { 40, LE_STATE_CONN_SLAVE| LE_STATE_LOW_DIRECT_ADV |
+ { 40, LE_STATE_CONN_SLAVE | LE_STATE_LOW_DIRECT_ADV |
LE_STATE_SLAVE_SLAVE },
{ 41, LE_STATE_INITIATING | LE_STATE_CONN_SLAVE |
LE_STATE_MASTER_SLAVE },
@@ -2643,7 +2643,7 @@ static void print_le_channel_map(const uint8_t *map)
if (count > 1) {
print_field(" Channel %u-%u",
- start, start + count - 1 );
+ start, start + count - 1);
count = 0;
} else if (count > 0) {
print_field(" Channel %u", start);
@@ -3900,7 +3900,7 @@ static void create_logic_link_cmd(const void *data, uint8_t size)
static void accept_logic_link_cmd(const void *data, uint8_t size)
{
- const struct bt_hci_cmd_accept_logic_link *cmd = data;
+ const struct bt_hci_cmd_accept_logic_link *cmd = data;
print_phy_handle(cmd->phy_handle);
print_flow_spec("TX", cmd->tx_flow_spec);
@@ -3924,7 +3924,7 @@ static void logic_link_cancel_cmd(const void *data, uint8_t size)
static void logic_link_cancel_rsp(const void *data, uint8_t size)
{
- const struct bt_hci_rsp_logic_link_cancel *rsp = data;
+ const struct bt_hci_rsp_logic_link_cancel *rsp = data;
print_status(rsp->status);
print_phy_handle(rsp->phy_handle);
@@ -8039,7 +8039,7 @@ void packet_hci_event(struct timeval *tv, uint16_t index,
sprintf(extra_str, "(0x%2.2x) plen %d", hdr->evt, hdr->plen);
print_packet(tv, index, '>', event_color, "HCI Event",
- event_str, extra_str);
+ event_str, extra_str);
if (!event_data || !event_data->func) {
packet_hexdump(data, size);
--
1.9.1
Modified the error codes as per core V4.2, Vol 2, Part D.
---
tools/parser/hci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index cd52cb5..33df542 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -446,9 +446,9 @@ static char *error_code_str[ERROR_CODE_NUM + 1] = {
"SCO Offset Rejected",
"SCO Interval Rejected",
"SCO Air Mode Rejected",
- "Invalid LMP Parameters",
+ "Invalid LMP Parameters / Invalid LL Parameters",
"Unspecified Error",
- "Unsupported LMP Parameter Value",
+ "Unsupported LMP Parameter Value / Unsupported LL Parameter Value",
"Role Change Not Allowed",
"LMP Response Timeout",
"LMP Error Transaction Collision",
@@ -475,7 +475,7 @@ static char *error_code_str[ERROR_CODE_NUM + 1] = {
"Host Busy - Pairing",
"Connection Rejected due to No Suitable Channel Found",
"Controller Busy",
- "Unacceptable Connection Interval",
+ "Unacceptable Connection Parameters",
"Directed Advertising Timeout",
"Connection Terminated Due to MIC Failure",
"Connection Failed to be Established",
--
1.9.1
Modified the error codes as per core V4.2, Vol 2, Part D.
---
monitor/packet.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/monitor/packet.c b/monitor/packet.c
index 885c4b1..87b97ad 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -317,9 +317,10 @@ static const struct {
{ 0x1b, "SCO Offset Rejected" },
{ 0x1c, "SCO Interval Rejected" },
{ 0x1d, "SCO Air Mode Rejected" },
- { 0x1e, "Invalid LMP Parameters" },
+ { 0x1e, "Invalid LMP Parameters / Invalid LL Parameters" },
{ 0x1f, "Unspecified Error" },
- { 0x20, "Unsupported LMP Parameter Value" },
+ { 0x20, "Unsupported LMP Parameter Value / "
+ "Unsupported LL Parameter Value" },
{ 0x21, "Role Change Not Allowed" },
{ 0x22, "LMP Response Timeout / LL Response Timeout" },
{ 0x23, "LMP Error Transaction Collision" },
@@ -346,7 +347,7 @@ static const struct {
{ 0x38, "Host Busy - Pairing" },
{ 0x39, "Connection Rejected due to No Suitable Channel Found" },
{ 0x3a, "Controller Busy" },
- { 0x3b, "Unacceptable Connection Interval" },
+ { 0x3b, "Unacceptable Connection Parameters" },
{ 0x3c, "Directed Advertising Timeout" },
{ 0x3d, "Connection Terminated due to MIC Failure" },
{ 0x3e, "Connection Failed to be Established" },
--
1.9.1