more namespace fixing and remove more dead files

project-chip · Oct 14, 2021 · b5fa375 · b5fa375
1 parent 132e9ef
commit b5fa375
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 574 deletions.
diff --git a/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp b/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
diff --git a/src/platform/EFR32/SoftwareUpdateManagerImpl.h b/src/platform/EFR32/SoftwareUpdateManagerImpl.h
diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn
@@ -40,7 +40,6 @@ static_library("ESP32") {
  "LwIPCoreLock.cpp",
  "PlatformManagerImpl.cpp",
  "PlatformManagerImpl.h",
- "SoftwareUpdateManagerImpl.h",
  "SystemTimeSupport.cpp",
  "bluedroid/BLEManagerImpl.cpp",
  "nimble/BLEManagerImpl.cpp",

diff --git a/src/platform/ESP32/SoftwareUpdateManagerImpl.cpp b/src/platform/ESP32/SoftwareUpdateManagerImpl.cpp
diff --git a/src/platform/ESP32/SoftwareUpdateManagerImpl.h b/src/platform/ESP32/SoftwareUpdateManagerImpl.h
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
@@ -73,6 +73,8 @@ using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::DataModel;
 
+using chip::Inet::IPPrefix;
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {

diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp
@@ -247,7 +247,7 @@ void GenericThreadStackManagerImpl_OpenThread_LwIP<ImplClass>::UpdateThreadInter
  uint8_t state = netif_ip6_addr_state(mNetIf, addrIdx);
  if (state != IP6_ADDR_INVALID)
  {
- Inet::IPAddress addr = IPAddress::FromIPv6(*netif_ip6_addr(mNetIf, addrIdx));
+ Inet::IPAddress addr = Inet::IPAddress::FromIPv6(*netif_ip6_addr(mNetIf, addrIdx));
  char addrStr[50];
  addr.ToString(addrStr, sizeof(addrStr));
  const char * typeStr;

diff --git a/src/platform/OpenThread/OpenThreadUtils.cpp b/src/platform/OpenThread/OpenThreadUtils.cpp
@@ -172,7 +172,7 @@ void LogOpenThreadPacket(const char * titleStr, otMessage * pkt)
 
  char srcStr[50], destStr[50], typeBuf[20];
  const char * type = typeBuf;
- IPAddress addr;
+ Inet::IPAddress addr;
  uint8_t headerData[44];
  uint16_t pktLen;
 

diff --git a/src/platform/P6/BUILD.gn b/src/platform/P6/BUILD.gn
@@ -51,8 +51,6 @@ static_library("P6") {
  "P6Utils.h",
  "PlatformManagerImpl.cpp",
  "PlatformManagerImpl.h",
- "SoftwareUpdateManagerImpl.cpp",
- "SoftwareUpdateManagerImpl.h",
  "SystemPlatformConfig.h",
  "WarmPlatformConfig.h",
  "app_platform_cfg.c",

diff --git a/src/platform/P6/SoftwareUpdateManagerImpl.cpp b/src/platform/P6/SoftwareUpdateManagerImpl.cpp