Merging master

This commit is contained in:
Anonymus Raccoon
2020-05-27 16:11:59 +02:00
parent c374641ef1
commit 0af0db6d66
4 changed files with 19 additions and 3 deletions
+5
View File
@@ -56,4 +56,9 @@ namespace ComSquare::CPU
throw InvalidAddress("DMA read", addr);
}
}
uint8_t DMA::run(unsigned int cycles)
{
return 0;
}
}
+5
View File
@@ -61,6 +61,11 @@ namespace ComSquare::CPU
//! @brief Bus helper to write to this channel.
void write(uint8_t addr, uint8_t data);
//! @brief Run the DMA for x cycles
//! @param cycles The maximum number of cycles this DMA should run.
//! @return the number of cycles taken
uint8_t run(unsigned cycles);
DMA() = default;
DMA(const DMA &) = default;
DMA &operator=(const DMA &) = default;