From: Luiz Augusto von Dentz <[email protected]>
This adds support for vendor commands reserving a single opcode (0xfc10)
so it can be extended using subcommands, similar to how MSFT works.
The first subcommand (0x00) enables the emulator to generate arbitrary
events using the commands parameters:
> tools/hcitool cmd 3f 10 00 22 24 d0 d0 d0 d0 d0 d0 ff ff
< HCI Command: Vendor (0x3f|0x0010) plen 11
00 22 24 d0 d0 d0 d0 d0 d0 ff ff
."$........
Bluetooth: hci0: Malformed HCI Event: 0x22
> HCI Event: Inquiry Result with R.. (0x22) plen 9
Num responses: 36
Page scan repetition mode: Reserved (0xff)
Page period mode: Reserved (0xff)
Class: 0xffffd0
Major class: Uncategorized, specific device code not specified
Minor class: 0x34
Limited Discoverable Mode
invalid service class
Clock offset: 0x6368
RSSI: 105 dBm (0x69)
> HCI Event: Command Complete (0x0e) plen 4
Vendor (0x3f|0x0010) ncmd 1
Status: Success (0x00)
---
v2: Fix missing monitor/emulator.h
emulator/btdev.c | 68 ++++++++++++++++++++++++++++++++++++++++------
emulator/btdev.h | 1 +
emulator/main.c | 1 +
emulator/vhci.c | 5 ++++
emulator/vhci.h | 1 +
monitor/emulator.h | 18 ++++++++++++
6 files changed, 86 insertions(+), 8 deletions(-)
create mode 100644 monitor/emulator.h
diff --git a/emulator/btdev.c b/emulator/btdev.c
index 41410dd05..002ebf3e7 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -34,6 +34,7 @@
#include "src/shared/queue.h"
#include "monitor/bt.h"
#include "monitor/msft.h"
+#include "monitor/emulator.h"
#include "btdev.h"
#define AL_SIZE 16
@@ -142,6 +143,8 @@ struct btdev {
const struct btdev_cmd *cmds;
uint16_t msft_opcode;
const struct btdev_cmd *msft_cmds;
+ uint16_t emu_opcode;
+ const struct btdev_cmd *emu_cmds;
bool aosp_capable;
uint16_t default_link_policy;
@@ -6586,12 +6589,11 @@ static const struct btdev_cmd *run_cmd(struct btdev *btdev,
return NULL;
}
-static const struct btdev_cmd *msft_cmd(struct btdev *btdev, const void *data,
- uint8_t len)
+static const struct btdev_cmd *vnd_cmd(struct btdev *btdev, uint8_t op,
+ const struct btdev_cmd *cmd,
+ const void *data, uint8_t len)
{
- const struct btdev_cmd *cmd;
-
- for (cmd = btdev->msft_cmds; cmd->func; cmd++) {
+ for (; cmd && cmd->func; cmd++) {
if (cmd->opcode != ((uint8_t *)data)[0])
continue;
@@ -6599,10 +6601,10 @@ static const struct btdev_cmd *msft_cmd(struct btdev *btdev, const void *data,
}
util_debug(btdev->debug_callback, btdev->debug_data,
- "Unsupported MSFT subcommand 0x%2.2x\n",
+ "Unsupported Vendor subcommand 0x%2.2x\n",
((uint8_t *)data)[0]);
- cmd_status(btdev, BT_HCI_ERR_UNKNOWN_COMMAND, btdev->msft_opcode);
+ cmd_status(btdev, BT_HCI_ERR_UNKNOWN_COMMAND, op);
return NULL;
}
@@ -6612,8 +6614,11 @@ static const struct btdev_cmd *default_cmd(struct btdev *btdev, uint16_t opcode,
{
const struct btdev_cmd *cmd;
+ if (btdev->emu_opcode == opcode)
+ return vnd_cmd(btdev, opcode, btdev->emu_cmds, data, len);
+
if (btdev->msft_opcode == opcode)
- return msft_cmd(btdev, data, len);
+ return vnd_cmd(btdev, opcode, btdev->msft_cmds, data, len);
for (cmd = btdev->cmds; cmd->func; cmd++) {
if (cmd->opcode != opcode)
@@ -7049,3 +7054,50 @@ int btdev_set_aosp_capable(struct btdev *btdev, bool enable)
return 0;
}
+
+static int cmd_emu_test_event(struct btdev *dev, const void *data, uint8_t len)
+{
+ const struct emu_cmd_test_event *cmd = data;
+ uint8_t status = BT_HCI_ERR_SUCCESS;
+
+ if (len < sizeof(*cmd)) {
+ status = BT_HCI_ERR_INVALID_PARAMETERS;
+ goto done;
+ }
+
+ send_event(dev, cmd->evt, cmd->data, len - sizeof(*cmd));
+
+done:
+ cmd_complete(dev, dev->emu_opcode, &status, sizeof(status));
+
+ return 0;
+}
+
+#define CMD_EMU \
+ CMD(EMU_SUBCMD_TEST_EVENT, cmd_emu_test_event, NULL)
+
+static const struct btdev_cmd cmd_emu[] = {
+ CMD_EMU,
+ {}
+};
+
+int btdev_set_emu_opcode(struct btdev *btdev, uint16_t opcode)
+{
+ if (!btdev)
+ return -EINVAL;
+
+ switch (btdev->type) {
+ case BTDEV_TYPE_BREDRLE:
+ case BTDEV_TYPE_BREDRLE50:
+ case BTDEV_TYPE_BREDRLE52:
+ btdev->emu_opcode = opcode;
+ btdev->emu_cmds = cmd_emu;
+ return 0;
+ case BTDEV_TYPE_BREDR:
+ case BTDEV_TYPE_LE:
+ case BTDEV_TYPE_AMP:
+ case BTDEV_TYPE_BREDR20:
+ default:
+ return -ENOTSUP;
+ }
+}
diff --git a/emulator/btdev.h b/emulator/btdev.h
index 9493938c6..228bf205c 100644
--- a/emulator/btdev.h
+++ b/emulator/btdev.h
@@ -102,3 +102,4 @@ bool btdev_del_hook(struct btdev *btdev, enum btdev_hook_type type,
int btdev_set_msft_opcode(struct btdev *btdev, uint16_t opcode);
int btdev_set_aosp_capable(struct btdev *btdev, bool enable);
+int btdev_set_emu_opcode(struct btdev *btdev, uint16_t opcode);
diff --git a/emulator/main.c b/emulator/main.c
index 3c215efbc..bd9831449 100644
--- a/emulator/main.c
+++ b/emulator/main.c
@@ -193,6 +193,7 @@ int main(int argc, char *argv[])
if (debug_enabled)
vhci_set_debug(vhci, vhci_debug, UINT_TO_PTR(i), NULL);
+ vhci_set_emu_opcode(vhci, 0xfc10);
vhci_set_msft_opcode(vhci, 0xfc1e);
}
diff --git a/emulator/vhci.c b/emulator/vhci.c
index 014df87d2..4295e30ef 100644
--- a/emulator/vhci.c
+++ b/emulator/vhci.c
@@ -252,3 +252,8 @@ int vhci_set_aosp_capable(struct vhci *vhci, bool enable)
return vhci_debugfs_write(vhci, "aosp_capable", &val, sizeof(val));
}
+
+int vhci_set_emu_opcode(struct vhci *vhci, uint16_t opcode)
+{
+ return btdev_set_emu_opcode(vhci->btdev, opcode);
+}
diff --git a/emulator/vhci.h b/emulator/vhci.h
index a601d3934..c42e8bde1 100644
--- a/emulator/vhci.h
+++ b/emulator/vhci.h
@@ -27,3 +27,4 @@ int vhci_set_force_suspend(struct vhci *vhci, bool enable);
int vhci_set_force_wakeup(struct vhci *vhci, bool enable);
int vhci_set_msft_opcode(struct vhci *vhci, uint16_t opcode);
int vhci_set_aosp_capable(struct vhci *vhci, bool enable);
+int vhci_set_emu_opcode(struct vhci *vhci, uint16_t opcode);
diff --git a/monitor/emulator.h b/monitor/emulator.h
new file mode 100644
index 000000000..dc9351e4e
--- /dev/null
+++ b/monitor/emulator.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2011-2014 Intel Corporation
+ * Copyright (C) 2002-2010 Marcel Holtmann <[email protected]>
+ *
+ *
+ */
+
+#define EMU_SUBCMD_TEST_EVENT 0x00
+
+struct emu_cmd_test_event {
+ uint8_t subcmd;
+ uint8_t evt;
+ uint8_t data[];
+} __attribute__((packed));
--
2.33.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=602734
---Test result---
Test Summary:
CheckPatch FAIL 1.56 seconds
GitLint FAIL 1.00 seconds
Prep - Setup ELL PASS 47.91 seconds
Build - Prep PASS 0.64 seconds
Build - Configure PASS 9.26 seconds
Build - Make PASS 1615.44 seconds
Make Check PASS 13.15 seconds
Make Distcheck FAIL 147.40 seconds
Build w/ext ELL - Configure PASS 10.01 seconds
Build w/ext ELL - Make PASS 1559.50 seconds
Incremental Build with patchesPASS 0.00 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[RFC,BlueZ,v2] emulator: Add support for vendor commands
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#297: FILE: monitor/emulator.h:18:
+} __attribute__((packed));
/github/workspace/src/12703916.patch total: 0 errors, 1 warnings, 146 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12703916.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[RFC,BlueZ,v2] emulator: Add support for vendor commands
14: B3 Line contains hard tab characters (\t): " ."$........"
##############################
Test: Make Distcheck - FAIL
Desc: Run distcheck to check the distribution
Output:
../../emulator/btdev.c:37:10: fatal error: monitor/emulator.h: No such file or directory
37 | #include "monitor/emulator.h"
| ^~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [Makefile:8003: emulator/android_android_tester-btdev.o] Error 1
make[1]: *** [Makefile:4302: all] Error 2
make: *** [Makefile:11227: distcheck] Error 1
---
Regards,
Linux Bluetooth
Hi,
On Tue, Jan 4, 2022 at 6:21 PM <[email protected]> wrote:
>
> This is automated email and please do not reply to this email!
>
> Dear submitter,
>
> Thank you for submitting the patches to the linux bluetooth mailing list.
> This is a CI test results with your patch series:
> PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=602734
>
> ---Test result---
>
> Test Summary:
> CheckPatch FAIL 1.56 seconds
> GitLint FAIL 1.00 seconds
> Prep - Setup ELL PASS 47.91 seconds
> Build - Prep PASS 0.64 seconds
> Build - Configure PASS 9.26 seconds
> Build - Make PASS 1615.44 seconds
> Make Check PASS 13.15 seconds
> Make Distcheck FAIL 147.40 seconds
> Build w/ext ELL - Configure PASS 10.01 seconds
> Build w/ext ELL - Make PASS 1559.50 seconds
> Incremental Build with patchesPASS 0.00 seconds
>
> Details
> ##############################
> Test: CheckPatch - FAIL
> Desc: Run checkpatch.pl script with rule in .checkpatch.conf
> Output:
> [RFC,BlueZ,v2] emulator: Add support for vendor commands
> WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
> #297: FILE: monitor/emulator.h:18:
> +} __attribute__((packed));
>
> /github/workspace/src/12703916.patch total: 0 errors, 1 warnings, 146 lines checked
>
> NOTE: For some of the reported defects, checkpatch may be able to
> mechanically convert to the typical style using --fix or --fix-inplace.
>
> /github/workspace/src/12703916.patch has style problems, please review.
>
> NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
>
> NOTE: If any of the errors are false positives, please report
> them to the maintainer, see CHECKPATCH in MAINTAINERS.
>
>
> ##############################
> Test: GitLint - FAIL
> Desc: Run gitlint with rule in .gitlint
> Output:
> [RFC,BlueZ,v2] emulator: Add support for vendor commands
> 14: B3 Line contains hard tab characters (\t): " ."$........"
>
>
> ##############################
> Test: Make Distcheck - FAIL
> Desc: Run distcheck to check the distribution
> Output:
> ../../emulator/btdev.c:37:10: fatal error: monitor/emulator.h: No such file or directory
> 37 | #include "monitor/emulator.h"
> | ^~~~~~~~~~~~~~~~~~~~
> compilation terminated.
> make[2]: *** [Makefile:8003: emulator/android_android_tester-btdev.o] Error 1
> make[1]: *** [Makefile:4302: all] Error 2
> make: *** [Makefile:11227: distcheck] Error 1
>
>
>
>
> ---
> Regards,
> Linux Bluetooth
Pushed.
--
Luiz Augusto von Dentz