eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #965 from srg320/master

Browse Source 
Saturn: fix the start of the track in the TOC, recalculate the CD cycle time when file access is delayed.
This commit is contained in:
Alexey Melnikov
2025-02-10 20:58:52 +08:00
committed by GitHub
parent 6bbc3a4809 80107bf693
commit 7513e58f57
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
support/saturn/saturn.cpp
View File

@@ -75,13 +75,19 @@ void saturn_poll()
satcdd.Update();
saturn_frame_cnt++;
#ifdef SATURN_DEBUG
unsigned long curr_timer = GetTimer(0);
if (curr_timer >= poll_timer) {
poll_timer = curr_timer + CalcTimerOffset(time_mode);
#ifdef SATURN_DEBUG
user_io_status_set("[63]", 1);
printf("\x1b[32mSaturn: ");
printf("Time over: next = %lu, curr = %lu", poll_timer, curr_timer);
printf("\n\x1b[0m");
#endif // SATURN_DEBUG
}
#ifdef SATURN_DEBUG
else
user_io_status_set("[63]", 0);
#endif // SATURN_DEBUG
}
}

4
support/saturn/saturncdd.cpp
View File

@@ -586,7 +586,7 @@ void satcdd_t::CommandExec() {
//printf("Command = %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", comm[0], comm[1], comm[2], comm[3], comm[4], comm[5], comm[6], comm[7], comm[8], comm[9], comm[10], comm[11]);
//printf("\n\x1b[0m");
printf("\x1b[32mSaturn: ");
printf("Command Read Data: tno = %u, idx = %u, start = %u, FAD = %u, track = %u, track_start = %u, speed = %u", cmd_tno, cmd_idx, cmd_fad, fad, this->track + 1, this->toc.tracks[this->track].start, this->speed);
printf("Command Read Data: tno = %u, idx = %u, FAD = %u, track = %u, track_start = %u", cmd_tno, cmd_idx, fad, this->track + 1, this->toc.tracks[this->track].start);
printf(" (%u)\n\x1b[0m", saturn_frame_cnt);
#endif // SATURN_DEBUG
break;
@@ -680,7 +680,7 @@ void satcdd_t::Process(uint8_t* time_mode) {
if (toc_pos < 0x100)
{
int lba_ = this->toc.tracks[toc_pos & 0xFF].start + 150;
int lba_ = this->toc.tracks[toc_pos].start + 150 + this->GetSectorOffsetByIndex(toc_pos + 1, 1);
LBAToMSF(lba_, &msf);
idx = BCD(toc_pos + 1);
q = this->toc.tracks[toc_pos & 0xFF].type ? 0x40 : 0x00;