diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-21 08:00:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-21 08:00:22 +0000 |
| commit | d7eddb60fa4a0dca3ce91c3907c205b33896068e (patch) | |
| tree | ebec47b7f0f6bb4384f79431f47f3475b6d867fc | |
| parent | 7ec072dd9b8922104c8d439521bc9ec05287dedf (diff) | |
| parent | ebe68cbf4a589f0e48a971a9df2923fbf12dcfdc (diff) | |
| download | netsim-gki13-boot-release.tar.gz | |
Snap for 9203002 from ebe68cbf4a589f0e48a971a9df2923fbf12dcfdc to gki13-boot-releasegki13-boot-release
Change-Id: Ib5afbad8a17837236752f8db8856d25ec24f7237
| -rw-r--r-- | src/hci/bluetooth_chip_emulator.cc | 3 | ||||
| -rw-r--r-- | src/proto/startup.proto | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/hci/bluetooth_chip_emulator.cc b/src/hci/bluetooth_chip_emulator.cc index 2432e84..bc90f93 100644 --- a/src/hci/bluetooth_chip_emulator.cc +++ b/src/hci/bluetooth_chip_emulator.cc @@ -18,6 +18,7 @@ #include <filesystem> #include <iostream> #include <memory> +#include <unordered_map> #include <utility> #include "controller/chip.h" @@ -158,7 +159,7 @@ class BluetoothChipEmulatorImpl : public BluetoothChipEmulator { } private: - std::vector<std::shared_ptr<controller::Chip>> id_to_chip_; + std::unordered_map<size_t, std::shared_ptr<controller::Chip>> id_to_chip_; size_t phy_low_energy_index_; size_t phy_classic_index_; diff --git a/src/proto/startup.proto b/src/proto/startup.proto index e5d3aa5..6840a9a 100644 --- a/src/proto/startup.proto +++ b/src/proto/startup.proto @@ -27,12 +27,12 @@ package netsim.startup; * netsim -s ' * {"devices": [ * {serial: "emulator-5554", - * chips: [{type: "WIFI", fdIn: 1, fdOut: 2}, - * {type: "BLUETOOTH", fdIn: 20, fdOut:21}] + * chips: [{kind: "WIFI", fdIn: 1, fdOut: 2}, + * {kind: "BLUETOOTH", fdIn: 20, fdOut:21}] * }, * {serial: "emulator-5555", - * chips: [{type: "BLUETOOTH", fdIn: 3, fdOut: 4}, - * {type: "UWB", fdIn: 5, fdOut: 6, model: "DW300"}] + * chips: [{kind: "BLUETOOTH", fdIn: 3, fdOut: 4}, + * {kind: "UWB", fdIn: 5, fdOut: 6, model: "DW300"}] * } * ] * }' |