Remove using-directives namespaces in Tizen platform (#23637)
diff --git a/src/platform/Tizen/BLEManagerImpl.cpp b/src/platform/Tizen/BLEManagerImpl.cpp
index 7bb738f..c60fb56 100644
--- a/src/platform/Tizen/BLEManagerImpl.cpp
+++ b/src/platform/Tizen/BLEManagerImpl.cpp
@@ -31,9 +31,6 @@
#include "MainLoop.h"
#include <bluetooth.h>
-using namespace ::chip;
-using namespace ::chip::Ble;
-
namespace chip {
namespace DeviceLayer {
namespace Internal {
@@ -410,7 +407,7 @@
PlatformMgr().PostEventOrDie(&event);
}
-void BLEManagerImpl::HandleConnectionTimeout(chip::System::Layer * layer, void * data)
+void BLEManagerImpl::HandleConnectionTimeout(System::Layer * layer, void * data)
{
sInstance.NotifyHandleConnectFailed(CHIP_ERROR_TIMEOUT);
}
@@ -448,7 +445,7 @@
g_source_unref(idleSource);
}
-void BLEManagerImpl::OnChipDeviceScanned(void * device, const chip::Ble::ChipBLEDeviceIdentificationInfo & info)
+void BLEManagerImpl::OnChipDeviceScanned(void * device, const Ble::ChipBLEDeviceIdentificationInfo & info)
{
auto deviceInfo = reinterpret_cast<bt_adapter_le_device_scan_result_info_s *>(device);
VerifyOrReturn(deviceInfo != nullptr, ChipLogError(DeviceLayer, "Invalid Device Info"));
@@ -479,7 +476,7 @@
/* Set CHIP Connecting state */
mBLEScanConfig.mBleScanState = BleScanState::kConnecting;
- chip::DeviceLayer::SystemLayer().StartTimer(kConnectTimeoutMs, HandleConnectionTimeout, nullptr);
+ DeviceLayer::SystemLayer().StartTimer(kConnectTimeoutMs, HandleConnectionTimeout, nullptr);
mDeviceScanner->StopChipScan();
/* Initiate Connect */
@@ -583,12 +580,12 @@
int BLEManagerImpl::StartBLEAdvertising()
{
- int ret = BT_ERROR_NONE;
- CHIP_ERROR err = CHIP_NO_ERROR;
- char service_data[sizeof(ChipBLEDeviceIdentificationInfo)] = {
+ int ret = BT_ERROR_NONE;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ char service_data[sizeof(Ble::ChipBLEDeviceIdentificationInfo)] = {
0x0,
}; // need to fill advertising data. 5.2.3.8.6. Advertising Data, CHIP Specification
- ChipBLEDeviceIdentificationInfo deviceIdInfo = {
+ Ble::ChipBLEDeviceIdentificationInfo deviceIdInfo = {
0x0,
};
@@ -1018,7 +1015,7 @@
void BLEManagerImpl::CleanScanConfig()
{
if (mBLEScanConfig.mBleScanState == BleScanState::kConnecting)
- chip::DeviceLayer::SystemLayer().CancelTimer(HandleConnectionTimeout, nullptr);
+ DeviceLayer::SystemLayer().CancelTimer(HandleConnectionTimeout, nullptr);
mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
}
@@ -1045,8 +1042,8 @@
}
break;
case DeviceEventType::kPlatformTizenBLEWriteComplete: {
- ChipBleUUID service_uuid;
- ChipBleUUID char_write_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_write_uuid;
StringToUUID(chip_ble_service_uuid, service_uuid);
StringToUUID(chip_ble_char_c1_tx_uuid, char_write_uuid);
@@ -1055,8 +1052,8 @@
break;
}
case DeviceEventType::kPlatformTizenBLESubscribeOpComplete: {
- ChipBleUUID service_uuid;
- ChipBleUUID char_notif_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_notif_uuid;
StringToUUID(chip_ble_service_uuid, service_uuid);
StringToUUID(chip_ble_char_c2_rx_uuid, char_notif_uuid);
@@ -1068,14 +1065,14 @@
break;
}
case DeviceEventType::kPlatformTizenBLEIndicationReceived: {
- ChipBleUUID service_uuid;
- ChipBleUUID char_notif_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_notif_uuid;
StringToUUID(chip_ble_service_uuid, service_uuid);
StringToUUID(chip_ble_char_c2_rx_uuid, char_notif_uuid);
HandleIndicationReceived(apEvent->Platform.BLEIndicationReceived.mConnection, &service_uuid, &char_notif_uuid,
- PacketBufferHandle::Adopt(apEvent->Platform.BLEIndicationReceived.mData));
+ System::PacketBufferHandle::Adopt(apEvent->Platform.BLEIndicationReceived.mData));
break;
}
default:
@@ -1085,9 +1082,9 @@
void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
{
- ChipBleUUID service_uuid;
- ChipBleUUID char_notification_uuid;
- ChipBleUUID char_write_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_notification_uuid;
+ Ble::ChipBleUUID char_write_uuid;
switch (event->Type)
{
@@ -1114,7 +1111,7 @@
StringToUUID(chip_ble_service_uuid, service_uuid);
StringToUUID(chip_ble_char_c1_tx_uuid, char_write_uuid);
HandleWriteReceived(event->CHIPoBLEWriteReceived.ConId, &service_uuid, &char_write_uuid,
- PacketBufferHandle::Adopt(event->CHIPoBLEWriteReceived.Data));
+ System::PacketBufferHandle::Adopt(event->CHIPoBLEWriteReceived.Data));
break;
case DeviceEventType::kCHIPoBLEIndicateConfirm:
ChipLogProgress(DeviceLayer, "CHIPoBLEIndicateConfirm");
@@ -1142,10 +1139,11 @@
return (conn != nullptr) ? conn->mtu : 0;
}
-bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId)
+bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId,
+ const Ble::ChipBleUUID * charId)
{
- ChipBleUUID service_uuid;
- ChipBleUUID char_notif_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_notif_uuid;
auto conn = static_cast<BLEConnection *>(conId);
int ret = BT_ERROR_NONE;
@@ -1172,10 +1170,11 @@
return false;
}
-bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId)
+bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId,
+ const Ble::ChipBleUUID * charId)
{
- ChipBleUUID service_uuid;
- ChipBleUUID char_notif_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_notif_uuid;
auto conn = static_cast<BLEConnection *>(conId);
int ret = BT_ERROR_NONE;
@@ -1223,8 +1222,8 @@
return false;
}
-bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
- chip::System::PacketBufferHandle pBuf)
+bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
+ System::PacketBufferHandle pBuf)
{
auto conn = static_cast<BLEConnection *>(conId);
int ret = BT_ERROR_NONE;
@@ -1250,10 +1249,10 @@
}
bool BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
- chip::System::PacketBufferHandle pBuf)
+ System::PacketBufferHandle pBuf)
{
- ChipBleUUID service_uuid;
- ChipBleUUID char_write_uuid;
+ Ble::ChipBleUUID service_uuid;
+ Ble::ChipBleUUID char_write_uuid;
auto conn = static_cast<BLEConnection *>(conId);
int ret = BT_ERROR_NONE;
@@ -1283,7 +1282,7 @@
}
bool BLEManagerImpl::SendReadRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
- chip::System::PacketBufferHandle pBuf)
+ System::PacketBufferHandle pBuf)
{
return false;
}
@@ -1357,7 +1356,7 @@
if (err != CHIP_NO_ERROR)
{
- ChipLogError(DeviceLayer, "Failed to start a BLE Scan: %s", chip::ErrorStr(err));
+ ChipLogError(DeviceLayer, "Failed to start a BLE Scan: %s", ErrorStr(err));
goto exit;
}
diff --git a/src/platform/Tizen/BLEManagerImpl.h b/src/platform/Tizen/BLEManagerImpl.h
index 30bff7b..f4c8e90 100644
--- a/src/platform/Tizen/BLEManagerImpl.h
+++ b/src/platform/Tizen/BLEManagerImpl.h
@@ -35,8 +35,6 @@
namespace DeviceLayer {
namespace Internal {
-using namespace chip::Ble;
-
/**
* enum Class for BLE Scanning state. CHIP supports Scanning by Discriminator or Address
*/
@@ -127,7 +125,7 @@
CHIP_ERROR CancelConnection() override;
// ===== Members that implement virtual methods on ChipDeviceScannerDelegate
- void OnChipDeviceScanned(void * device, const chip::Ble::ChipBLEDeviceIdentificationInfo & info) override;
+ void OnChipDeviceScanned(void * device, const Ble::ChipBLEDeviceIdentificationInfo & info) override;
void OnChipScanComplete() override;
// ===== Members for internal use by the following friends.
@@ -180,7 +178,7 @@
void HandleC1CharWriteEvent(BLE_CONNECTION_OBJECT conId, const uint8_t * value, size_t len);
void HandleRXCharChanged(BLE_CONNECTION_OBJECT conId, const uint8_t * value, size_t len);
void HandleConnectionEvent(bool connected, const char * remoteAddress);
- static void HandleConnectionTimeout(chip::System::Layer * layer, void * data);
+ static void HandleConnectionTimeout(System::Layer * layer, void * data);
static bool IsDeviceChipPeripheral(BLE_CONNECTION_OBJECT conId);
// ==== BLE Adv & GATT Server.
diff --git a/src/platform/Tizen/ConfigurationManagerImpl.cpp b/src/platform/Tizen/ConfigurationManagerImpl.cpp
index d57bd6a..c7255e8 100644
--- a/src/platform/Tizen/ConfigurationManagerImpl.cpp
+++ b/src/platform/Tizen/ConfigurationManagerImpl.cpp
@@ -37,8 +37,6 @@
namespace chip {
namespace DeviceLayer {
-using namespace ::chip::DeviceLayer::Internal;
-
ConfigurationManagerImpl & ConfigurationManagerImpl::GetDefaultInstance()
{
static ConfigurationManagerImpl sInstance;
@@ -49,16 +47,16 @@
{
CHIP_ERROR error;
- error = Internal::GenericConfigurationManagerImpl<PosixConfig>::Init();
+ error = Internal::GenericConfigurationManagerImpl<Internal::PosixConfig>::Init();
SuccessOrExit(error);
- if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_VendorId))
+ if (!Internal::PosixConfig::ConfigValueExists(Internal::PosixConfig::kConfigKey_VendorId))
{
error = StoreVendorId(CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID);
SuccessOrExit(error);
}
- if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_ProductId))
+ if (!Internal::PosixConfig::ConfigValueExists(Internal::PosixConfig::kConfigKey_ProductId))
{
error = StoreProductId(CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID);
SuccessOrExit(error);
@@ -72,19 +70,19 @@
CHIP_ERROR ConfigurationManagerImpl::StoreVendorId(uint16_t vendorId)
{
- return WriteConfigValue(PosixConfig::kConfigKey_VendorId, vendorId);
+ return WriteConfigValue(Internal::PosixConfig::kConfigKey_VendorId, vendorId);
}
CHIP_ERROR ConfigurationManagerImpl::StoreProductId(uint16_t productId)
{
- return WriteConfigValue(PosixConfig::kConfigKey_ProductId, productId);
+ return WriteConfigValue(Internal::PosixConfig::kConfigKey_ProductId, productId);
}
CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
{
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
constexpr size_t kExpectedBufSize = ConfigurationManager::kPrimaryMACAddressLength;
- return WiFiMgr().GetDeviceMACAddress(buf, kExpectedBufSize);
+ return Internal::WiFiMgr().GetDeviceMACAddress(buf, kExpectedBufSize);
#else
return CHIP_ERROR_NOT_IMPLEMENTED;
#endif
@@ -97,84 +95,84 @@
void ConfigurationManagerImpl::InitiateFactoryReset(void) {}
-CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value)
+CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(Platform::PersistedStorage::Key key, uint32_t & value)
{
return CHIP_ERROR_NOT_IMPLEMENTED;
}
-CHIP_ERROR ConfigurationManagerImpl::WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value)
+CHIP_ERROR ConfigurationManagerImpl::WritePersistedStorageValue(Platform::PersistedStorage::Key key, uint32_t value)
{
return CHIP_ERROR_NOT_IMPLEMENTED;
}
CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, bool & val)
{
- return PosixConfig::ReadConfigValue(key, val);
+ return Internal::PosixConfig::ReadConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint16_t & val)
{
- return PosixConfig::ReadConfigValue(key, val);
+ return Internal::PosixConfig::ReadConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint32_t & val)
{
- return PosixConfig::ReadConfigValue(key, val);
+ return Internal::PosixConfig::ReadConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint64_t & val)
{
- return PosixConfig::ReadConfigValue(key, val);
+ return Internal::PosixConfig::ReadConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
{
- return PosixConfig::ReadConfigValueStr(key, buf, bufSize, outLen);
+ return Internal::PosixConfig::ReadConfigValueStr(key, buf, bufSize, outLen);
}
CHIP_ERROR ConfigurationManagerImpl::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
{
- return PosixConfig::ReadConfigValueBin(key, buf, bufSize, outLen);
+ return Internal::PosixConfig::ReadConfigValueBin(key, buf, bufSize, outLen);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, bool val)
{
- return PosixConfig::WriteConfigValue(key, val);
+ return Internal::PosixConfig::WriteConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint16_t val)
{
- return PosixConfig::WriteConfigValue(key, val);
+ return Internal::PosixConfig::WriteConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint32_t val)
{
- return PosixConfig::WriteConfigValue(key, val);
+ return Internal::PosixConfig::WriteConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint64_t val)
{
- return PosixConfig::WriteConfigValue(key, val);
+ return Internal::PosixConfig::WriteConfigValue(key, val);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueStr(Key key, const char * str)
{
- return PosixConfig::WriteConfigValueStr(key, str);
+ return Internal::PosixConfig::WriteConfigValueStr(key, str);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueStr(Key key, const char * str, size_t strLen)
{
- return PosixConfig::WriteConfigValueStr(key, str, strLen);
+ return Internal::PosixConfig::WriteConfigValueStr(key, str, strLen);
}
CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
{
- return PosixConfig::WriteConfigValueBin(key, data, dataLen);
+ return Internal::PosixConfig::WriteConfigValueBin(key, data, dataLen);
}
void ConfigurationManagerImpl::RunConfigUnitTest(void)
{
- PosixConfig::RunConfigUnitTest();
+ Internal::PosixConfig::RunConfigUnitTest();
}
ConfigurationManager & ConfigurationMgrImpl()
diff --git a/src/platform/Tizen/ConfigurationManagerImpl.h b/src/platform/Tizen/ConfigurationManagerImpl.h
index 2180eec..2dd07d7 100644
--- a/src/platform/Tizen/ConfigurationManagerImpl.h
+++ b/src/platform/Tizen/ConfigurationManagerImpl.h
@@ -50,8 +50,8 @@
CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override;
bool CanFactoryReset(void) override;
void InitiateFactoryReset(void) override;
- CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
- CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
+ CHIP_ERROR ReadPersistedStorageValue(Platform::PersistedStorage::Key key, uint32_t & value) override;
+ CHIP_ERROR WritePersistedStorageValue(Platform::PersistedStorage::Key key, uint32_t value) override;
// NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
CHIP_ERROR WriteConfigValue(Key key, uint16_t val);
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.cpp b/src/platform/Tizen/ConnectivityManagerImpl.cpp
index 66ba3b9..7c7e2ea 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.cpp
+++ b/src/platform/Tizen/ConnectivityManagerImpl.cpp
@@ -45,10 +45,6 @@
#include <platform/internal/GenericConnectivityManagerImpl_WiFi.ipp>
#endif
-using namespace ::chip;
-using namespace ::chip::TLV;
-using namespace ::chip::DeviceLayer::Internal;
-
namespace chip {
namespace DeviceLayer {
@@ -66,7 +62,7 @@
mWiFiStationReconnectInterval = System::Clock::Milliseconds32(CHIP_DEVICE_CONFIG_WIFI_STATION_RECONNECT_INTERVAL);
mWiFiAPIdleTimeout = System::Clock::Milliseconds32(CHIP_DEVICE_CONFIG_WIFI_AP_IDLE_TIMEOUT);
- WiFiMgr().Init();
+ Internal::WiFiMgr().Init();
#endif
return err;
@@ -83,7 +79,7 @@
ReturnErrorCodeIf(mWiFiStationMode == kWiFiStationMode_ApplicationControlled, mWiFiStationMode);
- err = WiFiMgr().GetDeviceState(&deviceState);
+ err = Internal::WiFiMgr().GetDeviceState(&deviceState);
VerifyOrReturnError(err == CHIP_NO_ERROR, mWiFiStationMode);
mWiFiStationMode = (deviceState == WIFI_MANAGER_DEVICE_STATE_ACTIVATED) ? kWiFiStationMode_Enabled : kWiFiStationMode_Disabled;
@@ -102,7 +98,7 @@
{
deviceState =
(val == kWiFiStationMode_Disabled) ? WIFI_MANAGER_DEVICE_STATE_DEACTIVATED : WIFI_MANAGER_DEVICE_STATE_ACTIVATED;
- err = WiFiMgr().SetDeviceState(deviceState);
+ err = Internal::WiFiMgr().SetDeviceState(deviceState);
VerifyOrReturnError(err == CHIP_NO_ERROR, err);
}
@@ -133,7 +129,7 @@
{
bool isWiFiStationEnabled = false;
- WiFiMgr().IsActivated(&isWiFiStationEnabled);
+ Internal::WiFiMgr().IsActivated(&isWiFiStationEnabled);
return isWiFiStationEnabled;
}
@@ -144,7 +140,7 @@
wifi_manager_connection_state_e connectionState = WIFI_MANAGER_CONNECTION_STATE_DISCONNECTED;
bool isWiFiStationConnected = false;
- err = WiFiMgr().GetConnectionState(&connectionState);
+ err = Internal::WiFiMgr().GetConnectionState(&connectionState);
VerifyOrReturnError(err == CHIP_NO_ERROR, isWiFiStationConnected);
if (connectionState == WIFI_MANAGER_CONNECTION_STATE_CONNECTED)
@@ -159,7 +155,7 @@
wifi_manager_connection_state_e connectionState = WIFI_MANAGER_CONNECTION_STATE_DISCONNECTED;
bool isWiFiStationProvisioned = false;
- err = WiFiMgr().GetConnectionState(&connectionState);
+ err = Internal::WiFiMgr().GetConnectionState(&connectionState);
VerifyOrReturnError(err == CHIP_NO_ERROR, isWiFiStationProvisioned);
if (connectionState >= WIFI_MANAGER_CONNECTION_STATE_ASSOCIATION)
@@ -170,7 +166,7 @@
void ConnectivityManagerImpl::_ClearWiFiStationProvision(void)
{
- WiFiMgr().RemoveAllConfigs();
+ Internal::WiFiMgr().RemoveAllConfigs();
}
bool ConnectivityManagerImpl::_CanStartWiFiScan(void)
@@ -211,14 +207,14 @@
SystemLayer().ScheduleWork(DeactivateWiFiManager, nullptr);
}
-void ConnectivityManagerImpl::ActivateWiFiManager(::chip::System::Layer * aLayer, void * aAppState)
+void ConnectivityManagerImpl::ActivateWiFiManager(System::Layer * aLayer, void * aAppState)
{
- WiFiMgr().Activate();
+ Internal::WiFiMgr().Activate();
}
-void ConnectivityManagerImpl::DeactivateWiFiManager(::chip::System::Layer * aLayer, void * aAppState)
+void ConnectivityManagerImpl::DeactivateWiFiManager(System::Layer * aLayer, void * aAppState)
{
- WiFiMgr().Deactivate();
+ Internal::WiFiMgr().Deactivate();
}
#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.h b/src/platform/Tizen/ConnectivityManagerImpl.h
index 4988d5c..69c4e05 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.h
+++ b/src/platform/Tizen/ConnectivityManagerImpl.h
@@ -117,8 +117,8 @@
System::Clock::Timeout _GetWiFiAPIdleTimeout(void);
void _SetWiFiAPIdleTimeout(System::Clock::Timeout val);
- static void ActivateWiFiManager(::chip::System::Layer * aLayer, void * aAppState);
- static void DeactivateWiFiManager(::chip::System::Layer * aLayer, void * aAppState);
+ static void ActivateWiFiManager(System::Layer * aLayer, void * aAppState);
+ static void DeactivateWiFiManager(System::Layer * aLayer, void * aAppState);
#endif
// ===== Members for internal use by the following friends.
diff --git a/src/platform/Tizen/ConnectivityUtils.cpp b/src/platform/Tizen/ConnectivityUtils.cpp
index 42106db..6ad5103 100644
--- a/src/platform/Tizen/ConnectivityUtils.cpp
+++ b/src/platform/Tizen/ConnectivityUtils.cpp
@@ -36,16 +36,15 @@
#include <lib/support/CHIPMemString.h>
-using namespace ::chip::app::Clusters::GeneralDiagnostics;
-
namespace chip {
namespace DeviceLayer {
namespace Internal {
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+app::Clusters::GeneralDiagnostics::InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
{
- InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
- int sock = -1;
+ app::Clusters::GeneralDiagnostics::InterfaceType ret =
+ app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+ int sock = -1;
if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
@@ -59,7 +58,7 @@
if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
{
- ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+ ret = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
}
else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
{
@@ -70,7 +69,7 @@
Platform::CopyString(ifr.ifr_name, ifname);
if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
- ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+ ret = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
}
close(sock);
diff --git a/src/platform/Tizen/DnssdImpl.cpp b/src/platform/Tizen/DnssdImpl.cpp
index 479e561..6a3294d 100644
--- a/src/platform/Tizen/DnssdImpl.cpp
+++ b/src/platform/Tizen/DnssdImpl.cpp
@@ -24,6 +24,7 @@
#include <sstream>
#include <utility>
+#include <lib/dnssd/platform/Dnssd.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/CHIPMemString.h>
#include <lib/support/CodeUtils.h>
@@ -36,9 +37,6 @@
#include <platform/ThreadStackManager.h>
#endif
-using namespace chip::Dnssd;
-using namespace chip::DeviceLayer::Internal;
-
namespace {
constexpr uint8_t kDnssdKeyMaxSize = 32;
@@ -50,17 +48,19 @@
// and the browsing callback is called multiple times (once for each service found).
constexpr unsigned int kDnssdBrowseTimeoutMs = 250;
-bool IsSupportedProtocol(DnssdServiceProtocol protocol)
+bool IsSupportedProtocol(chip::Dnssd::DnssdServiceProtocol protocol)
{
- return (protocol == DnssdServiceProtocol::kDnssdProtocolUdp) || (protocol == DnssdServiceProtocol::kDnssdProtocolTcp);
+ return (protocol == chip::Dnssd::DnssdServiceProtocol::kDnssdProtocolUdp) ||
+ (protocol == chip::Dnssd::DnssdServiceProtocol::kDnssdProtocolTcp);
}
-const char * GetProtocolString(DnssdServiceProtocol protocol)
+const char * GetProtocolString(chip::Dnssd::DnssdServiceProtocol protocol)
{
- return protocol == DnssdServiceProtocol::kDnssdProtocolUdp ? kCommissionProtocol : kOperationalProtocol;
+ return protocol == chip::Dnssd::DnssdServiceProtocol::kDnssdProtocolUdp ? chip::Dnssd::kCommissionProtocol
+ : chip::Dnssd::kOperationalProtocol;
}
-std::string GetFullType(const char * type, DnssdServiceProtocol protocol)
+std::string GetFullType(const char * type, chip::Dnssd::DnssdServiceProtocol protocol)
{
std::ostringstream typeBuilder;
typeBuilder << type << "." << GetProtocolString(protocol);
@@ -84,7 +84,7 @@
void OnRegister(dnssd_error_e result, dnssd_service_h service, void * data)
{
- auto rCtx = reinterpret_cast<RegisterContext *>(data);
+ auto rCtx = reinterpret_cast<chip::Dnssd::RegisterContext *>(data);
ChipLogDetail(DeviceLayer, "DNSsd %s: name: %s, type: %s, port: %u, interfaceId: %u", __func__, rCtx->mName, rCtx->mType,
rCtx->mPort, rCtx->mInterfaceId);
@@ -107,7 +107,7 @@
{
ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
- auto rCtx = reinterpret_cast<RegisterContext *>(userData);
+ auto rCtx = reinterpret_cast<chip::Dnssd::RegisterContext *>(userData);
rCtx->mMainLoop = mainLoop;
int ret = dnssd_register_local_service(rCtx->mServiceHandle, OnRegister, rCtx);
@@ -122,7 +122,7 @@
{
ChipLogDetail(DeviceLayer, "DNSsd %s: all for now", __func__);
- auto * bCtx = reinterpret_cast<BrowseContext *>(userData);
+ auto * bCtx = reinterpret_cast<chip::Dnssd::BrowseContext *>(userData);
bCtx->MainLoopQuit();
bCtx->mCallback(bCtx->mCbContext, bCtx->mServices.data(), bCtx->mServices.size(), true, CHIP_NO_ERROR);
@@ -134,7 +134,7 @@
return FALSE;
}
-void OnBrowseAdd(BrowseContext * context, const char * type, const char * name, uint32_t interfaceId)
+void OnBrowseAdd(chip::Dnssd::BrowseContext * context, const char * type, const char * name, uint32_t interfaceId)
{
ChipLogDetail(DeviceLayer, "DNSsd %s: name: %s, type: %s, interfaceId: %u", __func__, StringOrNullMarker(name),
StringOrNullMarker(type), interfaceId);
@@ -142,7 +142,7 @@
char * tokens = strdup(type);
char * regtype = strtok(tokens, ".");
- DnssdService dnssdService = {};
+ chip::Dnssd::DnssdService dnssdService = {};
chip::Platform::CopyString(dnssdService.mName, name);
chip::Platform::CopyString(dnssdService.mType, regtype);
dnssdService.mProtocol = context->mProtocol;
@@ -153,12 +153,12 @@
free(tokens);
}
-void OnBrowseRemove(BrowseContext * context, const char * type, const char * name, uint32_t interfaceId)
+void OnBrowseRemove(chip::Dnssd::BrowseContext * context, const char * type, const char * name, uint32_t interfaceId)
{
ChipLogDetail(DeviceLayer, "DNSsd %s: name: %s, type: %s, interfaceId: %u", __func__, StringOrNullMarker(name),
StringOrNullMarker(type), interfaceId);
context->mServices.erase(std::remove_if(
- context->mServices.begin(), context->mServices.end(), [name, type, interfaceId](const DnssdService & service) {
+ context->mServices.begin(), context->mServices.end(), [name, type, interfaceId](const chip::Dnssd::DnssdService & service) {
return strcmp(name, service.mName) == 0 && type == GetFullType(service.mType, service.mProtocol) &&
interfaceId == service.mInterface.GetPlatformInterface();
}));
@@ -167,7 +167,7 @@
void OnBrowse(dnssd_service_state_e state, dnssd_service_h service, void * data)
{
ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
- auto bCtx = reinterpret_cast<BrowseContext *>(data);
+ auto bCtx = reinterpret_cast<chip::Dnssd::BrowseContext *>(data);
int ret;
// If there is already a timeout source, so we need to cancel it.
@@ -232,7 +232,7 @@
{
ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
- auto * bCtx = reinterpret_cast<BrowseContext *>(userData);
+ auto * bCtx = reinterpret_cast<chip::Dnssd::BrowseContext *>(userData);
auto interfaceId = bCtx->mInterfaceId;
bCtx->mMainLoop = mainLoop;
int ret;
@@ -259,7 +259,7 @@
return true;
}
-void GetTextEntries(unsigned short txtLen, uint8_t * txtRecord, std::vector<TextEntry> & textEntries)
+void GetTextEntries(unsigned short txtLen, uint8_t * txtRecord, std::vector<chip::Dnssd::TextEntry> & textEntries)
{
VerifyOrReturn(txtLen > 1, ChipLogDetail(DeviceLayer, "DNSsd %s: No TXT records", __func__));
const uint8_t * txtRecordEnd = txtRecord + txtLen;
@@ -296,7 +296,7 @@
void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
{
ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
- auto rCtx = reinterpret_cast<ResolveContext *>(data);
+ auto rCtx = reinterpret_cast<chip::Dnssd::ResolveContext *>(data);
char * name = nullptr;
char * ipv4 = nullptr;
@@ -305,8 +305,8 @@
char * interface = nullptr;
unsigned short txtLen = 0;
uint8_t * txtRecord = nullptr;
- std::vector<TextEntry> textEntries;
- DnssdService dnssdService = {};
+ std::vector<chip::Dnssd::TextEntry> textEntries;
+ chip::Dnssd::DnssdService dnssdService = {};
chip::Inet::IPAddress ipAddr;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -400,7 +400,7 @@
{
ChipLogDetail(DeviceLayer, "DNSsd %s", __func__);
- auto * rCtx = reinterpret_cast<ResolveContext *>(userData);
+ auto * rCtx = reinterpret_cast<chip::Dnssd::ResolveContext *>(userData);
rCtx->mMainLoop = mainLoop;
int ret = dnssd_resolve_service(rCtx->mServiceHandle, OnResolve, rCtx);
@@ -410,7 +410,6 @@
rCtx->mIsResolving = true;
return true;
}
-
} // namespace
namespace chip {
@@ -449,7 +448,7 @@
}
}
-BrowseContext::BrowseContext(DnssdTizen * instance, const char * type, DnssdServiceProtocol protocol, uint32_t interfaceId,
+BrowseContext::BrowseContext(DnssdTizen * instance, const char * type, Dnssd::DnssdServiceProtocol protocol, uint32_t interfaceId,
DnssdBrowseCallback callback, void * context) :
GenericContext(ContextType::Browse, instance)
{
@@ -590,7 +589,7 @@
(ChipLogError(DeviceLayer, "dnssd_service_add_txt_record() failed. ret: %d", ret), err = GetChipError(ret)));
}
- ok = MainLoop::Instance().AsyncRequest(RegisterAsync, serviceCtx);
+ ok = DeviceLayer::Internal::MainLoop::Instance().AsyncRequest(RegisterAsync, serviceCtx);
VerifyOrExit(ok, err = CHIP_ERROR_INTERNAL);
exit:
@@ -620,7 +619,7 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR DnssdTizen::Browse(const char * type, DnssdServiceProtocol protocol, chip::Inet::IPAddressType addressType,
+CHIP_ERROR DnssdTizen::Browse(const char * type, Dnssd::DnssdServiceProtocol protocol, chip::Inet::IPAddressType addressType,
chip::Inet::InterfaceId interface, DnssdBrowseCallback callback, void * context)
{
std::string fullType = GetFullType(type, protocol);
@@ -629,7 +628,7 @@
auto browseCtx = CreateBrowseContext(fullType.c_str(), protocol, interfaceId, callback, context);
- bool ok = MainLoop::Instance().AsyncRequest(BrowseAsync, browseCtx);
+ bool ok = DeviceLayer::Internal::MainLoop::Instance().AsyncRequest(BrowseAsync, browseCtx);
VerifyOrExit(ok, err = CHIP_ERROR_INTERNAL);
exit:
@@ -670,7 +669,7 @@
VerifyOrExit(ret == DNSSD_ERROR_NONE,
(ChipLogError(DeviceLayer, "dnssd_create_remote_service() failed. ret: %d", ret), err = GetChipError(ret)));
- ok = MainLoop::Instance().AsyncRequest(ResolveAsync, resolveCtx);
+ ok = DeviceLayer::Internal::MainLoop::Instance().AsyncRequest(ResolveAsync, resolveCtx);
VerifyOrExit(ok, err = CHIP_ERROR_INTERNAL);
exit:
@@ -691,7 +690,7 @@
return ctxPtr;
}
-BrowseContext * DnssdTizen::CreateBrowseContext(const char * type, DnssdServiceProtocol protocol, uint32_t interfaceId,
+BrowseContext * DnssdTizen::CreateBrowseContext(const char * type, Dnssd::DnssdServiceProtocol protocol, uint32_t interfaceId,
DnssdBrowseCallback callback, void * context)
{
auto ctx = std::make_unique<BrowseContext>(this, type, protocol, interfaceId, callback, context);
@@ -783,7 +782,7 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR ChipDnssdBrowse(const char * type, DnssdServiceProtocol protocol, chip::Inet::IPAddressType addressType,
+CHIP_ERROR ChipDnssdBrowse(const char * type, Dnssd::DnssdServiceProtocol protocol, chip::Inet::IPAddressType addressType,
chip::Inet::InterfaceId interface, DnssdBrowseCallback callback, void * context,
intptr_t * browseIdentifier)
{
diff --git a/src/platform/Tizen/DnssdImpl.h b/src/platform/Tizen/DnssdImpl.h
old mode 100755
new mode 100644
index 4dc9ffa..360f264
--- a/src/platform/Tizen/DnssdImpl.h
+++ b/src/platform/Tizen/DnssdImpl.h
@@ -74,7 +74,7 @@
struct BrowseContext : public GenericContext
{
char mType[kDnssdTypeAndProtocolMaxSize + 1];
- DnssdServiceProtocol mProtocol;
+ Dnssd::DnssdServiceProtocol mProtocol;
uint32_t mInterfaceId;
DnssdBrowseCallback mCallback;
@@ -87,7 +87,7 @@
std::vector<DnssdService> mServices;
bool mIsBrowsing = false;
- BrowseContext(DnssdTizen * instance, const char * type, DnssdServiceProtocol protocol, uint32_t interfaceId,
+ BrowseContext(DnssdTizen * instance, const char * type, Dnssd::DnssdServiceProtocol protocol, uint32_t interfaceId,
DnssdBrowseCallback callback, void * context);
~BrowseContext() override;
};
@@ -121,7 +121,7 @@
CHIP_ERROR RegisterService(const DnssdService & service, DnssdPublishCallback callback, void * context);
CHIP_ERROR UnregisterAllServices();
- CHIP_ERROR Browse(const char * type, DnssdServiceProtocol protocol, chip::Inet::IPAddressType addressType,
+ CHIP_ERROR Browse(const char * type, Dnssd::DnssdServiceProtocol protocol, chip::Inet::IPAddressType addressType,
chip::Inet::InterfaceId interface, DnssdBrowseCallback callback, void * context);
CHIP_ERROR Resolve(const DnssdService & browseResult, chip::Inet::InterfaceId interface, DnssdResolveCallback callback,
@@ -138,7 +138,7 @@
RegisterContext * CreateRegisterContext(const char * type, const DnssdService & service, DnssdPublishCallback callback,
void * context);
- BrowseContext * CreateBrowseContext(const char * type, DnssdServiceProtocol protocol, uint32_t interfaceId,
+ BrowseContext * CreateBrowseContext(const char * type, Dnssd::DnssdServiceProtocol protocol, uint32_t interfaceId,
DnssdBrowseCallback callback, void * context);
ResolveContext * CreateResolveContext(const char * name, const char * type, uint32_t interfaceId, DnssdResolveCallback callback,
void * context);
diff --git a/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp b/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
index f700832..d9e721f 100644
--- a/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
@@ -26,9 +26,6 @@
#include <string>
#include <vector>
-using namespace chip::app::Clusters::GeneralDiagnostics;
-using namespace chip::DeviceLayer::Internal;
-
namespace chip {
namespace DeviceLayer {
namespace NetworkCommissioning {
@@ -40,7 +37,8 @@
for (const auto * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
{
- if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+ if (DeviceLayer::Internal::ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+ app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
{
mInterfaces.push_back(ifa->ifa_name);
if (mInterfaces.size() == mDriver->GetMaxNetworks())
diff --git a/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp b/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
index 517b975..6a393b6 100644
--- a/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningThreadDriver.cpp
@@ -26,9 +26,6 @@
#include <string>
#include <vector>
-using namespace chip;
-using namespace chip::Thread;
-
namespace chip {
namespace DeviceLayer {
namespace NetworkCommissioning {
@@ -59,15 +56,15 @@
Status TizenThreadDriver::AddOrUpdateNetwork(ByteSpan operationalDataset, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
{
- uint8_t extpanid[kSizeExtendedPanId];
- uint8_t newExtpanid[kSizeExtendedPanId];
+ uint8_t extpanid[Thread::kSizeExtendedPanId];
+ uint8_t newExtpanid[Thread::kSizeExtendedPanId];
Thread::OperationalDataset newDataset;
outDebugText.reduce_size(0);
outNetworkIndex = 0;
newDataset.Init(operationalDataset);
VerifyOrReturnError(newDataset.IsCommissioned(), Status::kOutOfRange);
- VerifyOrReturnError(!mStagingNetwork.IsCommissioned() || memcmp(extpanid, newExtpanid, kSizeExtendedPanId) == 0,
+ VerifyOrReturnError(!mStagingNetwork.IsCommissioned() || memcmp(extpanid, newExtpanid, Thread::kSizeExtendedPanId) == 0,
Status::kBoundsExceeded);
mStagingNetwork = newDataset;
@@ -78,7 +75,7 @@
{
outDebugText.reduce_size(0);
outNetworkIndex = 0;
- uint8_t extpanid[kSizeExtendedPanId];
+ uint8_t extpanid[Thread::kSizeExtendedPanId];
if (!mStagingNetwork.IsCommissioned())
{
return Status::kNetworkNotFound;
@@ -88,7 +85,8 @@
return Status::kUnknownError;
}
- VerifyOrReturnError(networkId.size() == kSizeExtendedPanId && memcmp(networkId.data(), extpanid, kSizeExtendedPanId) == 0,
+ VerifyOrReturnError(networkId.size() == Thread::kSizeExtendedPanId &&
+ memcmp(networkId.data(), extpanid, Thread::kSizeExtendedPanId) == 0,
Status::kNetworkNotFound);
mStagingNetwork.Clear();
return Status::kSuccess;
@@ -97,7 +95,7 @@
Status TizenThreadDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
{
outDebugText.reduce_size(0);
- uint8_t extpanid[kSizeExtendedPanId];
+ uint8_t extpanid[Thread::kSizeExtendedPanId];
if (!mStagingNetwork.IsCommissioned())
{
return Status::kNetworkNotFound;
@@ -107,7 +105,8 @@
return Status::kUnknownError;
}
- VerifyOrReturnError(networkId.size() == kSizeExtendedPanId && memcmp(networkId.data(), extpanid, kSizeExtendedPanId) == 0,
+ VerifyOrReturnError(networkId.size() == Thread::kSizeExtendedPanId &&
+ memcmp(networkId.data(), extpanid, Thread::kSizeExtendedPanId) == 0,
Status::kNetworkNotFound);
return Status::kSuccess;
@@ -116,7 +115,7 @@
void TizenThreadDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
{
NetworkCommissioning::Status status = Status::kSuccess;
- uint8_t extpanid[kSizeExtendedPanId];
+ uint8_t extpanid[Thread::kSizeExtendedPanId];
if (!mStagingNetwork.IsCommissioned())
{
ExitNow(status = Status::kNetworkNotFound);
@@ -126,8 +125,9 @@
ExitNow(status = Status::kUnknownError);
}
- VerifyOrExit((networkId.size() == kSizeExtendedPanId && memcmp(networkId.data(), extpanid, kSizeExtendedPanId) == 0),
- status = Status::kNetworkNotFound);
+ VerifyOrExit(
+ (networkId.size() == Thread::kSizeExtendedPanId && memcmp(networkId.data(), extpanid, Thread::kSizeExtendedPanId) == 0),
+ status = Status::kNetworkNotFound);
VerifyOrExit(DeviceLayer::ThreadStackMgrImpl().AttachToThreadNetwork(mStagingNetwork, callback) == CHIP_NO_ERROR,
status = Status::kUnknownError);
diff --git a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
index 07159e0..c45f1b2 100644
--- a/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningWiFiDriver.cpp
@@ -24,10 +24,6 @@
#include <string>
#include <vector>
-using namespace chip;
-using namespace chip::Thread;
-using namespace chip::DeviceLayer::Internal;
-
namespace chip {
namespace DeviceLayer {
namespace NetworkCommissioning {
@@ -137,8 +133,8 @@
ChipLogProgress(NetworkProvisioning, "TizenNetworkCommissioningDelegate: SSID: %.*s",
static_cast<int>(sizeof(mStagingNetwork.ssid)), reinterpret_cast<char *>(mStagingNetwork.ssid));
- err = WiFiMgr().Connect(reinterpret_cast<char *>(mStagingNetwork.ssid), reinterpret_cast<char *>(mStagingNetwork.credentials),
- callback);
+ err = DeviceLayer::Internal::WiFiMgr().Connect(reinterpret_cast<char *>(mStagingNetwork.ssid),
+ reinterpret_cast<char *>(mStagingNetwork.credentials), callback);
exit:
if (err != CHIP_NO_ERROR)
diff --git a/src/platform/Tizen/ThreadStackManagerImpl.cpp b/src/platform/Tizen/ThreadStackManagerImpl.cpp
index b8e8322..1a70879 100644
--- a/src/platform/Tizen/ThreadStackManagerImpl.cpp
+++ b/src/platform/Tizen/ThreadStackManagerImpl.cpp
@@ -33,9 +33,6 @@
#include "ThreadStackManagerImpl.h"
#include <lib/dnssd/platform/Dnssd.h>
-using namespace ::chip::DeviceLayer::Internal;
-using namespace chip::DeviceLayer::NetworkCommissioning;
-
namespace chip {
namespace DeviceLayer {
@@ -454,7 +451,7 @@
return CHIP_ERROR_NOT_IMPLEMENTED;
}
-CHIP_ERROR ThreadStackManagerImpl::_StartThreadScan(ThreadDriver::ScanCallback * callback)
+CHIP_ERROR ThreadStackManagerImpl::_StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback)
{
ChipLogError(DeviceLayer, "Not implemented");
return CHIP_ERROR_NOT_IMPLEMENTED;
@@ -489,12 +486,12 @@
ThreadStackManager & ThreadStackMgr()
{
- return chip::DeviceLayer::ThreadStackManagerImpl::sInstance;
+ return DeviceLayer::ThreadStackManagerImpl::sInstance;
}
ThreadStackManagerImpl & ThreadStackMgrImpl()
{
- return chip::DeviceLayer::ThreadStackManagerImpl::sInstance;
+ return DeviceLayer::ThreadStackManagerImpl::sInstance;
}
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
diff --git a/src/platform/Tizen/WiFiManager.h b/src/platform/Tizen/WiFiManager.h
index f7cf2f6..acbe231 100644
--- a/src/platform/Tizen/WiFiManager.h
+++ b/src/platform/Tizen/WiFiManager.h
@@ -28,8 +28,6 @@
namespace DeviceLayer {
namespace Internal {
-using namespace chip::DeviceLayer::NetworkCommissioning::Internal;
-
class WiFiManager
{
friend class ConnectivityManagerImpl;
@@ -41,7 +39,8 @@
CHIP_ERROR IsActivated(bool * isWiFiActivated);
CHIP_ERROR Activate(void);
CHIP_ERROR Deactivate(void);
- CHIP_ERROR Connect(const char * ssid, const char * key, WirelessDriver::ConnectCallback * apCallback = nullptr);
+ CHIP_ERROR Connect(const char * ssid, const char * key,
+ NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * apCallback = nullptr);
CHIP_ERROR Disconnect(const char * ssid);
CHIP_ERROR RemoveAllConfigs(void);
@@ -93,7 +92,7 @@
char mWiFiSSID[kMaxWiFiSSIDLength + 1];
char mWiFiKey[kMaxWiFiKeyLength + 1];
- WirelessDriver::ConnectCallback * mpConnectCallback;
+ NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * mpConnectCallback;
};
inline WiFiManager & WiFiMgr()
