From 3ce433cfd1e379aada08b91aa544d79ee3f6ab84 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 22 Aug 2016 10:30:35 +0800 Subject: [PATCH] components/nvs: make some methods const --- components/nvs_flash/src/compressed_enum_table.hpp | 2 +- components/nvs_flash/src/nvs_page.cpp | 4 ++-- components/nvs_flash/src/nvs_page.hpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/nvs_flash/src/compressed_enum_table.hpp b/components/nvs_flash/src/compressed_enum_table.hpp index 8ee95d9f99..319d86a45c 100644 --- a/components/nvs_flash/src/compressed_enum_table.hpp +++ b/components/nvs_flash/src/compressed_enum_table.hpp @@ -33,7 +33,7 @@ public: return mData; } - Tenum get(size_t index) + Tenum get(size_t index) const { assert(index >= 0 && index < Nitems); size_t wordIndex = index / ITEMS_PER_WORD; diff --git a/components/nvs_flash/src/nvs_page.cpp b/components/nvs_flash/src/nvs_page.cpp index de325a170c..0633f5d946 100644 --- a/components/nvs_flash/src/nvs_page.cpp +++ b/components/nvs_flash/src/nvs_page.cpp @@ -536,7 +536,7 @@ esp_err_t Page::alterPageState(PageState state) return ESP_OK; } -esp_err_t Page::readEntry(size_t index, Item& dst) +esp_err_t Page::readEntry(size_t index, Item& dst) const { auto rc = spi_flash_read(getEntryAddress(index), reinterpret_cast(&dst), sizeof(dst)); if (rc != ESP_OK) { @@ -658,7 +658,7 @@ void Page::invalidateCache() mFindInfo = CachedFindInfo(); } -void Page::debugDump() +void Page::debugDump() const { printf("state=%x addr=%x seq=%d\nfirstUsed=%d nextFree=%d used=%d erased=%d\n", mState, mBaseAddress, mSeqNumber, static_cast(mFirstUsedEntry), static_cast(mNextFreeEntry), mUsedEntryCount, mErasedEntryCount); size_t skip = 0; diff --git a/components/nvs_flash/src/nvs_page.hpp b/components/nvs_flash/src/nvs_page.hpp index f0c69c4246..a962aa3bfc 100644 --- a/components/nvs_flash/src/nvs_page.hpp +++ b/components/nvs_flash/src/nvs_page.hpp @@ -162,7 +162,7 @@ public: void invalidateCache(); - void debugDump(); + void debugDump() const; protected: @@ -195,7 +195,7 @@ protected: esp_err_t alterPageState(PageState state); - esp_err_t readEntry(size_t index, Item& dst); + esp_err_t readEntry(size_t index, Item& dst) const; esp_err_t writeEntry(const Item& item); @@ -210,7 +210,7 @@ protected: return static_cast(type) & 0x0f; } - uint32_t getEntryAddress(size_t entry) + uint32_t getEntryAddress(size_t entry) const { assert(entry < ENTRY_COUNT); return mBaseAddress + ENTRY_DATA_OFFSET + static_cast(entry) * ENTRY_SIZE; -- 2.40.0