From 28a3225799f816a12afd1b702531119ace103488 Mon Sep 17 00:00:00 2001 From: Oren Vormaser Date: Wed, 12 Aug 2020 13:03:11 +0000 Subject: [PATCH] tlvf: PLATFORM_SON_SLAVE_REGISTER_RESPONSE remove unused fields Remove of unused fields: sPlatformSettings and wlan_settings from PLATFORM_SON_SLAVE_REGISTER_RESPONSE message. Those fields have been moved to the Agent_DB and there for no longer needed as part of this beerocks massage. PPM-338 Signed-off-by: Oren Vormaser --- .../beerocks/tlvf/beerocks_message_platform.h | 4 ---- .../tlvf/beerocks_message_platform.cpp | 24 ------------------- .../tlvf/beerocks_message_platform.yaml | 4 +--- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_platform.h b/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_platform.h index 7af51a48f4..6481737155 100644 --- a/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_platform.h +++ b/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_platform.h @@ -83,8 +83,6 @@ class cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE : public BaseClass static eActionOp_PLATFORM get_action_op(){ return (eActionOp_PLATFORM)(ACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE); } - sPlatformSettings& platform_settings(); - sWlanSettings& wlan_settings(); uint32_t& valid(); void class_swap() override; bool finalize() override; @@ -93,8 +91,6 @@ class cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE : public BaseClass private: bool init(); eActionOp_PLATFORM* m_action_op = nullptr; - sPlatformSettings* m_platform_settings = nullptr; - sWlanSettings* m_wlan_settings = nullptr; uint32_t* m_valid = nullptr; }; diff --git a/common/beerocks/tlvf/AutoGenerated/src/beerocks/tlvf/beerocks_message_platform.cpp b/common/beerocks/tlvf/AutoGenerated/src/beerocks/tlvf/beerocks_message_platform.cpp index ab4a1dcc10..1d037921d3 100644 --- a/common/beerocks/tlvf/AutoGenerated/src/beerocks/tlvf/beerocks_message_platform.cpp +++ b/common/beerocks/tlvf/AutoGenerated/src/beerocks/tlvf/beerocks_message_platform.cpp @@ -185,14 +185,6 @@ BaseClass(base->getBuffPtr(), base->getBuffRemainingBytes(), parse){ } cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::~cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE() { } -sPlatformSettings& cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::platform_settings() { - return (sPlatformSettings&)(*m_platform_settings); -} - -sWlanSettings& cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::wlan_settings() { - return (sWlanSettings&)(*m_wlan_settings); -} - uint32_t& cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::valid() { return (uint32_t&)(*m_valid); } @@ -200,8 +192,6 @@ uint32_t& cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::valid() { void cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::class_swap() { tlvf_swap(8*sizeof(eActionOp_PLATFORM), reinterpret_cast(m_action_op)); - m_platform_settings->struct_swap(); - m_wlan_settings->struct_swap(); tlvf_swap(32, reinterpret_cast(m_valid)); } @@ -235,8 +225,6 @@ bool cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::finalize() size_t cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::get_initial_size() { size_t class_size = 0; - class_size += sizeof(sPlatformSettings); // platform_settings - class_size += sizeof(sWlanSettings); // wlan_settings class_size += sizeof(uint32_t); // valid return class_size; } @@ -247,18 +235,6 @@ bool cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE::init() TLVF_LOG(ERROR) << "Not enough available space on buffer. Class init failed"; return false; } - m_platform_settings = reinterpret_cast(m_buff_ptr__); - if (!buffPtrIncrementSafe(sizeof(sPlatformSettings))) { - LOG(ERROR) << "buffPtrIncrementSafe(" << std::dec << sizeof(sPlatformSettings) << ") Failed!"; - return false; - } - if (!m_parse__) { m_platform_settings->struct_init(); } - m_wlan_settings = reinterpret_cast(m_buff_ptr__); - if (!buffPtrIncrementSafe(sizeof(sWlanSettings))) { - LOG(ERROR) << "buffPtrIncrementSafe(" << std::dec << sizeof(sWlanSettings) << ") Failed!"; - return false; - } - if (!m_parse__) { m_wlan_settings->struct_init(); } m_valid = reinterpret_cast(m_buff_ptr__); if (!buffPtrIncrementSafe(sizeof(uint32_t))) { LOG(ERROR) << "buffPtrIncrementSafe(" << std::dec << sizeof(uint32_t) << ") Failed!"; diff --git a/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_platform.yaml b/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_platform.yaml index 5764402e77..24cbe2b4f0 100755 --- a/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_platform.yaml +++ b/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_platform.yaml @@ -24,11 +24,9 @@ cACTION_PLATFORM_SON_SLAVE_REGISTER_REQUEST: cACTION_PLATFORM_SON_SLAVE_REGISTER_RESPONSE: _type: class - platform_settings: sPlatformSettings - wlan_settings: sWlanSettings valid: _type: uint32_t - _comment: #Marks whether the settings are valid + _comment: # Marks whether the settings received into agent_db cACTION_PLATFORM_ARP_MONITOR_NOTIFICATION: _type: class