mirror of
https://github.com/TomHarte/CLK.git
synced 2025-01-11 08:30:55 +00:00
Remove source control markers.
This commit is contained in:
parent
e4f7ead894
commit
cf37e9f5de
@ -15,7 +15,6 @@ void Line::set_writer_clock_rate(int clock_rate) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Line::advance_writer(int cycles) {
|
void Line::advance_writer(int cycles) {
|
||||||
<<<<<<< HEAD
|
|
||||||
if(!cycles) return;
|
if(!cycles) return;
|
||||||
|
|
||||||
remaining_delays_ = std::max(remaining_delays_ - cycles, 0);
|
remaining_delays_ = std::max(remaining_delays_ - cycles, 0);
|
||||||
@ -31,15 +30,6 @@ void Line::advance_writer(int cycles) {
|
|||||||
} else {
|
} else {
|
||||||
while(!events_.empty()) {
|
while(!events_.empty()) {
|
||||||
if(events_.front().delay <= cycles) {
|
if(events_.front().delay <= cycles) {
|
||||||
=======
|
|
||||||
remaining_delays_ = std::max(remaining_delays_ - cycles, 0);
|
|
||||||
if(events_.empty()) {
|
|
||||||
write_cycles_since_delegate_call_ += cycles;
|
|
||||||
if(write_cycles_since_delegate_call_ > 256) update_delegate(level_);
|
|
||||||
} else {
|
|
||||||
while(!events_.empty()) {
|
|
||||||
if(events_.front().delay < cycles) {
|
|
||||||
>>>>>>> 2ae5739b8b6458acd867002563f1e03e747a8ee2
|
|
||||||
cycles -= events_.front().delay;
|
cycles -= events_.front().delay;
|
||||||
write_cycles_since_delegate_call_ += events_.front().delay;
|
write_cycles_since_delegate_call_ += events_.front().delay;
|
||||||
const auto old_level = level_;
|
const auto old_level = level_;
|
||||||
@ -54,15 +44,12 @@ void Line::advance_writer(int cycles) {
|
|||||||
if(old_level != level_) {
|
if(old_level != level_) {
|
||||||
update_delegate(old_level);
|
update_delegate(old_level);
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
// Book enough extra time for the read delegate to be posted
|
// Book enough extra time for the read delegate to be posted
|
||||||
// the final bit if one is attached.
|
// the final bit if one is attached.
|
||||||
if(events_.empty()) {
|
if(events_.empty()) {
|
||||||
transmission_extra_ = minimum_write_cycles_for_read_delegate_bit();
|
transmission_extra_ = minimum_write_cycles_for_read_delegate_bit();
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
>>>>>>> 2ae5739b8b6458acd867002563f1e03e747a8ee2
|
|
||||||
} else {
|
} else {
|
||||||
events_.front().delay -= cycles;
|
events_.front().delay -= cycles;
|
||||||
write_cycles_since_delegate_call_ += cycles;
|
write_cycles_since_delegate_call_ += cycles;
|
||||||
@ -78,10 +65,7 @@ void Line::write(bool level) {
|
|||||||
events_.back().type = level ? Event::SetHigh : Event::SetLow;
|
events_.back().type = level ? Event::SetHigh : Event::SetLow;
|
||||||
} else {
|
} else {
|
||||||
level_ = level;
|
level_ = level;
|
||||||
<<<<<<< HEAD
|
|
||||||
transmission_extra_ = minimum_write_cycles_for_read_delegate_bit();
|
transmission_extra_ = minimum_write_cycles_for_read_delegate_bit();
|
||||||
=======
|
|
||||||
>>>>>>> 2ae5739b8b6458acd867002563f1e03e747a8ee2
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -155,11 +139,8 @@ void Line::update_delegate(bool level) {
|
|||||||
}
|
}
|
||||||
time_left_in_bit_ -= time_left;
|
time_left_in_bit_ -= time_left;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
int Line::minimum_write_cycles_for_read_delegate_bit() {
|
int Line::minimum_write_cycles_for_read_delegate_bit() {
|
||||||
if(!read_delegate_) return 0;
|
if(!read_delegate_) return 0;
|
||||||
return 1 + (read_delegate_bit_length_ * static_cast<unsigned int>(clock_rate_)).get<int>();
|
return 1 + (read_delegate_bit_length_ * static_cast<unsigned int>(clock_rate_)).get<int>();
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
>>>>>>> 2ae5739b8b6458acd867002563f1e03e747a8ee2
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user