Skip to content

mcu_timer: initialize fields from manual #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcmoyer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mcu_timer: initialize fields from manual #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mcu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,6 +1761,7 @@ int main(int argc, char *argv[])
MCU_Reset();
SM_Reset();
PCM_Reset();
TIMER_Reset();

if (resetType != ResetType::NONE) MIDI_Reset(resetType);

Expand Down
8 changes: 8 additions & 0 deletions src/mcu_timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,15 @@ void TIMER_Reset(void)
timer_cycles = 0;
timer_tempreg = 0;
memset(frt, 0, sizeof(frt));
for (int i = 0; i < 3; ++i)
{
frt[i].ocra = 0xffff;
frt[i].ocrb = 0xffff;
}
memset(&timer, 0, sizeof(timer));
timer.tcora = 0xff;
timer.tcorb = 0xff;
timer.tcsr = 0x10;
}

void TIMER_Write(uint32_t address, uint8_t data)
Expand Down
2 changes: 2 additions & 0 deletions src/mcu_timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ struct mcu_timer_t {
uint8_t status_rd;
};

void TIMER_Reset(void);

void TIMER_Write(uint32_t address, uint8_t data);
uint8_t TIMER_Read(uint32_t address);
void TIMER_Clock(uint64_t cycles);
Expand Down