From cef94003fcedffe59df8abedbbeca85596b89f0c Mon Sep 17 00:00:00 2001 From: wyhong Date: Thu, 27 Jul 2023 15:34:09 +0800 Subject: [PATCH] fix restyle --- .../lighting-app/bouffalolab/bl602/BUILD.gn | 2 +- .../lighting-app/bouffalolab/bl702/BUILD.gn | 1 - .../platform/bouffalolab/common/plat/main.cpp | 1 - scripts/examples/gn_bouffalolab_example.sh | 1 - src/platform/bouffalolab/BL702/BUILD.gn | 4 +- .../BL702/ConfigurationManagerImpl.cpp | 2 +- .../BL702/ConnectivityManagerImpl.cpp | 28 ++++---- .../BL702/DiagnosticDataProviderImpl.cpp | 8 +-- .../BL702/NetworkCommissioningDriver.cpp | 65 ++++++++++--------- .../BL702/NetworkCommissioningDriver.h | 3 - .../bouffalolab/BL702/PlatformManagerImpl.cpp | 2 +- .../bouffalolab/BL702/WiFiInterface.c | 4 +- .../bouffalolab/BL702/WiFiInterface.h | 14 ++-- src/platform/bouffalolab/BL702L/BUILD.gn | 2 +- src/platform/bouffalolab/common/BLConfig.h | 4 +- src/platform/bouffalolab/common/args.gni | 2 +- third_party/bouffalolab/bl702/bl_iot_sdk.gni | 20 +++--- 17 files changed, 82 insertions(+), 81 deletions(-) diff --git a/examples/lighting-app/bouffalolab/bl602/BUILD.gn b/examples/lighting-app/bouffalolab/bl602/BUILD.gn index 922a5e8c727293..3470110722b5fe 100644 --- a/examples/lighting-app/bouffalolab/bl602/BUILD.gn +++ b/examples/lighting-app/bouffalolab/bl602/BUILD.gn @@ -20,8 +20,8 @@ import("${bouffalolab_iot_sdk_build_root}/bl602/bl_iot_sdk.gni") import("${bouffalolab_iot_sdk_build_root}/common/bouffalolab_executable.gni") import("${build_root}/config/defaults.gni") import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") -import("${chip_root}/src/platform/device.gni") import("${chip_root}/src/platform/bouffalolab/common/args.gni") +import("${chip_root}/src/platform/device.gni") import("${chip_root}/src/app/chip_data_model.gni") diff --git a/examples/lighting-app/bouffalolab/bl702/BUILD.gn b/examples/lighting-app/bouffalolab/bl702/BUILD.gn index d84154ed1954d3..47ba339669ca8e 100644 --- a/examples/lighting-app/bouffalolab/bl702/BUILD.gn +++ b/examples/lighting-app/bouffalolab/bl702/BUILD.gn @@ -140,7 +140,6 @@ bouffalolab_executable("lighting_app") { defines += [ "BL706_WIFI" ] } - if (defined(enable_cdc_module) && enable_cdc_module) { defines += [ "CFG_USB_CDC_ENABLE" ] } diff --git a/examples/platform/bouffalolab/common/plat/main.cpp b/examples/platform/bouffalolab/common/plat/main.cpp index 5066e4b0dbc9c9..bf04405bf78523 100644 --- a/examples/platform/bouffalolab/common/plat/main.cpp +++ b/examples/platform/bouffalolab/common/plat/main.cpp @@ -63,7 +63,6 @@ extern "C" { #include #endif -#include #include "board.h" #include } diff --git a/scripts/examples/gn_bouffalolab_example.sh b/scripts/examples/gn_bouffalolab_example.sh index 7fed611a6f8fa3..3942d796896027 100755 --- a/scripts/examples/gn_bouffalolab_example.sh +++ b/scripts/examples/gn_bouffalolab_example.sh @@ -34,7 +34,6 @@ bl702l_boards=("BL704L-DVK") bl702l_modules=("BL702L") bl702l_module_type="BL704l" - print_help() { bl602_boards_help="" for board in "${bl602_boards[@]}"; do diff --git a/src/platform/bouffalolab/BL702/BUILD.gn b/src/platform/bouffalolab/BL702/BUILD.gn index 52d93cae8a8f36..fcc8324b5121a7 100644 --- a/src/platform/bouffalolab/BL702/BUILD.gn +++ b/src/platform/bouffalolab/BL702/BUILD.gn @@ -76,9 +76,9 @@ static_library("BL702") { if (chip_enable_wifi) { sources += [ "ConfigurationManagerImpl.cpp", - "WiFiInterface.c", "ConnectivityManagerImpl.cpp", - "NetworkCommissioningDriver.cpp" + "NetworkCommissioningDriver.cpp", + "WiFiInterface.c", ] deps = [ "${chip_root}/src/lib/dnssd:platform_header" ] diff --git a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp index 53c6b9e3073903..ec685f82ac7547 100644 --- a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp +++ b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp @@ -50,4 +50,4 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryMACAddress(MutableByteSpan buf) #endif } // namespace DeviceLayer -} // namespace chip \ No newline at end of file +} // namespace chip diff --git a/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp index 3b6a0d2aee7cae..3f3465554bfad0 100644 --- a/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp +++ b/src/platform/bouffalolab/BL702/ConnectivityManagerImpl.cpp @@ -46,7 +46,8 @@ void ConnectivityManagerImpl::OnWiFiStationDisconnected() NetworkCommissioning::BLWiFiDriver::GetInstance().SetLastDisconnectReason(NULL); uint16_t reason = NetworkCommissioning::BLWiFiDriver::GetInstance().GetLastDisconnectReason(); - uint8_t associationFailureCause = chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kUnknown); + uint8_t associationFailureCause = + chip::to_underlying(chip::app::Clusters::WiFiNetworkDiagnostics::AssociationFailureCauseEnum::kUnknown); WiFiDiagnosticsDelegate * delegate = GetDiagnosticDataProvider().GetWiFiDiagnosticsDelegate(); if (delegate) { @@ -57,13 +58,13 @@ void ConnectivityManagerImpl::OnWiFiStationDisconnected() } } -extern "C" void wifiInterface_eventConnected(struct netif * interface) +extern "C" void wifiInterface_eventConnected(struct netif * interface) { ChipLogProgress(DeviceLayer, "wifiInterface_eventConnected"); ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Connecting_Succeeded); } -extern "C" void wifiInterface_eventDisconnected(struct netif * interface) +extern "C" void wifiInterface_eventDisconnected(struct netif * interface) { ChipLogProgress(DeviceLayer, "wifiInterface_eventDisconnected"); if (ConnectivityManager::kWiFiStationState_Connecting == ConnectivityMgrImpl().GetWiFiStationState()) @@ -76,29 +77,34 @@ extern "C" void wifiInterface_eventDisconnected(struct netif * interface) } } -extern "C" void wifiInterface_eventLinkStatusDone(struct netif * interface, netbus_fs_link_status_ind_cmd_msg_t *pkg_data) +extern "C" void wifiInterface_eventLinkStatusDone(struct netif * interface, netbus_fs_link_status_ind_cmd_msg_t * pkg_data) { ChipLogProgress(DeviceLayer, "wifiInterface_eventLinkStatusDone"); - struct bflbwifi_ap_record* record = &pkg_data->record; - if (record->link_status == BF1B_WIFI_LINK_STATUS_UP) { + struct bflbwifi_ap_record * record = &pkg_data->record; + if (record->link_status == BF1B_WIFI_LINK_STATUS_UP) + { ChipLogProgress(DeviceLayer, "link status up!"); - } else if (record->link_status == BF1B_WIFI_LINK_STATUS_DOWN){ + } + else if (record->link_status == BF1B_WIFI_LINK_STATUS_DOWN) + { ChipLogProgress(DeviceLayer, "link status down!"); ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Disconnecting); - } else { + } + else + { ChipLogProgress(DeviceLayer, "link status unknown!"); } } -extern "C" void wifiInterface_eventGotIP(struct netif * interface) +extern "C" void wifiInterface_eventGotIP(struct netif * interface) { ChipLogProgress(DeviceLayer, "wifiInterface_eventGotIP"); ConnectivityMgrImpl().OnConnectivityChanged(interface); ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Connected); } -extern "C" void wifiInterface_eventScanDone(struct netif * interface, netbus_fs_scan_ind_cmd_msg_t* pmsg) +extern "C" void wifiInterface_eventScanDone(struct netif * interface, netbus_fs_scan_ind_cmd_msg_t * pmsg) { ChipLogProgress(DeviceLayer, "wifiInterface_eventScanDone"); NetworkCommissioning::BLWiFiDriver::GetInstance().OnScanWiFiNetworkDone(pmsg); @@ -106,7 +112,7 @@ extern "C" void wifiInterface_eventScanDone(struct netif * interface, netbus_fs_ #endif #if !CHIP_DEVICE_CONFIG_ENABLE_THREAD -extern "C" void ethernetInterface_eventGotIP(struct netif * interface) +extern "C" void ethernetInterface_eventGotIP(struct netif * interface) { ChipLogProgress(DeviceLayer, "ethernetInterface_eventGotIP"); ConnectivityMgrImpl().OnConnectivityChanged(interface); diff --git a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp index 8188a4b3f5a7b1..1c93df0830875c 100644 --- a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp +++ b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp @@ -60,7 +60,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId) { struct bflbwifi_ap_record ap_info; - if(!wifiInterface_getApInfo(&ap_info)) + if (!wifiInterface_getApInfo(&ap_info)) { ChipLogError(DeviceLayer, "Failed to get ap info."); return CHIP_ERROR_INTERNAL; @@ -74,7 +74,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNe using app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum; struct bflbwifi_ap_record ap_info; - if(!wifiInterface_getApInfo(&ap_info)) + if (!wifiInterface_getApInfo(&ap_info)) { ChipLogError(DeviceLayer, "Failed to get ap info."); return CHIP_ERROR_INTERNAL; @@ -101,7 +101,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNu { struct bflbwifi_ap_record ap_info; - if(!wifiInterface_getApInfo(&ap_info)) + if (!wifiInterface_getApInfo(&ap_info)) { ChipLogError(DeviceLayer, "Failed to get ap info."); return CHIP_ERROR_INTERNAL; @@ -116,7 +116,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi) { struct bflbwifi_ap_record ap_info; - if(!wifiInterface_getApInfo(&ap_info)) + if (!wifiInterface_getApInfo(&ap_info)) { ChipLogError(DeviceLayer, "Failed to get ap info."); return CHIP_ERROR_INTERNAL; diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp index f227929f26304b..6087fce9d94f66 100644 --- a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp +++ b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp @@ -33,16 +33,17 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC size_t ssidLen = 0; size_t credentialsLen = 0; - err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, - sizeof(mSavedNetwork.ssid), &ssidLen); + err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid), + &ssidLen); SuccessOrExit(err); - err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials, sizeof(mSavedNetwork.credentials), &credentialsLen); + err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials, + sizeof(mSavedNetwork.credentials), &credentialsLen); SuccessOrExit(err); - mSavedNetwork.credentialsLen = credentialsLen; - mSavedNetwork.ssidLen = ssidLen; + mSavedNetwork.credentialsLen = credentialsLen; + mSavedNetwork.ssidLen = ssidLen; mSavedNetwork.credentials[mSavedNetwork.credentialsLen] = '\0'; - mSavedNetwork.ssid[mSavedNetwork.ssidLen] = '\0'; + mSavedNetwork.ssid[mSavedNetwork.ssidLen] = '\0'; mStagingNetwork = mSavedNetwork; mpScanCallback = nullptr; @@ -70,7 +71,8 @@ void BLWiFiDriver::Shutdown() CHIP_ERROR BLWiFiDriver::CommitConfiguration() { ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::CommitConfiguration"); - ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen)); + ReturnErrorOnFailure( + PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiSSID, mStagingNetwork.ssid, mStagingNetwork.ssidLen)); ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(BLConfig::kConfigKey_WiFiPassword, mStagingNetwork.credentials, mStagingNetwork.credentialsLen)); mSavedNetwork = mStagingNetwork; @@ -93,7 +95,7 @@ Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, Mut { outDebugText.reduce_size(0); outNetworkIndex = 0; - + VerifyOrReturnError(mStagingNetwork.ssidLen == 0 || NetworkMatch(mStagingNetwork, ssid), Status::kBoundsExceeded); VerifyOrReturnError(credentials.size() <= sizeof(mStagingNetwork.credentials), Status::kOutOfRange); VerifyOrReturnError(ssid.size() <= sizeof(mStagingNetwork.ssid), Status::kOutOfRange); @@ -111,7 +113,7 @@ Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebu { outDebugText.reduce_size(0); outNetworkIndex = 0; - + VerifyOrReturnError(NetworkMatch(mStagingNetwork, networkId), Status::kNetworkIDNotFound); mStagingNetwork.ssidLen = 0; @@ -130,20 +132,22 @@ Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCh CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen) { ChipLogProgress(NetworkProvisioning, "ConnectWiFiNetwork"); - wifiInterface_connect((char *)ssid, (char *)key); + wifiInterface_connect((char *) ssid, (char *) key); ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Connecting); return CHIP_NO_ERROR; } void BLWiFiDriver::OnConnectWiFiNetwork(bool isConnected) { - ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::OnConnectWiFiNetwork, isConnected=%d\r\n", isConnected); + ChipLogProgress(NetworkProvisioning, "BLWiFiDriver::OnConnectWiFiNetwork, isConnected=%d\r\n", isConnected); if (mpConnectCallback) { - if (isConnected) { + if (isConnected) + { mpConnectCallback->OnResult(Status::kSuccess, CharSpan(), 0); } - else { + else + { mpConnectCallback->OnResult(Status::kUnknownError, CharSpan(), 0); } mpConnectCallback = nullptr; @@ -157,13 +161,13 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback VerifyOrExit(NetworkMatch(mStagingNetwork, networkId), networkingStatus = Status::kNetworkIDNotFound); VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError); - ChipLogProgress(NetworkProvisioning, "BL702 Network Commissioning ConnectNetwork: SSID: %.*s", static_cast(networkId.size()), - networkId.data()); + ChipLogProgress(NetworkProvisioning, "BL702 Network Commissioning ConnectNetwork: SSID: %.*s", + static_cast(networkId.size()), networkId.data()); - mStagingNetwork.ssid[mStagingNetwork.ssidLen] = '\0'; + mStagingNetwork.ssid[mStagingNetwork.ssidLen] = '\0'; mStagingNetwork.credentials[mStagingNetwork.credentialsLen] = '\0'; - err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, - reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); + err = ConnectWiFiNetwork(reinterpret_cast(mStagingNetwork.ssid), mStagingNetwork.ssidLen, + reinterpret_cast(mStagingNetwork.credentials), mStagingNetwork.credentialsLen); mpConnectCallback = callback; exit: @@ -179,15 +183,15 @@ void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback } } -void BLWiFiDriver::OnScanWiFiNetworkDone(void *arg) +void BLWiFiDriver::OnScanWiFiNetworkDone(void * arg) { - netbus_fs_scan_ind_cmd_msg_t* pmsg = (netbus_fs_scan_ind_cmd_msg_t*) arg; + netbus_fs_scan_ind_cmd_msg_t * pmsg = (netbus_fs_scan_ind_cmd_msg_t *) arg; size_t i = 0, ap_num = pmsg->num; - WiFiScanResponse * pScanResponse, *p; + WiFiScanResponse *pScanResponse, *p; for (i = 0; i < pmsg->num; i++) { - if (mScanSpecific && !strcmp(mScanSSID, (char *)(pmsg->records[i].ssid))) + if (mScanSpecific && !strcmp(mScanSSID, (char *) (pmsg->records[i].ssid))) { ap_num = 1; break; @@ -205,24 +209,25 @@ void BLWiFiDriver::OnScanWiFiNetworkDone(void *arg) return; } - p = pScanResponse = (WiFiScanResponse *)malloc(sizeof(WiFiScanResponse) * ap_num); + p = pScanResponse = (WiFiScanResponse *) malloc(sizeof(WiFiScanResponse) * ap_num); for (i = 0; i < pmsg->num; i++) { - if(mScanSpecific && strcmp(mScanSSID, (char *)(pmsg->records[i].ssid))) + if (mScanSpecific && strcmp(mScanSSID, (char *) (pmsg->records[i].ssid))) { continue; } p->security.SetRaw(pmsg->records[i].auth_mode); - p->ssidLen = strlen((char *)pmsg->records[i].ssid) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength - ? strlen((char *)pmsg->records[i].ssid) : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength; + p->ssidLen = strlen((char *) pmsg->records[i].ssid) < chip::DeviceLayer::Internal::kMaxWiFiSSIDLength + ? strlen((char *) pmsg->records[i].ssid) + : chip::DeviceLayer::Internal::kMaxWiFiSSIDLength; p->channel = pmsg->records[i].channel; p->wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4; p->rssi = pmsg->records[i].rssi; memcpy(p->ssid, pmsg->records[i].ssid, p->ssidLen); memcpy(p->bssid, pmsg->records[i].bssid, 6); - if(mScanSpecific) + if (mScanSpecific) { break; } @@ -270,7 +275,7 @@ CHIP_ERROR GetConfiguredNetwork(Network & network) ChipLogProgress(DeviceLayer, "GetConfiguredNetwork"); - if(!wifiInterface_getApInfo(&ap_info)) + if (!wifiInterface_getApInfo(&ap_info)) { return CHIP_ERROR_INTERNAL; } @@ -318,7 +323,7 @@ void BLWiFiDriver::OnNetworkStatusChange() CHIP_ERROR BLWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event) { - //TODO: to be added + // TODO: to be added mLastDisconnectedReason = 0; return CHIP_NO_ERROR; @@ -355,7 +360,7 @@ bool BLWiFiDriver::WiFiNetworkIterator::Next(Network & item) item.connected = true; } } - + return true; } diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h index 84b25a27f65d89..48bf7d098c869f 100644 --- a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h +++ b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h @@ -29,7 +29,6 @@ constexpr uint8_t kWiFiScanNetworksTimeOutSeconds = 10; constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds = 20; } // namespace - class BLScanResponseIterator : public Iterator { public: @@ -55,7 +54,6 @@ class BLScanResponseIterator : public Iterator WiFiScanResponse * mpScanResults; }; - class BLWiFiDriver final : public WiFiDriver { public: @@ -117,7 +115,6 @@ class BLWiFiDriver final : public WiFiDriver } private: - bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId); CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid); diff --git a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp index 2e80dcdfd8f50d..db91cda12ed06b 100644 --- a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp +++ b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp @@ -62,7 +62,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void) // Initialize LwIP. tcpip_init(NULL, NULL); - + #if CHIP_DEVICE_CONFIG_ENABLE_WIFI wifiInterface_init(); #elif CHIP_DEVICE_CONFIG_ENABLE_THREAD diff --git a/src/platform/bouffalolab/BL702/WiFiInterface.c b/src/platform/bouffalolab/BL702/WiFiInterface.c index 4eb1ff9639ecc8..1634edc04256a0 100644 --- a/src/platform/bouffalolab/BL702/WiFiInterface.c +++ b/src/platform/bouffalolab/BL702/WiFiInterface.c @@ -108,7 +108,7 @@ bool wifiInterface_init() } virt_net_setup_callback(vnet_spi, virt_net_spi_event_cb, NULL); - netifapi_netif_set_default((struct netif *)&vnet_spi->netif); + netifapi_netif_set_default((struct netif *) &vnet_spi->netif); bl_route_hook_init(); @@ -158,4 +158,4 @@ bool wifiInterface_getApInfo(struct bflbwifi_ap_record * ap_info) void wifiInterface_startScan(void) { virt_net_scan(vnet_spi); -} \ No newline at end of file +} diff --git a/src/platform/bouffalolab/BL702/WiFiInterface.h b/src/platform/bouffalolab/BL702/WiFiInterface.h index d8980a2830abcc..e48e0da6cba63b 100644 --- a/src/platform/bouffalolab/BL702/WiFiInterface.h +++ b/src/platform/bouffalolab/BL702/WiFiInterface.h @@ -25,20 +25,20 @@ extern "C" { bool wifiInterface_init(); -struct netif *deviceInterface_getNetif(void); -void wifiInterface_getMacAddress(uint8_t *pmac); -void wifiInterface_connect(char *ssid, char * passwd); +struct netif * deviceInterface_getNetif(void); +void wifiInterface_getMacAddress(uint8_t * pmac); +void wifiInterface_connect(char * ssid, char * passwd); void wifiInterface_disconnect(void); -bool wifiInterface_getApInfo(struct bflbwifi_ap_record *ap_info); +bool wifiInterface_getApInfo(struct bflbwifi_ap_record * ap_info); void wifiInterface_startScan(void); void wifiInterface_eventConnected(struct netif * interface); void wifiInterface_eventDisconnected(struct netif * interface); void wifiInterface_eventApDisconnected(struct netif * interface); -void wifiInterface_eventLinkStatusDone(struct netif * interface, netbus_fs_link_status_ind_cmd_msg_t *pkg_data); +void wifiInterface_eventLinkStatusDone(struct netif * interface, netbus_fs_link_status_ind_cmd_msg_t * pkg_data); void wifiInterface_eventGotIP(struct netif * interface); -void wifiInterface_eventScanDone(struct netif * interface, netbus_fs_scan_ind_cmd_msg_t* pmsg); +void wifiInterface_eventScanDone(struct netif * interface, netbus_fs_scan_ind_cmd_msg_t * pmsg); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/src/platform/bouffalolab/BL702L/BUILD.gn b/src/platform/bouffalolab/BL702L/BUILD.gn index 3a3dd622d8a7e8..a6b2c3a745c858 100644 --- a/src/platform/bouffalolab/BL702L/BUILD.gn +++ b/src/platform/bouffalolab/BL702L/BUILD.gn @@ -57,7 +57,7 @@ static_library("BL702L") { "../common/BLEManagerImpl.h", ] } - + if (chip_enable_factory_data || chip_enable_factory_data_test) { if (chip_enable_factory_data) { defines = [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE" ] diff --git a/src/platform/bouffalolab/common/BLConfig.h b/src/platform/bouffalolab/common/BLConfig.h index 43e39aa996a2a5..7c336d82e2b6df 100644 --- a/src/platform/bouffalolab/common/BLConfig.h +++ b/src/platform/bouffalolab/common/BLConfig.h @@ -68,8 +68,8 @@ class BLConfig static constexpr const char * kConfigKey_GroupKeyIndex = ("group-key-index"); static constexpr const char * kConfigKey_LifeTimeCounter = ("life-time-counter"); - static constexpr const char * kConfigKey_WiFiSSID = ("bl-wifi-ssid"); - static constexpr const char * kConfigKey_WiFiPassword = ("bl-wifi-pass"); + static constexpr const char * kConfigKey_WiFiSSID = ("bl-wifi-ssid"); + static constexpr const char * kConfigKey_WiFiPassword = ("bl-wifi-pass"); /** Counter Keys, diagnostic information */ static constexpr const char * kCounterKey_RebootCount = ("reboot-count"); diff --git a/src/platform/bouffalolab/common/args.gni b/src/platform/bouffalolab/common/args.gni index a2bcb5ca82984e..e15c3f95daf34a 100644 --- a/src/platform/bouffalolab/common/args.gni +++ b/src/platform/bouffalolab/common/args.gni @@ -15,4 +15,4 @@ declare_args() { chip_enable_factory_data = false chip_enable_factory_data_test = false -} \ No newline at end of file +} diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni index 35dec6db840bf1..d6b5ac30fff066 100644 --- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni @@ -140,7 +140,6 @@ template("bl_iot_sdk") { "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_std/BSP_Driver/std_drv/src/bl702_xip_sflash_ext.c", ] - configs += [ ":${sdk_target_name}_config_freertos" ] public_configs = [ ":${sdk_target_name}_config", @@ -753,9 +752,7 @@ template("bl_iot_sdk") { } source_set("${sdk_target_name}_wifi") { - defines = [ - "CFG_USE_DTS_SPI_CONFIG=1", - ] + defines = [ "CFG_USE_DTS_SPI_CONFIG=1" ] include_dirs = [ "${bl_iot_sdk_root}/components/stage/tpsync/dbg/", @@ -770,12 +767,11 @@ template("bl_iot_sdk") { "${bl_iot_sdk_root}/components/stage/tpsync/desc_buf/desc_buf.c", "${bl_iot_sdk_root}/components/stage/tpsync/ramsync_low/master/ramsync_low.c", "${bl_iot_sdk_root}/components/stage/tpsync/ramsync_upper/ramsync_upper.c", - "${bl_iot_sdk_root}/components/stage/virt_net/src/virt_net.c", "${bl_iot_sdk_root}/components/stage/virt_net/src/virt_net_ramsync.c", ] - configs += [ + configs += [ ":${sdk_target_name}_config_soc", ":${sdk_target_name}_config_BSP_Driver", ":${sdk_target_name}_config_stage", @@ -793,14 +789,13 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_lwip", ] - cflags = [ - "-Wno-sign-compare", - "-Wno-stringop-truncation", + cflags = [ + "-Wno-sign-compare", + "-Wno-stringop-truncation", ] } config("${sdk_target_name}_config_lwip") { - include_dirs = [ "${bl_iot_sdk_root}/components/network/lwip/lwip-port", "${bl_iot_sdk_root}/components/network/lwip/lwip-port/config", @@ -930,13 +925,14 @@ template("bl_iot_sdk") { if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) { public_deps += [ ":${sdk_target_name}_wifi" ] public_deps += [ ":${sdk_target_name}_lwip" ] - } else if (defined(invoker.chip_enable_openthread) && invoker.chip_enable_openthread) { + } else if (defined(invoker.chip_enable_openthread) && + invoker.chip_enable_openthread) { public_deps += [ ":${sdk_target_name}_openthread_port" ] } else { public_deps += [ ":${sdk_target_name}_ethernet" ] public_deps += [ ":${sdk_target_name}_lwip" ] } - + if (defined(invoker.enable_zigbee) && invoker.enable_zigbee) { public_deps += [ ":${sdk_target_name}_zigbee" ] }