From f87c55ba849863a26c9633d50ada2ced6955b6df Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 7 Oct 2013 15:33:13 -0700 Subject: [PATCH] tools: Print PAL version for AMP controllers --- tools/hciconfig.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/hciconfig.c b/tools/hciconfig.c index c06b50704..fe451677b 100644 --- a/tools/hciconfig.c +++ b/tools/hciconfig.c @@ -1137,13 +1137,17 @@ static void cmd_version(int ctl, int hdev, char *opt) } hciver = hci_vertostr(ver.hci_ver); - lmpver = lmp_vertostr(ver.lmp_ver); + if (((di.type & 0x30) >> 4) == HCI_BREDR) + lmpver = lmp_vertostr(ver.lmp_ver); + else + lmpver = pal_vertostr(ver.lmp_ver); print_dev_hdr(&di); printf("\tHCI Version: %s (0x%x) Revision: 0x%x\n" - "\tLMP Version: %s (0x%x) Subversion: 0x%x\n" + "\t%s Version: %s (0x%x) Subversion: 0x%x\n" "\tManufacturer: %s (%d)\n", hciver ? hciver : "n/a", ver.hci_ver, ver.hci_rev, + (((di.type & 0x30) >> 4) == HCI_BREDR) ? "LMP" : "PAL", lmpver ? lmpver : "n/a", ver.lmp_ver, ver.lmp_subver, bt_compidtostr(ver.manufacturer), ver.manufacturer); @@ -1914,7 +1918,7 @@ static struct { { "class", cmd_class, "[class]", "Get/Set class of device" }, { "voice", cmd_voice, "[voice]", "Get/Set voice setting" }, { "iac", cmd_iac, "[iac]", "Get/Set inquiry access code" }, - { "inqtpl", cmd_inq_tpl, "[level]", "Get/Set inquiry transmit power level" }, + { "inqtpl", cmd_inq_tpl, "[level]", "Get/Set inquiry transmit power level" }, { "inqmode", cmd_inq_mode, "[mode]", "Get/Set inquiry mode" }, { "inqdata", cmd_inq_data, "[data]", "Get/Set inquiry data" }, { "inqtype", cmd_inq_type, "[type]", "Get/Set inquiry scan type" }, -- 2.47.3