Skip to content

Commit bfca97f

Browse files
axelnxprestyled-commits
authored and
erwinpan1
committed
[NXP][Zephyr] Use common wifi port for Zephyr (project-chip#32143)
* [NXP][Zephyr] Use common wifi port for Zephyr Move current NXP Zephyr wifi port to a common place, to be shared with other zephyr platforms. Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> * Restyled by gn * [NXP][platform][zephyr] Lower CHIP task priority Lower CHIP task priority to give margin for higher priority system tasks. Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> --------- Signed-off-by: Axel Le Bourhis <axel.lebourhis@nxp.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent ad08893 commit bfca97f

10 files changed

+36
-36
lines changed

‎src/platform/nxp/zephyr/wifi/ConnectivityManagerImplWiFi.cpp ‎src/platform/Zephyr/wifi/ConnectivityManagerImplWiFi.cpp

File renamed without changes.

‎src/platform/nxp/zephyr/wifi/ConnectivityManagerImplWiFi.h ‎src/platform/Zephyr/wifi/ConnectivityManagerImplWiFi.h

File renamed without changes.

‎src/platform/nxp/zephyr/wifi/WiFiManager.cpp ‎src/platform/Zephyr/wifi/WiFiManager.cpp

File renamed without changes.

‎src/platform/nxp/zephyr/wifi/WiFiManager.h ‎src/platform/Zephyr/wifi/WiFiManager.h

File renamed without changes.

‎src/platform/nxp/zephyr/wifi/NxpWifiDriver.cpp ‎src/platform/Zephyr/wifi/ZephyrWifiDriver.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include "NxpWifiDriver.h"
18+
#include "ZephyrWifiDriver.h"
1919

2020
#include <platform/KeyValueStoreManager.h>
2121

@@ -32,13 +32,13 @@ namespace chip {
3232
namespace DeviceLayer {
3333
namespace NetworkCommissioning {
3434

35-
size_t NxpWifiDriver::WiFiNetworkIterator::Count()
35+
size_t ZephyrWifiDriver::WiFiNetworkIterator::Count()
3636
{
3737
VerifyOrReturnValue(mDriver != nullptr, 0);
3838
return mDriver->mStagingNetwork.IsConfigured() ? 1 : 0;
3939
}
4040

41-
bool NxpWifiDriver::WiFiNetworkIterator::Next(Network & item)
41+
bool ZephyrWifiDriver::WiFiNetworkIterator::Next(Network & item)
4242
{
4343
// we assume only one network is actually supported
4444
// TODO: verify if this can be extended
@@ -67,7 +67,7 @@ bool NxpWifiDriver::WiFiNetworkIterator::Next(Network & item)
6767
return true;
6868
}
6969

70-
bool NxpWifiScanResponseIterator::Next(WiFiScanResponse & item)
70+
bool ZephyrWifiScanResponseIterator::Next(WiFiScanResponse & item)
7171
{
7272
if (mResultId < mResultCount)
7373
{
@@ -77,14 +77,14 @@ bool NxpWifiScanResponseIterator::Next(WiFiScanResponse & item)
7777
return false;
7878
}
7979

80-
void NxpWifiScanResponseIterator::Release()
80+
void ZephyrWifiScanResponseIterator::Release()
8181
{
8282
mResultId = mResultCount = 0;
8383
Platform::MemoryFree(mResults);
8484
mResults = nullptr;
8585
}
8686

87-
void NxpWifiScanResponseIterator::Add(const WiFiScanResponse & result)
87+
void ZephyrWifiScanResponseIterator::Add(const WiFiScanResponse & result)
8888
{
8989
void * newResults = Platform::MemoryRealloc(mResults, (mResultCount + 1) * sizeof(WiFiScanResponse));
9090

@@ -95,7 +95,7 @@ void NxpWifiScanResponseIterator::Add(const WiFiScanResponse & result)
9595
}
9696
}
9797

98-
CHIP_ERROR NxpWifiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
98+
CHIP_ERROR ZephyrWifiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
9999
{
100100
mpNetworkStatusChangeCallback = networkStatusChangeCallback;
101101

@@ -113,7 +113,7 @@ CHIP_ERROR NxpWifiDriver::Init(NetworkStatusChangeCallback * networkStatusChange
113113
return CHIP_NO_ERROR;
114114
}
115115

116-
void NxpWifiDriver::OnNetworkStatusChanged(Status status)
116+
void ZephyrWifiDriver::OnNetworkStatusChanged(Status status)
117117
{
118118
if (status == Status::kSuccess)
119119
{
@@ -132,20 +132,20 @@ void NxpWifiDriver::OnNetworkStatusChanged(Status status)
132132
}
133133
}
134134

135-
void NxpWifiDriver::Shutdown()
135+
void ZephyrWifiDriver::Shutdown()
136136
{
137137
mpNetworkStatusChangeCallback = nullptr;
138138
}
139139

140-
CHIP_ERROR NxpWifiDriver::CommitConfiguration()
140+
CHIP_ERROR ZephyrWifiDriver::CommitConfiguration()
141141
{
142142
ReturnErrorOnFailure(KeyValueStoreMgr().Put(kPassKey, mStagingNetwork.pass, mStagingNetwork.passLen));
143143
ReturnErrorOnFailure(KeyValueStoreMgr().Put(kSsidKey, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
144144

145145
return CHIP_NO_ERROR;
146146
}
147147

148-
CHIP_ERROR NxpWifiDriver::RevertConfiguration()
148+
CHIP_ERROR ZephyrWifiDriver::RevertConfiguration()
149149
{
150150
LoadFromStorage();
151151

@@ -172,8 +172,8 @@ CHIP_ERROR NxpWifiDriver::RevertConfiguration()
172172
return CHIP_NO_ERROR;
173173
}
174174

175-
Status NxpWifiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
176-
uint8_t & outNetworkIndex)
175+
Status ZephyrWifiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
176+
uint8_t & outNetworkIndex)
177177
{
178178
outDebugText = {};
179179
outNetworkIndex = 0;
@@ -191,7 +191,7 @@ Status NxpWifiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, Mu
191191
return Status::kSuccess;
192192
}
193193

194-
Status NxpWifiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
194+
Status ZephyrWifiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
195195
{
196196
outDebugText = {};
197197
outNetworkIndex = 0;
@@ -202,7 +202,7 @@ Status NxpWifiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDeb
202202
return Status::kSuccess;
203203
}
204204

205-
Status NxpWifiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
205+
Status ZephyrWifiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
206206
{
207207
outDebugText = {};
208208

@@ -213,7 +213,7 @@ Status NxpWifiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableC
213213
return Status::kSuccess;
214214
}
215215

216-
void NxpWifiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
216+
void ZephyrWifiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
217217
{
218218
Status status = Status::kSuccess;
219219
WiFiManager::StationStatus stationStatus;
@@ -252,7 +252,7 @@ void NxpWifiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callbac
252252
}
253253
}
254254

255-
void NxpWifiDriver::LoadFromStorage()
255+
void ZephyrWifiDriver::LoadFromStorage()
256256
{
257257
WiFiManager::WiFiNetwork network;
258258

@@ -262,20 +262,20 @@ void NxpWifiDriver::LoadFromStorage()
262262
mStagingNetwork = network;
263263
}
264264

265-
void NxpWifiDriver::OnScanWiFiNetworkDone(WiFiManager::WiFiRequestStatus status)
265+
void ZephyrWifiDriver::OnScanWiFiNetworkDone(WiFiManager::WiFiRequestStatus status)
266266
{
267267
VerifyOrReturn(mScanCallback != nullptr);
268268
mScanCallback->OnFinished(status == WiFiManager::WiFiRequestStatus::SUCCESS ? Status::kSuccess : Status::kUnknownError,
269269
CharSpan(), &mScanResponseIterator);
270270
mScanCallback = nullptr;
271271
}
272272

273-
void NxpWifiDriver::OnScanWiFiNetworkResult(const WiFiScanResponse & response)
273+
void ZephyrWifiDriver::OnScanWiFiNetworkResult(const WiFiScanResponse & response)
274274
{
275275
mScanResponseIterator.Add(response);
276276
}
277277

278-
void NxpWifiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
278+
void ZephyrWifiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
279279
{
280280
mScanCallback = callback;
281281
CHIP_ERROR error = WiFiManager::Instance().Scan(

‎src/platform/nxp/zephyr/wifi/NxpWifiDriver.h ‎src/platform/Zephyr/wifi/ZephyrWifiDriver.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr uint8_t kMaxWiFiNetworks = 1;
2929
constexpr uint8_t kWiFiScanNetworksTimeOutSeconds = 10;
3030
constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds = 35;
3131

32-
class NxpWifiScanResponseIterator : public Iterator<WiFiScanResponse>
32+
class ZephyrWifiScanResponseIterator : public Iterator<WiFiScanResponse>
3333
{
3434
public:
3535
size_t Count() override { return mResultCount; }
@@ -43,7 +43,7 @@ class NxpWifiScanResponseIterator : public Iterator<WiFiScanResponse>
4343
WiFiScanResponse * mResults = nullptr;
4444
};
4545

46-
class NxpWifiDriver final : public WiFiDriver
46+
class ZephyrWifiDriver final : public WiFiDriver
4747
{
4848
public:
4949
// Define non-volatile storage keys for SSID and password.
@@ -54,14 +54,14 @@ class NxpWifiDriver final : public WiFiDriver
5454
class WiFiNetworkIterator final : public NetworkIterator
5555
{
5656
public:
57-
WiFiNetworkIterator(NxpWifiDriver * aDriver) : mDriver(aDriver) {}
57+
WiFiNetworkIterator(ZephyrWifiDriver * aDriver) : mDriver(aDriver) {}
5858
size_t Count() override;
5959
bool Next(Network & item) override;
6060
void Release() override { delete this; }
6161
~WiFiNetworkIterator() = default;
6262

6363
private:
64-
NxpWifiDriver * mDriver;
64+
ZephyrWifiDriver * mDriver;
6565
bool mExhausted{ false };
6666
};
6767

@@ -87,9 +87,9 @@ class NxpWifiDriver final : public WiFiDriver
8787
uint8_t & outNetworkIndex) override;
8888
void ScanNetworks(ByteSpan ssid, ScanCallback * callback) override;
8989

90-
static NxpWifiDriver & Instance()
90+
static ZephyrWifiDriver & Instance()
9191
{
92-
static NxpWifiDriver sInstance;
92+
static ZephyrWifiDriver sInstance;
9393
return sInstance;
9494
}
9595

@@ -103,7 +103,7 @@ class NxpWifiDriver final : public WiFiDriver
103103
ConnectCallback * mpConnectCallback{ nullptr };
104104
NetworkStatusChangeCallback * mpNetworkStatusChangeCallback{ nullptr };
105105
WiFiManager::WiFiNetwork mStagingNetwork;
106-
NxpWifiScanResponseIterator mScanResponseIterator;
106+
ZephyrWifiScanResponseIterator mScanResponseIterator;
107107
ScanCallback * mScanCallback{ nullptr };
108108
};
109109

‎src/platform/nxp/zephyr/BUILD.gn

+6-6
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ static_library("nxp_zephyr") {
8787
sources += [
8888
"../../Zephyr/InetUtils.cpp",
8989
"../../Zephyr/InetUtils.h",
90-
"wifi/ConnectivityManagerImplWiFi.cpp",
91-
"wifi/ConnectivityManagerImplWiFi.h",
92-
"wifi/NxpWifiDriver.cpp",
93-
"wifi/NxpWifiDriver.h",
94-
"wifi/WiFiManager.cpp",
95-
"wifi/WiFiManager.h",
90+
"../../Zephyr/wifi/ConnectivityManagerImplWiFi.cpp",
91+
"../../Zephyr/wifi/ConnectivityManagerImplWiFi.h",
92+
"../../Zephyr/wifi/WiFiManager.cpp",
93+
"../../Zephyr/wifi/WiFiManager.h",
94+
"../../Zephyr/wifi/ZephyrWifiDriver.cpp",
95+
"../../Zephyr/wifi/ZephyrWifiDriver.h",
9696
]
9797
}
9898

‎src/platform/nxp/zephyr/CHIPDevicePlatformConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
// ========== Platform-specific Configuration Overrides =========
106106

107107
#ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
108-
#define CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY (K_PRIO_PREEMPT(1))
108+
#define CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY (K_PRIO_PREEMPT(5))
109109
#endif // CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
110110

111111
#ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE

‎src/platform/nxp/zephyr/ConnectivityManagerImpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#endif
3737

3838
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
39-
#include "wifi/ConnectivityManagerImplWiFi.h"
39+
#include <platform/Zephyr/wifi/ConnectivityManagerImplWiFi.h>
4040
#else
4141
#include <platform/internal/GenericConnectivityManagerImpl_NoWiFi.h>
4242
#endif

‎src/platform/nxp/zephyr/DiagnosticDataProviderImplNxp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "DiagnosticDataProviderImplNxp.h"
2525

2626
#ifdef CONFIG_WIFI_NXP
27-
#include <platform/nxp/zephyr/wifi/WiFiManager.h>
27+
#include <platform/Zephyr/wifi/WiFiManager.h>
2828
#endif
2929

3030
namespace chip {

0 commit comments

Comments
 (0)