diff --git a/Sming/Components/IFS b/Sming/Components/IFS index 1aaa86e1e1..2df44074ac 160000 --- a/Sming/Components/IFS +++ b/Sming/Components/IFS @@ -1 +1 @@ -Subproject commit 1aaa86e1e1ffba3c939c9f32caf91bae63325070 +Subproject commit 2df44074ac0e43b6e7930bb5c20eb39106898077 diff --git a/Sming/Components/Storage/src/include/Storage/Device.h b/Sming/Components/Storage/src/include/Storage/Device.h index b8ce634555..0255eb43e8 100644 --- a/Sming/Components/Storage/src/include/Storage/Device.h +++ b/Sming/Components/Storage/src/include/Storage/Device.h @@ -56,11 +56,6 @@ class Device : public LinkedObjectTemplate return getName() == name; } - PartitionTable& partitions() - { - return mPartitions; - } - const PartitionTable& partitions() const { return mPartitions; diff --git a/Sming/Components/Storage/src/include/Storage/Partition.h b/Sming/Components/Storage/src/include/Storage/Partition.h index 18eb0930ac..72487fdb93 100644 --- a/Sming/Components/Storage/src/include/Storage/Partition.h +++ b/Sming/Components/Storage/src/include/Storage/Partition.h @@ -334,15 +334,6 @@ class Partition */ String getDeviceName() const; - /** - * @brief Get storage device containing this partition - * @retval Device* null if device isn't registered - */ - Device* getDevice() const - { - return mDevice; - } - /** * @brief Determine if given address contained within this partition */ diff --git a/Sming/Components/Storage/src/include/Storage/PartitionTable.h b/Sming/Components/Storage/src/include/Storage/PartitionTable.h index a243d803bb..1183f2e5e1 100644 --- a/Sming/Components/Storage/src/include/Storage/PartitionTable.h +++ b/Sming/Components/Storage/src/include/Storage/PartitionTable.h @@ -77,7 +77,7 @@ class PartitionTable /** * @brief Find the n'th OTA partition */ - Partition findOta(uint8_t index) + Partition findOta(uint8_t index) const { using App = Partition::SubType::App; auto subtype = App(uint8_t(App::ota0) + index); diff --git a/Sming/Libraries/LittleFS b/Sming/Libraries/LittleFS index 27be7f5b4b..1a30230481 160000 --- a/Sming/Libraries/LittleFS +++ b/Sming/Libraries/LittleFS @@ -1 +1 @@ -Subproject commit 27be7f5b4bd59cd4e44d8a1e05f8d9bed740feca +Subproject commit 1a3023048190fc133a9a49bfe208a209eb3f56cf diff --git a/Sming/Libraries/Spiffs/src/FileMeta.cpp b/Sming/Libraries/Spiffs/src/FileMeta.cpp index e7ea32dbe7..f8af99324e 100644 --- a/Sming/Libraries/Spiffs/src/FileMeta.cpp +++ b/Sming/Libraries/Spiffs/src/FileMeta.cpp @@ -59,6 +59,7 @@ int SpiffsMetaBuffer::enumxattr(AttributeEnumCallback callback, void* buffer, si continue; } e.set(tag, value, getAttributeSize(tag)); + ++count; if(!callback(e)) { return count; } @@ -72,6 +73,7 @@ int SpiffsMetaBuffer::enumxattr(AttributeEnumCallback callback, void* buffer, si break; } e.set(AttributeTag(unsigned(AttributeTag::User) + tagIndex), &user[i], tagSize); + ++count; if(!callback(e)) { break; }