Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-02-23 00:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

small refactoring of memory class

Browse Source
This commit is contained in:
Thomas Kunze 2019-11-04 21:51:52 +01:00
parent 2659824aa2
commit 07133807d8
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/knx/memory.cpp
View File

@ -8,8 +8,6 @@ Memory::Memory(Platform& platform, DeviceObject& deviceObject)
{
}
// TODO implement flash layout: manufacturerID, HarwareType, Version, addr[0], size[0], addr[1], size[1], ...
// reconstruct free flash list and used list on read
void Memory::readMemory()
{
if (_data != nullptr)
@ -20,10 +18,7 @@ void Memory::readMemory()
uint16_t metadataBlockSize = alignToPageSize(_metadataSize);
MemoryBlock* allFreeFlash = new MemoryBlock();
allFreeFlash->address = _data + metadataBlockSize;
allFreeFlash->size = flashSize - metadataBlockSize;
allFreeFlash->next = nullptr;
_freeList = new MemoryBlock(_data + metadataBlockSize, flashSize - metadataBlockSize);
uint16_t manufacturerId = 0;
uint8_t* buffer = popWord(manufacturerId, _data);
@ -131,9 +126,7 @@ uint8_t* Memory::allocMemory(size_t size)
else
{
// split block
MemoryBlock* newBlock = new MemoryBlock();
newBlock->address = blockToUse->address;
newBlock->size = size;
MemoryBlock* newBlock = new MemoryBlock(blockToUse->address, size);
addToUsedList(newBlock);
blockToUse->address += size;
@ -356,9 +349,6 @@ void Memory::addNewUsedBlock(uint8_t* address, size_t size)
}
}
MemoryBlock* newUsedBlock = new MemoryBlock();
newUsedBlock->address = address;
newUsedBlock->size = size;
newUsedBlock->next = nullptr;
MemoryBlock* newUsedBlock = new MemoryBlock(address, size);
addToUsedList(newUsedBlock);
}

14
src/knx/memory.h
View File

@ -7,12 +7,16 @@
#define MAXSAVE 10
typedef struct _memoryBlock
class MemoryBlock
{
uint8_t* address;
size_t size;
struct _memoryBlock* next;
} MemoryBlock;
public:
MemoryBlock(){};
MemoryBlock(uint8_t* address, size_t size)
: address(address), size(size) {}
uint8_t* address = nullptr;
size_t size = 0;
MemoryBlock* next = nullptr;
};
class Memory
{