[driver] block device: expose DeviceSize

roboterclubaachen · Jan 28, 2018 · e068490 · e068490
1 parent f4e91b3
commit e068490
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/src/xpcc/architecture/interface/block_device.hpp b/src/xpcc/architecture/interface/block_device.hpp
@@ -104,6 +104,7 @@ class BlockDevice
 	static constexpr bd_size_t BlockSizeRead = 1;
 	static constexpr bd_size_t BlockSizeWrite = 1;
 	static constexpr bd_size_t BlockSizeErase = 1;
+	static constexpr bd_size_t BlockDevice = 1024;
 
 #endif
 };

diff --git a/src/xpcc/driver/storage/block_device_file.hpp b/src/xpcc/driver/storage/block_device_file.hpp
@@ -28,7 +28,7 @@ namespace xpcc
  * \ingroup	driver_storage
  * \author	Raphael Lehmann
  */
-template <class Filename, size_t DeviceSize>
+template <class Filename, size_t DeviceSize_>
 class BdFile : public xpcc::BlockDevice, protected xpcc::NestedResumable<3>
 {
 public:
@@ -89,6 +89,7 @@ class BdFile : public xpcc::BlockDevice, protected xpcc::NestedResumable<3>
 	static constexpr bd_size_t BlockSizeRead = 1;
 	static constexpr bd_size_t BlockSizeWrite = 1;
 	static constexpr bd_size_t BlockSizeErase = 1;
+	static constexpr bd_size_t DeviceSize = DeviceSize_;
 private:
 	std::fstream file;
 };

diff --git a/src/xpcc/driver/storage/block_device_heap.hpp b/src/xpcc/driver/storage/block_device_heap.hpp
@@ -29,7 +29,7 @@ namespace xpcc
  * \ingroup	driver_storage
  * \author	Raphael Lehmann
  */
-template <size_t DeviceSize, bool externalMemory = false>
+template <size_t DeviceSize_, bool externalMemory = false>
 class BdHeap : public xpcc::BlockDevice, protected xpcc::NestedResumable<3>
 {
 public:
@@ -94,6 +94,7 @@ class BdHeap : public xpcc::BlockDevice, protected xpcc::NestedResumable<3>
 	static constexpr bd_size_t BlockSizeRead = 1;
 	static constexpr bd_size_t BlockSizeWrite = 1;
 	static constexpr bd_size_t BlockSizeErase = 1;
+	static constexpr bd_size_t DeviceSize = DeviceSize_;
 
 public:
 	void

diff --git a/src/xpcc/driver/storage/block_device_mirror.hpp b/src/xpcc/driver/storage/block_device_mirror.hpp
@@ -91,6 +91,7 @@ class BdMirror : public xpcc::BlockDevice, protected NestedResumable<3>
 	static constexpr bd_size_t BlockSizeRead = BlockDeviceA::BlockSizeRead;
 	static constexpr bd_size_t BlockSizeWrite = std::max(BlockDeviceA::BlockSizeWrite, BlockDeviceB::BlockSizeWrite);
 	static constexpr bd_size_t BlockSizeErase = std::max(BlockDeviceA::BlockSizeErase, BlockDeviceB::BlockSizeErase);
+	static constexpr bd_size_t DeviceSize = std::min(BlockDeviceA::DeviceSize, BlockDeviceB::DeviceSize);
 
 public:
 	/** Direct access to the BlockDeviceA

diff --git a/src/xpcc/driver/storage/block_device_spiflash.hpp b/src/xpcc/driver/storage/block_device_spiflash.hpp
@@ -146,6 +146,7 @@ class BdSpiFlash : public xpcc::BlockDevice, public xpcc::SpiDevice< Spi >, prot
 	static constexpr bd_size_t BlockSizeRead = 1;
 	static constexpr bd_size_t BlockSizeWrite = 256;
 	static constexpr bd_size_t BlockSizeErase = 4 * 1024;
+	static constexpr bd_size_t DeviceSize = flashSize;
 
 private:
 	uint8_t instructionBuffer[7];