Loading system/gd/rust/common/src/init_flags.rs +5 −6 Original line number Diff line number Diff line Loading @@ -3,6 +3,9 @@ use paste::paste; use std::sync::Mutex; /// Deprecated immutable flag pub fn gd_acl_is_enabled() -> bool { true } macro_rules! init_flags { (flags: { $($flag:ident),* }, dependencies: { $($parent:ident => $child:ident),* }) => { Loading Loading @@ -52,7 +55,7 @@ macro_rules! init_flags { // TODO: acl should not be off if l2cap is on, but need to reconcile legacy code if self.gd_l2cap { self.gd_acl = false; // TODO This can never be turned off self.gd_acl = false; } self Loading Loading @@ -80,7 +83,6 @@ init_flags!( gd_advertising, gd_scanning, gd_security, gd_acl, gd_l2cap, gatt_robust_caching, btaa_hci, Loading @@ -89,11 +91,8 @@ init_flags!( }, dependencies: { gd_core => gd_security, gd_security => gd_acl, gd_l2cap => gd_scanning, gd_scanning => gd_advertising, gd_advertising => gd_acl, gd_link_policy => gd_acl gd_scanning => gd_advertising } ); Loading Loading
system/gd/rust/common/src/init_flags.rs +5 −6 Original line number Diff line number Diff line Loading @@ -3,6 +3,9 @@ use paste::paste; use std::sync::Mutex; /// Deprecated immutable flag pub fn gd_acl_is_enabled() -> bool { true } macro_rules! init_flags { (flags: { $($flag:ident),* }, dependencies: { $($parent:ident => $child:ident),* }) => { Loading Loading @@ -52,7 +55,7 @@ macro_rules! init_flags { // TODO: acl should not be off if l2cap is on, but need to reconcile legacy code if self.gd_l2cap { self.gd_acl = false; // TODO This can never be turned off self.gd_acl = false; } self Loading Loading @@ -80,7 +83,6 @@ init_flags!( gd_advertising, gd_scanning, gd_security, gd_acl, gd_l2cap, gatt_robust_caching, btaa_hci, Loading @@ -89,11 +91,8 @@ init_flags!( }, dependencies: { gd_core => gd_security, gd_security => gd_acl, gd_l2cap => gd_scanning, gd_scanning => gd_advertising, gd_advertising => gd_acl, gd_link_policy => gd_acl gd_scanning => gd_advertising } ); Loading