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
+1 -1
View File
@@ -132,7 +132,7 @@ namespace ComSquare::CPU
uint8_t vtimeh;
//! @brief DMA Enable Register
uint8_t mdmaen;
uint8_t dmaEnableRegister;
//! @brief HDMA Enable Register
uint8_t hdmaen;