- One can use both BD_ADDR or name to specify address of the Bluetooth device.

  Update man pages to document this fact.

- Update usage messages

- Change u_intXXX to uintXXX

4 files changed, 20 insertions, 13 deletions

diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.8 b/usr.sbin/bluetooth/hccontrol/hccontrol.8
index 559b5f6..65cc53f 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.8
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.8
@@ -69,6 +69,12 @@ To get more information about specific command use
 .Cm help Ar command .
 .It Ar parameters
 One or more optional space separated command parameters.
+Many commands require remote device address as one of the parameters.
+The remote device address can be specified as BD_ADDR or name.
+If name was specified then the
+.Nm
+utility will attempt to resolve the name via
+.Xr bt_gethostbyname 3 .
 .El
 .Sh COMMANDS
 The currently supported HCI commands in
@@ -168,6 +174,7 @@ Please report if found.
 .Sh DIAGNOSTICS
 .Ex -std
 .Sh SEE ALSO
+.Xr bluetooth 3 ,
 .Xr netgraph 3 ,
 .Xr netgraph 4 ,
 .Xr ng_hci 4 ,
diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index 5998e5c..38f77eb 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -1513,32 +1513,32 @@ struct hci_command	host_controller_baseband_commands[] = {
 &hci_write_pin_type
 },
 {
-"read_stored_link_key [<bdaddr>]",
+"read_stored_link_key [<BD_ADDR>]",
 "\nThe Read_Stored_Link_Key command provides the ability to read one or\n" \
 "more link keys stored in the Bluetooth Host Controller. The Bluetooth Host\n" \
 "Controller can store a limited number of link keys for other Bluetooth\n" \
 "devices.\n\n" \
-"\t<bdaddr> - xx:xx:xx:xx:xx:xx BD_ADDR",
+"\t<BD_ADDR> - xx:xx:xx:xx:xx:xx BD_ADDR or name",
 &hci_read_stored_link_key
 },
 {
-"write_stored_link_key <bdaddr> <key>",
+"write_stored_link_key <BD_ADDR> <key>",
 "\nThe Write_Stored_Link_Key command provides the ability to write one\n" \
 "or more link keys to be stored in the Bluetooth Host Controller. The\n" \
 "Bluetooth Host Controller can store a limited number of link keys for other\n"\
 "Bluetooth devices. If no additional space is available in the Bluetooth\n"\
 "Host Controller then no additional link keys will be stored.\n\n" \
-"\t<bdaddr> - xx:xx:xx:xx:xx:xx BD_ADDR\n" \
-"\t<key>    - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx up to 16 bytes link key",
+"\t<BD_ADDR> - xx:xx:xx:xx:xx:xx BD_ADDR or name\n" \
+"\t<key>     - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx up to 16 bytes link key",
 &hci_write_stored_link_key
 },
 {
-"delete_stored_link_key [<bdaddr>]",
+"delete_stored_link_key [<BD_ADDR>]",
 "\nThe Delete_Stored_Link_Key command provides the ability to remove one\n" \
 "or more of the link keys stored in the Bluetooth Host Controller. The\n" \
 "Bluetooth Host Controller can store a limited number of link keys for other\n"\
 "Bluetooth devices.\n\n" \
-"\t<bdaddr> - xx:xx:xx:xx:xx:xx BD_ADDR",
+"\t<BD_ADDR> - xx:xx:xx:xx:xx:xx BD_ADDR or name",
 &hci_delete_stored_link_key
 },
 {
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index 34dae7b..b90ce00 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -831,7 +831,7 @@ struct hci_command	link_control_commands[] = {
 {
 "create_connection <BD_ADDR> <pkt> <rep_mode> <ps_mode> <clck_off> <role_sw>",
 "" \
-"\t<BD_ADDR> - remote unit address\n\n" \
+"\t<BD_ADDR> - xx:xx:xx:xx:xx:xx BD_ADDR or name\n\n" \
 "\t<pkt>     - xxxx; packet type\n" \
 "" \
 "\t\tACL packets\n" \
@@ -929,10 +929,10 @@ struct hci_command	link_control_commands[] = {
 &hci_change_connection_packet_type
 },
 {
-"remote_name_request <bdaddr> <ps_rep_mode> <ps_mode> <clock_offset>",
+"remote_name_request <BD_ADDR> <ps_rep_mode> <ps_mode> <clock_offset>",
 "\nThe Remote_Name_Request command is used to obtain the user-friendly\n" \
 "name of another Bluetooth unit.\n\n" \
-"\t<bdaddr>       - xx:xx:xx:xx:xx:xx remote unit BD_ADDR\n" \
+"\t<BD_ADDR>      - xx:xx:xx:xx:xx:xx BD_ADDR or name\n" \
 "\t<ps_rep_mode>  - dd; page scan repetition mode [0-2]\n" \
 "\t<ps_mode>      - dd; page scan mode [0-3]\n" \
 "\t<clock_offset> - xxxx; clock offset [0 - 0xffff]",
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index e00bac5..67b32d5 100644
--- a/usr.sbin/bluetooth/hccontrol/link_policy.c
+++ b/usr.sbin/bluetooth/hccontrol/link_policy.c
@@ -251,7 +251,7 @@ struct hci_command	link_policy_commands[] = {
 &hci_role_discovery
 },
 {
-"switch_role <bdaddr> <role>",
+"switch_role <BD_ADDR> <role>",
 "\nThe Switch_Role command is used for a Bluetooth device to switch the\n" \
 "current role the device is performing for a particular connection with\n" \
 "another specified Bluetooth device. The BD_ADDR command parameter indicates\n"\
@@ -259,8 +259,8 @@ struct hci_command	link_policy_commands[] = {
 "the requested new role that the local device performs. Note: the BD_ADDR\n" \
 "command parameter must specify a Bluetooth device for which a connection\n"
 "already exists.\n\n" \
-"\t<bdaddr> - xx:xx:xx:xx:xx:xx; device bdaddr\n" \
-"\t<role>   - dd; role; 0 - Master, 1 - Slave",
+"\t<BD_ADDR> - xx:xx:xx:xx:xx:xx BD_ADDR or name\n" \
+"\t<role>    - dd; role; 0 - Master, 1 - Slave",
 &hci_switch_role
 },
 {