Peter M. Groen / dali_slave

Commit 87f268662245c25dc24ec82e2163fad34f140d93

Authored by Arkadiusz Materek
1 parent de231da1

Minor fixes

Inline Side-by-side
Showing 4 changed files with 7 additions and 11 deletions
.gitignore
  View file @87f2686
1   -/Infineon/
2 1 \ No newline at end of file
  2 +/Infineon/
  3 +/Eval Release/
  4 +/Eval Debug/
... ...
.settings/properties.index
  View file @87f2686
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<com.ifx.xmc4000.appDebug.550260580_memory>
  2 +<com.ifx.xmc4000.appDebug_memory>
3 3 <details IMemento.internal.id="0" enable="Yes" endAddress="0x100329FF" memModelType="ROM" modelName="FLASH" startAddress="0x10001000"/>
4 4 <details IMemento.internal.id="1" enable="Yes" endAddress="0x20003FFF" memModelType="RAM" modelName="SRAM " startAddress="0x20000000"/>
5   -</com.ifx.xmc4000.appDebug.550260580_memory>
6 5 \ No newline at end of file
  6 +</com.ifx.xmc4000.appDebug_memory>
7 7 \ No newline at end of file
... ...
src/dali/controller/memory.cpp
  View file @87f2686
... ... @@ -31,10 +31,9 @@ Memory::Memory(IMemory* memory) :
31 31  
32 32 for (uint8_t i = 0; i < DALI_BANKS; ++i) {
33 33 mBankData[i] = mMemory->data(getBankAddr(i), getBankSize(i));
34   - if ((uintptr_t) mBankData[i] == INVALID_BANK_ADDR) {
35   - mBankData[i] = nullptr;
  34 + if (mBankData[i] != nullptr) {
  35 + resetBankIfNeeded(i);
36 36 }
37   - resetBankIfNeeded(i);
38 37 }
39 38  
40 39 if (mData != nullptr) {
... ...
src/dali/dali.hpp
  View file @87f2686
... ... @@ -45,11 +45,6 @@ enum class Status {
45 45  
46 46 class IMemory {
47 47 public:
48   - class IMemoryClient {
49   - public:
50   - virtual void onBankReset(uint8_t bank) = 0;
51   - };
52   -
53 48 virtual size_t dataSize() = 0;
54 49 virtual size_t dataWrite(uintptr_t addr, const uint8_t* data, size_t size) = 0;
55 50 virtual const uint8_t* data(uintptr_t addr, size_t size) = 0;
... ...