client: Rename set-manufacturer to manufacturer
Make the command return the current value if no parameters:
[bluetooth]# manufacturer 2 00
[bluetooth]# manufacturer
Manufacturer: 2
00
diff --git a/client/advertising.c b/client/advertising.c
index 9744621..304ae68 100644
--- a/client/advertising.c
+++ b/client/advertising.c
@@ -543,10 +543,18 @@
long int val;
struct ad_data *data;
- ad_clear_manufacturer();
+ if (argc < 2 || !strlen(argv[1])) {
+ if (ad.manufacturer.data.len) {
+ bt_shell_printf("Manufacturer: %u\n",
+ ad.manufacturer.id);
+ bt_shell_hexdump(ad.manufacturer.data.data,
+ ad.manufacturer.data.len);
+ }
- if (argc < 2)
return;
+ }
+
+ ad_clear_manufacturer();
val = strtol(argv[1], &endptr, 0);
if (!endptr || *endptr != '\0' || val > UINT16_MAX) {
diff --git a/client/main.c b/client/main.c
index 9d68be6..26bbc7e 100644
--- a/client/main.c
+++ b/client/main.c
@@ -2201,7 +2201,7 @@
ad_advertise_service(dbus_conn, argc, argv);
}
-static void cmd_set_advertise_manufacturer(int argc, char *argv[])
+static void cmd_advertise_manufacturer(int argc, char *argv[])
{
ad_advertise_manufacturer(dbus_conn, argc, argv);
}
@@ -2291,8 +2291,8 @@
"Set advertise uuids" },
{ "service", "[uuid] [data=xx xx ...]", cmd_advertise_service,
"Set advertise service data" },
- { "set-manufacturer", "[id] [data=xx xx ...]",
- cmd_set_advertise_manufacturer,
+ { "manufacturer", "[id] [data=xx xx ...]",
+ cmd_advertise_manufacturer,
"Set advertise manufacturer data" },
{ "set-tx-power", "<on/off>", cmd_set_advertise_tx_power,
"Enable/disable TX power to be advertised",
