Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Silabs] Rename BLE flags #37628

Merged
merged 3 commits into from
Feb 18, 2025
Merged

[Silabs] Rename BLE flags #37628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edc5b8b
Rename BLE flags
arun-silabs Feb 18, 2025
304d163
Restyled by clang-format
restyled-commits Feb 18, 2025
53963ff
Merge branch 'master' into rename_ble_flags
arun-silabs Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/platform/silabs/BLEManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
// ===== Private members reserved for use by this class only.
enum class Flags : uint16_t
{
kAdvertisingEnabled = 0x0001,
kFastAdvertisingEnabled = 0x0002,
kAdvertising = 0x0004,
kRestartAdvertising = 0x0008,
kEFRBLEStackInitialized = 0x0010,
kDeviceNameSet = 0x0020,
kExtAdvertisingEnabled = 0x0040,
kAdvertisingEnabled = 0x0001,
kFastAdvertisingEnabled = 0x0002,
kAdvertising = 0x0004,
kRestartAdvertising = 0x0008,
kSiLabsBLEStackInitialize = 0x0010,
kDeviceNameSet = 0x0020,
kExtAdvertisingEnabled = 0x0040,
};

enum
Expand Down
4 changes: 2 additions & 2 deletions src/platform/silabs/efr32/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ void BLEManagerImpl::DriveBLEState(void)
CHIP_ERROR err = CHIP_NO_ERROR;

// Check if BLE stack is initialized
VerifyOrExit(mFlags.Has(Flags::kEFRBLEStackInitialized), /* */);
VerifyOrExit(mFlags.Has(Flags::kSiLabsBLEStackInitialize), /* */);

// Start advertising if needed...
if (mServiceMode == ConnectivityManager::kCHIPoBLEServiceMode_Enabled && mFlags.Has(Flags::kAdvertisingEnabled) &&
Expand Down Expand Up @@ -657,7 +657,7 @@ void BLEManagerImpl::UpdateMtu(volatile sl_bt_msg_t * evt)

void BLEManagerImpl::HandleBootEvent(void)
{
mFlags.Set(Flags::kEFRBLEStackInitialized);
mFlags.Set(Flags::kSiLabsBLEStackInitialize);
PlatformMgr().ScheduleWork(DriveBLEState, 0);
}

Expand Down
4 changes: 2 additions & 2 deletions src/platform/silabs/rs911x/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ void BLEManagerImpl::DriveBLEState(void)
CHIP_ERROR err = CHIP_NO_ERROR;

// Check if BLE stack is initialized ( TODO )
VerifyOrExit(mFlags.Has(Flags::kEFRBLEStackInitialized), /* */);
VerifyOrExit(mFlags.Has(Flags::kSiLabsBLEStackInitialize), /* */);

// Start advertising if needed...
if (mServiceMode == ConnectivityManager::kCHIPoBLEServiceMode_Enabled && mFlags.Has(Flags::kAdvertisingEnabled) &&
Expand Down Expand Up @@ -804,7 +804,7 @@ void BLEManagerImpl::UpdateMtu(const SilabsBleWrapper::sl_wfx_msg_t & evt)

void BLEManagerImpl::HandleBootEvent(void)
{
mFlags.Set(Flags::kEFRBLEStackInitialized);
mFlags.Set(Flags::kSiLabsBLEStackInitialize);
PlatformMgr().ScheduleWork(DriveBLEState, 0);
}

Expand Down
Loading