6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-30 22:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Fixed: cycles_per_bit_ isn't a function of the rotational multiplier, it's absolute. Also made sure that exactly hitting the end of a bit counts.

Browse Source
This commit is contained in:
Thomas Harte 2016-12-25 16:35:39 -05:00
parent 98be6ede45
commit 007c13ec16
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Storage/Disk/DiskController.cpp
View File

@ -86,10 +86,10 @@ void Controller::run_for_cycles(int number_of_cycles)
if(cycles_until_bits_written_ > zero)
{
Storage::Time cycles_to_run_for_time(cycles_to_run_for);
if(cycles_until_bits_written_ < cycles_to_run_for_time)
if(cycles_until_bits_written_ <= cycles_to_run_for_time)
{
process_write_completed();
if(cycles_until_bits_written_ < cycles_to_run_for_time)
if(cycles_until_bits_written_ <= cycles_to_run_for_time)
cycles_until_bits_written_.set_zero();
else
cycles_until_bits_written_ -= cycles_to_run_for_time;
@ -189,12 +189,12 @@ void Controller::set_expected_bit_length(Time bit_length)
bit_length_ = bit_length;
bit_length_.simplify();
cycles_per_bit_ = Storage::Time(8000000) * (bit_length * rotational_multiplier_) * Storage::Time(clock_rate_multiplier_);
cycles_per_bit_ = Storage::Time(clock_rate_) * bit_length;
cycles_per_bit_.simplify();
// this conversion doesn't need to be exact because there's a lot of variation to be taken
// account of in rotation speed, air turbulence, etc, so a direct conversion will do
int clocks_per_bit = (int)((bit_length.length * clock_rate_) / bit_length.clock_rate);
int clocks_per_bit = (int)cycles_per_bit_.get_unsigned_int();
pll_.reset(new DigitalPhaseLockedLoop(clocks_per_bit, clocks_per_bit / 5, 3));
pll_->set_delegate(this);
}