Merge 4ecc918 into bbd9e6e

src/platform/openiotsdk/CHIPDevicePlatformConfig.h

@@ -15,6 +15,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
 /**
  *    @file
  *          Platform-specific configuration overrides for the chip Device Layer

src/platform/openiotsdk/ConfigurationManagerImpl.cpp

@@ -18,14 +18,22 @@
 
 /**
  *    @file
- *          Provides the implementation of the Device Layer Configuration Manager class
- *          for Open IOT SDK platform.
+ *          Provides the implementation of the Device Layer ConfigurationManager object
+ *          for Open IOT SDK platforms.
  */
+/* this file behaves like a config.h, comes first */
 
-#include <platform/ConfigurationManager.h>
+// FIXME: Undefine the `sleep()` function included by the CHIPDeviceLayer.h
+// from unistd.h to avoid a conflicting declaration with the `sleep()` provided
+// by Mbed-OS in mbed_power_mgmt.h.
+#define sleep unistd_sleep
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+#undef sleep
+
 #include <platform/internal/GenericConfigurationManagerImpl.ipp>
 
+#include <platform/ConfigurationManager.h>
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -150,7 +158,8 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
 
     // Restart the system.
     ChipLogProgress(DeviceLayer, "System restarting");
-    // ToDo reset system
+    // TODO: implement system_reset()
+    // system_reset();
 }
 
 } // namespace DeviceLayer

src/platform/openiotsdk/ConfigurationManagerImpl.h

@@ -18,8 +18,8 @@
 
 /**
  *    @file
- *          Provides an implementation of the Configuration Manager class
- *          for Open IOT SDK platform.
+ *          Provides an implementation of the ConfigurationManager object
+ *          for Open IOT SDK platforms.
  */
 
 #pragma once

src/platform/openiotsdk/ConnectivityManagerImpl.cpp

@@ -21,6 +21,7 @@
  *          Provides the implementation of the Device Layer Connectivity Manager class
  *          for Open IOT SDK platform.
  */
+/* this file behaves like a config.h, comes first */
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
@@ -59,10 +60,5 @@ void ConnectivityManagerImpl::AddTask(AsyncWorkFunct workFunct, intptr_t arg)
     PlatformMgr().ScheduleWork(workFunct, arg);
 }
 
-void ConnectivityManagerImpl::AddQueueEvent(void * event)
-{
-    // ToDo add event to queue
-}
-
 } // namespace DeviceLayer
 } // namespace chip

src/platform/openiotsdk/ConnectivityManagerImpl.h

@@ -19,7 +19,7 @@
 /**
  *    @file
  *          Provides the implementation of the Device Layer Connectivity Manager class
- *          for Open IOT SDK platform.
+ *          for Open IOT SDK platforms.
  */
 
 #pragma once
@@ -36,7 +36,7 @@ namespace chip {
 namespace DeviceLayer {
 
 /**
- * Concrete implementation of the ConnectivityManager singleton object for Open IOT SDK platform.
+ * Concrete implementation of the ConnectivityManager singleton object for Open IoT SDK platforms.
  */
 class ConnectivityManagerImpl final : public ConnectivityManager,
                                       public Internal::GenericConnectivityManagerImpl<ConnectivityManagerImpl>,
@@ -61,7 +61,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 public:
     CHIP_ERROR PostEvent(const ChipDeviceEvent * event, bool die);
     void AddTask(AsyncWorkFunct workFunct, intptr_t arg);
-    void AddQueueEvent(void * event);
 };
 
 /**

src/platform/openiotsdk/DeviceNetworkProvisioningDelegateImpl.cpp

@@ -24,6 +24,9 @@
 
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/openiotsdk/DeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/openiotsdk/NetworkCommissioningDriver.h>
+
+using namespace ::chip::DeviceLayer::NetworkCommissioning;
 
 namespace chip {
 namespace DeviceLayer {

src/platform/openiotsdk/DiagnosticDataProviderImpl.cpp

@@ -25,6 +25,7 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <lib/support/logging/CHIPLogging.h>
+#include <platform/DiagnosticDataProvider.h>
 #include <platform/openiotsdk/DiagnosticDataProviderImpl.h>
 
 namespace chip {

src/platform/openiotsdk/Logging.cpp

@@ -31,6 +31,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define DEFAULT_TRACE_FILTER_LENGTH 24
+
 namespace chip {
 namespace DeviceLayer {
 

src/platform/openiotsdk/NetworkCommissioningDriver.h

@@ -30,8 +30,6 @@ namespace chip {
 namespace DeviceLayer {
 namespace NetworkCommissioning {
 
-// TODO
-
 class OpenIoTSDKEthernetDriver final : public EthernetDriver
 {
 public:

src/platform/openiotsdk/NetworkCommissioningEthernetDriver.cpp

@@ -22,6 +22,7 @@
  *          for Open IOT SDK platform.
  */
 
+#include <lwip/netif.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/openiotsdk/NetworkCommissioningDriver.h>
 
@@ -36,9 +37,13 @@ namespace NetworkCommissioning {
 NetworkIterator * OpenIoTSDKEthernetDriver::GetNetworks()
 {
     auto ret = new EthernetNetworkIterator();
-    // TODO fill in
-    // memcpy(ret->interfaceName, src, len);
-    // ret->interfaceNameLen = len;
+
+    ifname[NETIF_NAMESIZE];
+    ifname = netif_index_to_name(0, ifname);
+
+    ret->interfaceNameLen = strlen(ifname);
+    memcpy(ret->interfaceName, ifname, ret->interfaceNameLen);
+
     return ret;
 }