michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: unify bt commands return value

Browse source 
Repleaced magic number 1 with define SHELL_CMD_HELP_PRINTED

Signed-off-by: Jakub Rzeszutko <jakub.rzeszutko@nordicsemi.no>
This commit is contained in:
Jakub Rzeszutko 2019-03-25 11:03:59 +01:00 • committed by Johan Hedberg
commit b6fc1af6ba
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
subsys/bluetooth/shell/bt.c
View file

@ -622,8 +622,7 @@ static int cmd_scan(const struct shell *shell, size_t argc, char *argv[])
dups = BT_HCI_LE_SCAN_FILTER_DUP_ENABLE;
} else {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
}
@ -636,8 +635,7 @@ static int cmd_scan(const struct shell *shell, size_t argc, char *argv[])
return cmd_passive_scan_on(shell, dups);
} else {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
return 0;
@ -809,8 +807,7 @@ static int cmd_auto_conn(const struct shell *shell, size_t argc, char *argv[])
return bt_le_set_auto_conn(&addr, NULL);
} else {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
return 0;
@ -829,8 +826,7 @@ static int cmd_disconnect(const struct shell *shell, size_t argc, char *argv[])
if (argc < 3) {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
err = str2bt_addr_le(argv[1], argv[2], &addr);
@ -1030,8 +1026,7 @@ static int cmd_bondable(const struct shell *shell, size_t argc, char *argv[])
bt_set_bondable(false);
} else {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
return 0;
@ -1224,8 +1219,7 @@ static int cmd_auth(const struct shell *shell, size_t argc, char *argv[])
bt_conn_auth_cb_register(NULL);
} else {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
return 0;
@ -1425,8 +1419,7 @@ static int cmd_bt(const struct shell *shell, size_t argc, char **argv)
{
if (argc == 1) {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
return SHELL_CMD_HELP_PRINTED;
}
shell_error(shell, "%s unknown parameter: %s", argv[0], argv[1]);