6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Be overt about colour direction.

Browse Source
This commit is contained in:
Thomas Harte 2023-01-29 13:22:56 -05:00
parent 3f12a28f4f
commit 0576451102
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Components/9918/Implementation/9918.cpp
View File

@ -856,7 +856,7 @@ void Base<personality>::commit_register(int reg, uint8_t value) {
// Check whether a command was blocked on this. // Check whether a command was blocked on this.
if( if(
Storage<personality>::command_ && Storage<personality>::command_ &&
Storage<personality>::command_->access == Command::AccessType::WaitForColour Storage<personality>::command_->access == Command::AccessType::WaitForColourReceipt
) { ) {
Storage<personality>::command_->advance(); Storage<personality>::command_->advance();
Storage<personality>::update_command_step(fetch_pointer_.column); Storage<personality>::update_command_step(fetch_pointer_.column);
@ -1030,7 +1030,7 @@ uint8_t Base<personality>::read_register() {
(( ((
!Storage<personality>::command_ || !Storage<personality>::command_ ||
!Storage<personality>::command_->is_cpu_transfer || !Storage<personality>::command_->is_cpu_transfer ||
Storage<personality>::command_->access == Command::AccessType::WaitForColour Storage<personality>::command_->access == Command::AccessType::WaitForColourReceipt
) ? 0x80 : 0x00); ) ? 0x80 : 0x00);
return return

2
Components/9918/Implementation/9918Base.hpp
View File

@ -212,7 +212,7 @@ template <Personality personality> struct Storage<personality, std::enable_if_t<
case Command::AccessType::PlotPoint: case Command::AccessType::PlotPoint:
next_command_step_ = CommandStep::ReadPixel; next_command_step_ = CommandStep::ReadPixel;
break; break;
case Command::AccessType::WaitForColour: case Command::AccessType::WaitForColourReceipt:
// i.e. nothing to do until a colour is received. // i.e. nothing to do until a colour is received.
next_command_step_ = CommandStep::None; next_command_step_ = CommandStep::None;
break; break;

6
Components/9918/Implementation/YamahaCommands.hpp
View File

@ -62,7 +62,7 @@ struct Command {
PlotPoint, PlotPoint,
/// Blocks until the next CPU write to the colour register. /// Blocks until the next CPU write to the colour register.
WaitForColour, WaitForColourReceipt,
}; };
AccessType access = AccessType::PlotPoint; AccessType access = AccessType::PlotPoint;
int cycles = 0; int cycles = 0;
@ -187,7 +187,7 @@ struct LogicalMoveFromCPU: public Command {
switch(access) { switch(access) {
default: break; default: break;
case AccessType::WaitForColour: case AccessType::WaitForColourReceipt:
cycles = 32; cycles = 32;
location = context.destination; location = context.destination;
access = AccessType::PlotPoint; access = AccessType::PlotPoint;
@ -195,7 +195,7 @@ struct LogicalMoveFromCPU: public Command {
case AccessType::PlotPoint: case AccessType::PlotPoint:
cycles = 0; cycles = 0;
access = AccessType::WaitForColour; access = AccessType::WaitForColourReceipt;
context.destination.add<0>(context.arguments & 0x4 ? -1 : 1); context.destination.add<0>(context.arguments & 0x4 ? -1 : 1);
--context.size.v[0]; --context.size.v[0];