Merge pull request #104 from pan-apple/nrf5-platform

Fixes for building nRF5 platform

src/ble/CHIPBleServiceData.h

@@ -23,6 +23,8 @@
 #ifndef CHIP_BLE_SERVICE_DATA_H
 #define CHIP_BLE_SERVICE_DATA_H
 
+#include <core/CHIPEncoding.h>
+
 namespace chip {
 namespace Ble {
 
@@ -41,7 +43,7 @@ enum chipBLEServiceDataType
  * Defines the over-the-air encoded format of the device identification information block that appears
  * within chip BLE service advertisement data.
  */
-struct chipBLEDeviceIdentificationInfo
+struct ChipBLEDeviceIdentificationInfo
 {
     enum
     {

src/include/platform/CHIPDeviceConfig.h

@@ -403,7 +403,7 @@
  * using the chip Time Sync protocol.
  */
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
 #endif
 
 /**

src/include/platform/CHIPDeviceEvent.h

@@ -270,6 +270,8 @@ typedef void (*AsyncWorkFunct)(intptr_t arg);
 #include CHIPDEVICEPLATFORMEVENT_HEADER
 #endif
 
+#include <system/SystemPacketBuffer.h>
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -353,7 +355,6 @@ struct ChipDeviceEvent final
             uint64_t PeerNodeId;
             uint16_t SessionKeyId;
             uint8_t EncType;
-            ::chip::ChipAuthMode AuthMode;
             bool IsCommissioner;
         } SessionEstablished;
         struct
@@ -367,7 +368,7 @@ struct ChipDeviceEvent final
         struct
         {
             BLE_CONNECTION_OBJECT ConId;
-            PacketBuffer * Data;
+            chip::System::PacketBuffer * Data;
         } CHIPoBLEWriteReceived;
         struct
         {

src/include/platform/ConfigurationManager.h

@@ -24,8 +24,6 @@
 #define CONFIGURATION_MANAGER_H
 
 #include <platform/PersistedStorage.h>
-#include <profiles/device-description/DeviceDescription.h>
-#include <profiles/network-provisioning/NetworkProvisioning.h>
 
 namespace chip {
 namespace Ble {
@@ -38,29 +36,24 @@ namespace DeviceLayer {
 
 class PlatformManagerImpl;
 class ConfigurationManagerImpl;
-class TraitManager;
 namespace Internal {
 template<class> class GenericPlatformManagerImpl;
-class DeviceControlServer;
-class NetworkProvisioningServer;
 }
 
 /**
  * Provides access to runtime and build-time configuration information for a chip device.
  */
 class ConfigurationManager
 {
-    using ChipDeviceDescriptor = ::chip::Profiles::DeviceDescription::ChipDeviceDescriptor;
-
 public:
 
     // ===== Members that define the public interface of the ConfigurationManager
 
     enum
     {
         kMaxPairingCodeLength = 15,
-        kMaxSerialNumberLength = ChipDeviceDescriptor::kMaxSerialNumberLength,
-        kMaxFirmwareRevisionLength = ChipDeviceDescriptor::kMaxSoftwareVersionLength,
+        kMaxSerialNumberLength = 32,
+        kMaxFirmwareRevisionLength = 32,
     };
 
     CHIP_ERROR GetVendorId(uint16_t & vendorId);
@@ -109,8 +102,6 @@ class ConfigurationManager
     CHIP_ERROR StoreServiceConfig(const uint8_t * serviceConfig, size_t serviceConfigLen);
     CHIP_ERROR StorePairedAccountId(const char * accountId, size_t accountIdLen);
 
-    CHIP_ERROR GetDeviceDescriptor(ChipDeviceDescriptor & deviceDesc);
-    CHIP_ERROR GetDeviceDescriptorTLV(uint8_t * buf, size_t bufSize, size_t & encodedLen);
     CHIP_ERROR GetQRCodeString(char * buf, size_t bufSize);
 
     CHIP_ERROR GetWiFiAPSSID(char * buf, size_t bufSize);
@@ -135,17 +126,14 @@ class ConfigurationManager
 
     friend class ::chip::DeviceLayer::PlatformManagerImpl;
     template<class> friend class ::chip::DeviceLayer::Internal::GenericPlatformManagerImpl;
-    friend class ::chip::DeviceLayer::TraitManager;
-    friend class ::chip::DeviceLayer::Internal::DeviceControlServer;
     // Parentheses used to fix clang parsing issue with these declarations
-    friend CHIP_ERROR (::chip::Platform::PersistedStorage::Read(::chip::Platform::PersistedStorage::Key key, uint32_t & value));
-    friend CHIP_ERROR (::chip::Platform::PersistedStorage::Write(::chip::Platform::PersistedStorage::Key key, uint32_t value));
+    friend CHIP_ERROR ::chip::Platform::PersistedStorage::Read(::chip::Platform::PersistedStorage::Key key, uint32_t & value);
+    friend CHIP_ERROR ::chip::Platform::PersistedStorage::Write(::chip::Platform::PersistedStorage::Key key, uint32_t value);
 
     using ImplClass = ConfigurationManagerImpl;
 
     CHIP_ERROR Init();
     CHIP_ERROR ConfigureChipStack();
-    ::chip::Profiles::Security::AppKeys::GroupKeyStoreBase * GetGroupKeyStore();
     bool CanFactoryReset();
     CHIP_ERROR GetFailSafeArmed(bool & val);
     CHIP_ERROR SetFailSafeArmed(bool val);
@@ -429,16 +417,6 @@ inline CHIP_ERROR ConfigurationManager::WritePersistedStorageValue(::chip::Platf
     return static_cast<ImplClass*>(this)->_WritePersistedStorageValue(key, value);
 }
 
-inline CHIP_ERROR ConfigurationManager::GetDeviceDescriptor(chipDeviceDescriptor & deviceDesc)
-{
-    return static_cast<ImplClass*>(this)->_GetDeviceDescriptor(deviceDesc);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetDeviceDescriptorTLV(uint8_t * buf, size_t bufSize, size_t & encodedLen)
-{
-    return static_cast<ImplClass*>(this)->_GetDeviceDescriptorTLV(buf, bufSize, encodedLen);
-}
-
 inline CHIP_ERROR ConfigurationManager::GetQRCodeString(char * buf, size_t bufSize)
 {
     return static_cast<ImplClass*>(this)->_GetQRCodeString(buf, bufSize);
@@ -449,7 +427,7 @@ inline CHIP_ERROR ConfigurationManager::GetWiFiAPSSID(char * buf, size_t bufSize
     return static_cast<ImplClass*>(this)->_GetWiFiAPSSID(buf, bufSize);
 }
 
-inline CHIP_ERROR ConfigurationManager::GetBLEDeviceIdentificationInfo(Ble::chipBLEDeviceIdentificationInfo & deviceIdInfo)
+inline CHIP_ERROR ConfigurationManager::GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo)
 {
     return static_cast<ImplClass*>(this)->_GetBLEDeviceIdentificationInfo(deviceIdInfo);
 }
@@ -489,14 +467,9 @@ inline CHIP_ERROR ConfigurationManager::Init()
     return static_cast<ImplClass*>(this)->_Init();
 }
 
-inline CHIP_ERROR ConfigurationManager::ConfigurechipStack()
-{
-    return static_cast<ImplClass*>(this)->_ConfigurechipStack();
-}
-
-inline ::chip::Profiles::Security::AppKeys::GroupKeyStoreBase * ConfigurationManager::GetGroupKeyStore()
+inline CHIP_ERROR ConfigurationManager::ConfigureChipStack()
 {
-     return static_cast<ImplClass*>(this)->_GetGroupKeyStore();
+    return static_cast<ImplClass*>(this)->_ConfigureChipStack();
 }
 
 inline bool ConfigurationManager::CanFactoryReset()

src/include/platform/EFR32/ConfigurationManagerImpl.h

@@ -54,7 +54,6 @@ class ConfigurationManagerImpl final : public ConfigurationManager,
 
     CHIP_ERROR _Init(void);
     CHIP_ERROR _GetPrimaryWiFiMACAddress(uint8_t *buf);
-    CHIP_ERROR _GetDeviceDescriptor(::chip::Profiles::DeviceDescription::ChipDeviceDescriptor &deviceDesc);
     ::chip::Profiles::Security::AppKeys::GroupKeyStoreBase *_GetGroupKeyStore(void);
     bool                                                         _CanFactoryReset(void);
     void                                                         _InitiateFactoryReset(void);

src/include/platform/GeneralUtils.h

@@ -20,13 +20,15 @@
  *          General utility functions available on all platforms.
  */
 
+#include <inet/inet.h>
+
 namespace chip {
 namespace DeviceLayer {
 
 extern CHIP_ERROR ParseCompilerDateStr(const char * dateStr, uint16_t & year, uint8_t & month, uint8_t & dayOfMonth);
 extern CHIP_ERROR Parse24HourTimeStr(const char * timeStr, uint8_t & hour, uint8_t & minute, uint8_t & second);
-extern const char * CharacterizeIPv6Address(const ::Inet::IPAddress & ipAddr);
-extern const char * CharacterizeIPv6Prefix(const Inet::IPPrefix & inPrefix);
+extern const char * CharacterizeIPv6Address(const chip::Inet::IPAddress &ipAddr);
+extern const char * CharacterizeIPv6Prefix(const chip::Inet::IPPrefix &inPrefix);
 extern void RegisterDeviceLayerErrorFormatter(void);
 extern bool FormatDeviceLayerError(char * buf, uint16_t bufSize, int32_t err);
 

src/include/platform/PlatformManager.h

@@ -102,10 +102,10 @@ class PlatformManager
     template<class> friend class Internal::GenericThreadStackManagerImpl_OpenThread_LwIP;
     template<class> friend class Internal::GenericConfigurationManagerImpl;
     // Parentheses used to fix clang parsing issue with these declarations
-    friend ::chip::System::Error (::chip::System::Platform::Layer::PostEvent(::chip::System::Layer & aLayer, void * aContext, ::chip::System::Object & aTarget, ::chip::System::EventType aType, uintptr_t aArgument));
-    friend ::chip::System::Error (::chip::System::Platform::Layer::DispatchEvents(::chip::System::Layer & aLayer, void * aContext));
-    friend ::chip::System::Error (::chip::System::Platform::Layer::DispatchEvent(::chip::System::Layer & aLayer, void * aContext, ::chip::System::Event aEvent));
-    friend ::chip::System::Error (::chip::System::Platform::Layer::StartTimer(::chip::System::Layer & aLayer, void * aContext, uint32_t aMilliseconds));
+    friend ::chip::System::Error ::chip::System::Platform::Layer::PostEvent(::chip::System::Layer & aLayer, void * aContext, ::chip::System::Object & aTarget, ::chip::System::EventType aType, uintptr_t aArgument);
+    friend ::chip::System::Error ::chip::System::Platform::Layer::DispatchEvents(::chip::System::Layer & aLayer, void * aContext);
+    friend ::chip::System::Error ::chip::System::Platform::Layer::DispatchEvent(::chip::System::Layer & aLayer, void * aContext, ::chip::System::Event aEvent);
+    friend ::chip::System::Error ::chip::System::Platform::Layer::StartTimer(::chip::System::Layer & aLayer, void * aContext, uint32_t aMilliseconds);
 
     void PostEvent(const ChipDeviceEvent * event);
     void DispatchEvent(const ChipDeviceEvent * event);
@@ -155,9 +155,9 @@ extern PlatformManagerImpl & PlatformMgrImpl(void);
 namespace chip {
 namespace DeviceLayer {
 
-inline CHIP_ERROR PlatformManager::InitchipStack()
+inline CHIP_ERROR PlatformManager::InitChipStack()
 {
-    return static_cast<ImplClass*>(this)->_InitchipStack();
+    return static_cast<ImplClass*>(this)->_InitChipStack();
 }
 
 inline CHIP_ERROR PlatformManager::AddEventHandler(EventHandlerFunct handler, intptr_t arg)
@@ -185,34 +185,34 @@ inline CHIP_ERROR PlatformManager::StartEventLoopTask(void)
     return static_cast<ImplClass*>(this)->_StartEventLoopTask();
 }
 
-inline void PlatformManager::LockchipStack(void)
+inline void PlatformManager::LockChipStack(void)
 {
-    static_cast<ImplClass*>(this)->_LockchipStack();
+    static_cast<ImplClass*>(this)->_LockChipStack();
 }
 
-inline bool PlatformManager::TryLockchipStack(void)
+inline bool PlatformManager::TryLockChipStack(void)
 {
-    return static_cast<ImplClass*>(this)->_TryLockchipStack();
+    return static_cast<ImplClass*>(this)->_TryLockChipStack();
 }
 
-inline void PlatformManager::UnlockchipStack(void)
+inline void PlatformManager::UnlockChipStack(void)
 {
-    static_cast<ImplClass*>(this)->_UnlockchipStack();
+    static_cast<ImplClass*>(this)->_UnlockChipStack();
 }
 
-inline void PlatformManager::PostEvent(const chipDeviceEvent * event)
+inline void PlatformManager::PostEvent(const ChipDeviceEvent * event)
 {
     static_cast<ImplClass*>(this)->_PostEvent(event);
 }
 
-inline void PlatformManager::DispatchEvent(const chipDeviceEvent * event)
+inline void PlatformManager::DispatchEvent(const ChipDeviceEvent * event)
 {
     static_cast<ImplClass*>(this)->_DispatchEvent(event);
 }
 
-inline CHIP_ERROR PlatformManager::StartchipTimer(uint32_t durationMS)
+inline CHIP_ERROR PlatformManager::StartChipTimer(uint32_t durationMS)
 {
-    return static_cast<ImplClass*>(this)->_StartchipTimer(durationMS);
+    return static_cast<ImplClass*>(this)->_StartChipTimer(durationMS);
 }
 
 } // namespace DeviceLayer

src/include/platform/SoftwareUpdateManager.h

@@ -25,20 +25,18 @@
 
 #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
 
-#include <profiles/software-update/SoftwareUpdateProfile.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
+#include <core/CHIPTLV.h>
 
 namespace chip {
 namespace DeviceLayer {
 
+using namespace chip::TLV;
+
 class SoftwareUpdateManagerImpl;
 
 class SoftwareUpdateManager
 {
-    typedef ::chip::TLV::TLVWriter TLVWriter;
-    typedef ::chip::Profiles::SoftwareUpdate::UpdatePriority UpdatePriority;
-    typedef ::chip::Profiles::SoftwareUpdate::UpdateCondition UpdateCondition;
-
     using ImplClass = SoftwareUpdateManagerImpl;
 
 
@@ -363,6 +361,8 @@ extern SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void);
 namespace chip {
 namespace DeviceLayer {
 
+using namespace chip::TLV;
+
 union SoftwareUpdateManager::InEventParam
 {
     void Clear(void) { memset(this, 0, sizeof(*this)); }
@@ -376,13 +376,10 @@ union SoftwareUpdateManager::InEventParam
     struct
     {
         CHIP_ERROR Error;
-        Profiles::StatusReporting::StatusReport *StatusReport;
     } QueryPrepareFailed;
 
     struct
     {
-        UpdatePriority Priority;
-        UpdateCondition Condition;
         uint8_t IntegrityType;
         const char *URI;
         const char *Version;
@@ -415,7 +412,6 @@ union SoftwareUpdateManager::InEventParam
     struct
     {
         CHIP_ERROR Error;
-        Profiles::StatusReporting::StatusReport *StatusReport;
     } Finished;
 };
 

src/include/platform/SoftwareUpdateManagerImpl.h

@@ -21,7 +21,6 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
 
 #include <platform/internal/GenericSoftwareUpdateManagerImpl.h>
-#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -32,8 +31,7 @@ namespace DeviceLayer {
  */
 class SoftwareUpdateManagerImpl final
     : public SoftwareUpdateManager,
-      public Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>,
-      public Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>
+      public Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>
 {
     // Allow the SoftwareUpdateManager interface class to delegate method calls to
     // the implementation methods provided by this class.
@@ -43,10 +41,6 @@ class SoftwareUpdateManagerImpl final
     // and types defined on this class.
     friend class Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>;
 
-    // Allow the GenericSoftwareUpdateManagerImpl_BDX base class to access helper methods
-    // and types defined on this class.
-    friend class Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>;
-
 public:
 
     // ===== Members for internal use by the following friends.

src/include/platform/internal/BLEManager.h

@@ -62,7 +62,7 @@ class BLEManager
     CHIP_ERROR SetDeviceName(const char * deviceName);
     uint16_t NumConnections(void);
     void OnPlatformEvent(const ChipDeviceEvent * event);
-    ::Ble::BleLayer * GetBleLayer(void) const;
+    chip::Ble::BleLayer * GetBleLayer(void) const;
 
 protected:
 
@@ -170,7 +170,7 @@ inline void BLEManager::OnPlatformEvent(const ChipDeviceEvent * event)
     static_cast<ImplClass*>(this)->_OnPlatformEvent(event);
 }
 
-inline ::Ble::BleLayer * BLEManager::GetBleLayer(void) const
+inline BleLayer * BLEManager::GetBleLayer(void) const
 {
     return static_cast<const ImplClass*>(this)->_GetBleLayer();
 }

src/include/platform/internal/GenericConfigurationManagerImpl.h

@@ -96,11 +96,10 @@ class GenericConfigurationManagerImpl
     CHIP_ERROR _ClearServiceProvisioningData();
     CHIP_ERROR _GetFailSafeArmed(bool & val);
     CHIP_ERROR _SetFailSafeArmed(bool val);
-    CHIP_ERROR _GetDeviceDescriptor(::chip::Profiles::DeviceDescription::ChipeviceDescriptor & deviceDesc);
-    CHIP_ERROR _GetDeviceDescriptorTLV(uint8_t * buf, size_t bufSize, size_t & encodedLen);
     CHIP_ERROR _GetQRCodeString(char * buf, size_t bufSize);
     CHIP_ERROR _GetWiFiAPSSID(char * buf, size_t bufSize);
     CHIP_ERROR _GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo);
+    CHIP_ERROR _ConfigureChipStack();
     bool _IsServiceProvisioned();
     bool _IsMemberOfFabric();
     bool _IsPairedToAccount();
@@ -131,8 +130,6 @@ class GenericConfigurationManagerImpl
 
     ImplClass * Impl() { return static_cast<ImplClass *>(this); }
 
-    static void HashLengthAndBase64Value(Platform::Security::SHA256 & hash, const uint8_t * val, uint16_t valLen);
-
 #if CHIP_DEVICE_CONFIG_ENABLE_JUST_IN_TIME_PROVISIONING
     bool UseManufacturerCredentialsAsOperational();
 #endif