Skip to content

Commit

Permalink
Remove mention of the kFabricMembershipChange event. (#19688)
Browse files Browse the repository at this point in the history
This event does not exist; all of this is dead code.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Aug 19, 2022
1 parent 1d306e7 commit 2296152
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 22 deletions.
7 changes: 0 additions & 7 deletions src/include/platform/CHIPDeviceEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,6 @@ enum PublicEventTypes
*/
kServiceConnectivityChange,

/**
* Fabric Membership Change
*
* Signals a change in the device's membership in a chip fabric.
*/
kFabricMembershipChange,

/**
* Service Provisioning Change
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ void GenericConnectivityManagerImpl_Thread<ImplClass>::_OnPlatformEvent(const Ch
const bool threadAddrChanged = (event->Type == DeviceEventType::kThreadStateChange && event->ThreadStateChange.AddressChanged);
const bool threadNetDataChanged =
(event->Type == DeviceEventType::kThreadStateChange && event->ThreadStateChange.NetDataChanged);
const bool fabricMembershipChanged = (event->Type == DeviceEventType::kFabricMembershipChange);

if (threadConnChanged && event->ThreadConnectivityChange.Result == kConnectivity_Established)
{
Expand All @@ -51,7 +50,7 @@ void GenericConnectivityManagerImpl_Thread<ImplClass>::_OnPlatformEvent(const Ch

// If any of the above events has occurred, assess whether there's been a change in
// service connectivity via Thread.
if (threadConnChanged || threadAddrChanged || threadNetDataChanged || fabricMembershipChanged)
if (threadConnChanged || threadAddrChanged || threadNetDataChanged)
{
UpdateServiceConnectivity();
}
Expand Down
1 change: 0 additions & 1 deletion src/platform/Ameba/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
}
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:
case DeviceEventType::kWiFiConnectivityChange:
Expand Down
1 change: 0 additions & 1 deletion src/platform/CYW30739/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down
3 changes: 1 addition & 2 deletions src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include <ble/CHIPBleServiceData.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/logging/CHIPLogging.h>
#include <platform/internal/BLEManager.h>
#include <platform/CommissionableDataProvider.h>
#include <platform/internal/BLEManager.h>

#include "esp_bt.h"
#include "esp_bt_main.h"
Expand Down Expand Up @@ -304,7 +304,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:
case DeviceEventType::kWiFiConnectivityChange:
Expand Down
1 change: 0 additions & 1 deletion src/platform/ESP32/nimble/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:
case DeviceEventType::kWiFiConnectivityChange:
Expand Down
3 changes: 1 addition & 2 deletions src/platform/Linux/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <lib/support/CodeUtils.h>
#include <lib/support/SafeInt.h>
#include <new>
#include <platform/internal/BLEManager.h>
#include <platform/CommissionableDataProvider.h>
#include <platform/internal/BLEManager.h>

#include <cassert>
#include <type_traits>
Expand Down Expand Up @@ -251,7 +251,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
case DeviceEventType::kCHIPoBLEConnectionError:
HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;
case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down
1 change: 0 additions & 1 deletion src/platform/P6/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down
1 change: 0 additions & 1 deletion src/platform/Tizen/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)

HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;
case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:
break;
Expand Down
1 change: 0 additions & 1 deletion src/platform/Zephyr/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
err = HandleTXCharComplete(event);
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down
1 change: 0 additions & 1 deletion src/platform/bouffalolab/BL602/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
err = HandleTXCharComplete(event);
break;

case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down
1 change: 0 additions & 1 deletion src/platform/qpg/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
break;

// Generic CHIP events
case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down
1 change: 0 additions & 1 deletion src/platform/webos/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
case DeviceEventType::kCHIPoBLEConnectionError:
HandleConnectionError(event->CHIPoBLEConnectionError.ConId, event->CHIPoBLEConnectionError.Reason);
break;
case DeviceEventType::kFabricMembershipChange:
case DeviceEventType::kServiceProvisioningChange:
case DeviceEventType::kAccountPairingChange:

Expand Down

0 comments on commit 2296152

Please sign in to comment.