aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-06-10 00:50:39 +0200
committerSven Gothel <[email protected]>2020-06-10 00:50:39 +0200
commit345aa52cfbf20db53fd76c3b36e1432a9da1c937 (patch)
tree76e545d28df0b8e89e04661d457060ca685d45ea
parent03b2f7b0bff114f9fc39abcf9bc80411c320d9cc (diff)
DBTManager: Merge private declaration blocks
-rw-r--r--api/direct_bt/DBTManager.hpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/api/direct_bt/DBTManager.hpp b/api/direct_bt/DBTManager.hpp
index fc16821e..f62b7626 100644
--- a/api/direct_bt/DBTManager.hpp
+++ b/api/direct_bt/DBTManager.hpp
@@ -52,15 +52,6 @@ namespace direct_bt {
* </p>
*/
class DBTManager : public JavaUplink {
- private:
- struct WhitelistElem {
- int dev_id;
- EUI48 address;
- BDAddressType address_type;
- HCIWhitelistConnectType ctype;
- };
- std::vector<std::shared_ptr<WhitelistElem>> whitelist;
-
public:
enum Defaults : int {
/* BT Core Spec v5.2: Vol 3, Part F 3.2.8: Maximum length of an attribute value. */
@@ -76,6 +67,14 @@ namespace direct_bt {
static const pid_t pidSelf;
private:
+ struct WhitelistElem {
+ int dev_id;
+ EUI48 address;
+ BDAddressType address_type;
+ HCIWhitelistConnectType ctype;
+ };
+ std::vector<std::shared_ptr<WhitelistElem>> whitelist;
+
const BTMode btMode;
POctets rbuffer;
HCIComm comm;