Skip to content

Commit a25953c

Browse files
restyled-commitscrlonxp
authored andcommitted
Restyled by clang-format
1 parent a32bc18 commit a25953c

13 files changed

+128
-157
lines changed

examples/platform/linux/Options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct LinuxDeviceOptions
5050
bool mWiFi = false;
5151
bool mThread = false;
5252
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
53-
bool mWiFiPAF = false;
53+
bool mWiFiPAF = false;
5454
#endif
5555
#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE || CHIP_DEVICE_ENABLE_PORT_PARAMS
5656
uint16_t securedDevicePort = CHIP_PORT;

src/app/server/Server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
216216
.SetListenPort(mOperationalServicePort)
217217
#endif
218218
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
219-
,
219+
,
220220
Transport::WiFiPAFListenParameters(DeviceLayer::ConnectivityMgr().GetWiFiPAF())
221221
#endif
222222
);

src/controller/AutoCommissioner.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -587,10 +587,10 @@ CHIP_ERROR AutoCommissioner::StartCommissioning(DeviceCommissioner * commissione
587587
mCommissioneeDeviceProxy = proxy;
588588
mNeedsNetworkSetup =
589589
(mCommissioneeDeviceProxy->GetSecureSession().Value()->AsSecureSession()->GetPeerAddress().GetTransportType() ==
590-
Transport::Type::kBle)
590+
Transport::Type::kBle)
591591
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
592592
|| (mCommissioneeDeviceProxy->GetSecureSession().Value()->AsSecureSession()->GetPeerAddress().GetTransportType() ==
593-
Transport::Type::kWiFiPAF)
593+
Transport::Type::kWiFiPAF)
594594
#endif
595595
;
596596
CHIP_ERROR err = CHIP_NO_ERROR;

src/controller/CHIPDeviceController.cpp

+6-9
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
#include <transport/raw/WiFiPAF.h>
7070
#endif
7171

72-
7372
#include <errno.h>
7473
#include <inttypes.h>
7574
#include <memory>
@@ -817,7 +816,8 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, Re
817816
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
818817
if (params.GetPeerAddress().GetTransportType() == Transport::Type::kWiFiPAF)
819818
{
820-
if (DeviceLayer::ConnectivityMgr().GetWiFiPAF()->GetWiFiPAFState() != Transport::WiFiPAFBase::State::kConnected) {
819+
if (DeviceLayer::ConnectivityMgr().GetWiFiPAF()->GetWiFiPAFState() != Transport::WiFiPAFBase::State::kConnected)
820+
{
821821
ChipLogProgress(Controller, "WiFi-PAF: Subscribing the NAN-USD devices");
822822
static constexpr useconds_t kWiFiStartCheckTimeUsec = WIFI_START_CHECK_TIME_USEC;
823823
static constexpr uint8_t kWiFiStartCheckAttempts = WIFI_START_CHECK_ATTEMPTS;
@@ -833,15 +833,12 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, Re
833833
usleep(kWiFiStartCheckTimeUsec);
834834
}
835835
}
836-
if (!DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted()) {
836+
if (!DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted())
837+
{
837838
ChipLogError(NotSpecified, "Wi-Fi Management taking too long to start - device configuration will be reset.");
838839
}
839840
mRendezvousParametersForDeviceDiscoveredOverWiFiPAF = params;
840-
DeviceLayer::ConnectivityMgr().WiFiPAFConnect(
841-
this,
842-
OnWiFiPAFSubscribeComplete,
843-
OnWiFiPAFSubscribeError
844-
);
841+
DeviceLayer::ConnectivityMgr().WiFiPAFConnect(this, OnWiFiPAFSubscribeComplete, OnWiFiPAFSubscribeError);
845842
ExitNow(CHIP_NO_ERROR);
846843
}
847844
ChipLogProgress(Controller, "WiFi-PAF: Request to subscrib the NAN-USD device complete");
@@ -924,7 +921,7 @@ void DeviceCommissioner::OnWiFiPAFSubscribeComplete(void * appState)
924921
if (nullptr != device && device->GetDeviceTransportType() == Transport::Type::kWiFiPAF)
925922
{
926923
auto remoteId = device->GetDeviceId();
927-
auto params = self->mRendezvousParametersForDeviceDiscoveredOverWiFiPAF;
924+
auto params = self->mRendezvousParametersForDeviceDiscoveredOverWiFiPAF;
928925

929926
self->mRendezvousParametersForDeviceDiscoveredOverWiFiPAF = RendezvousParameters();
930927
self->ReleaseCommissioneeDevice(device);

src/controller/CHIPDeviceControllerSystemState.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ inline constexpr size_t kMaxDeviceTransportBlePendingPackets = 1;
6363
inline constexpr size_t kMaxDeviceTransportWiFiPAFPendingPackets = 1;
6464
#endif
6565

66-
6766
#if INET_CONFIG_ENABLE_TCP_ENDPOINT
6867
inline constexpr size_t kMaxDeviceTransportTcpActiveConnectionCount = CHIP_CONFIG_MAX_ACTIVE_TCP_CONNECTIONS;
6968

@@ -106,7 +105,7 @@ struct DeviceControllerSystemStateParams
106105
Ble::BleLayer * bleLayer = nullptr;
107106
#endif
108107
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
109-
Transport::WiFiPAFLayer *wifipaf_layer = nullptr;
108+
Transport::WiFiPAFLayer * wifipaf_layer = nullptr;
110109
#endif
111110
Credentials::GroupDataProvider * groupDataProvider = nullptr;
112111
Crypto::SessionKeystore * sessionKeystore = nullptr;

src/controller/SetUpCodePairer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class DLL_EXPORT SetUpCodePairer : public DevicePairingDelegate
112112
CHIP_ERROR StartDiscoverOverSoftAP(SetupPayload & payload);
113113
CHIP_ERROR StopConnectOverSoftAP();
114114
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
115-
CHIP_ERROR StartDiscoverOverWiFiPAF(SetupPayload & payload);
116-
CHIP_ERROR StopConnectOverWiFiPAF();
115+
CHIP_ERROR StartDiscoverOverWiFiPAF(SetupPayload & payload);
116+
CHIP_ERROR StopConnectOverWiFiPAF();
117117
#endif
118118

119119
// Returns whether we have kicked off a new connection attempt.

src/include/platform/CHIPDeviceConfig.h

-1
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@
434434
#define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 0
435435
#endif
436436

437-
438437
// -------------------- WiFi AP Configuration --------------------
439438

440439
/**

src/include/platform/CHIPDeviceEvent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ struct ChipDeviceEvent final
490490
BLE_CONNECTION_OBJECT ConId;
491491
} CHIPoBLENotifyConfirm;
492492
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
493-
struct
493+
struct
494494
{
495495
chip::System::PacketBuffer * Data;
496496
} CHIPoWiFiPAFWriteReceived;

src/include/platform/ConnectivityManager.h

+5-9
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,10 @@ class ConnectivityManager
179179

180180
typedef void (*OnConnectionCompleteFunct)(void * appState);
181181
typedef void (*OnConnectionErrorFunct)(void * appState, CHIP_ERROR err);
182-
CHIP_ERROR WiFiPAFConnect(void * appState,
183-
OnConnectionCompleteFunct onSuccess,
184-
OnConnectionErrorFunct onError);
182+
CHIP_ERROR WiFiPAFConnect(void * appState, OnConnectionCompleteFunct onSuccess, OnConnectionErrorFunct onError);
185183
CHIP_ERROR WiFiPAFSend(chip::System::PacketBufferHandle && msgBuf);
186-
Transport::WiFiPAFBase * GetWiFiPAF();
187-
void SetWiFiPAF(Transport::WiFiPAFBase * pmWiFiPAF);
184+
Transport::WiFiPAFBase * GetWiFiPAF();
185+
void SetWiFiPAF(Transport::WiFiPAFBase * pmWiFiPAF);
188186
#endif
189187

190188
// WiFi AP methods
@@ -428,10 +426,8 @@ inline CHIP_ERROR ConnectivityManager::SetWiFiPAFAdvertisingEnabled(bool val)
428426
return static_cast<ImplClass *>(this)->_SetWiFiPAFAdvertisingEnabled(val);
429427
}
430428

431-
inline CHIP_ERROR ConnectivityManager::WiFiPAFConnect(
432-
void * appState,
433-
OnConnectionCompleteFunct onSuccess,
434-
OnConnectionErrorFunct onError)
429+
inline CHIP_ERROR ConnectivityManager::WiFiPAFConnect(void * appState, OnConnectionCompleteFunct onSuccess,
430+
OnConnectionErrorFunct onError)
435431
{
436432
return static_cast<ImplClass *>(this)->_WiFiPAFConnect(appState, onSuccess, onError);
437433
}

0 commit comments

Comments
 (0)