6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-12 00:30:31 +00:00
Code Issues Projects Releases Wiki Activity

Made some AY advances; it's now being polled for samples and collecting more information on what it needs to output.

Browse Source
This commit is contained in:
Thomas Harte 2016-10-15 17:45:39 -04:00
parent da9c9ad51a
commit 51bdac27ae
4 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Components/AY38910/AY38910.cpp
View File

@ -14,8 +14,18 @@ AY38910::AY38910() : _selected_register(0)
{
}
void AY38910::set_clock_rate(double clock_rate)
{
set_input_rate((float)clock_rate);
}
void AY38910::get_samples(unsigned int number_of_samples, int16_t *target)
{
printf("%d\n", number_of_samples);
for(int c = 0; c < number_of_samples; c++)
{
*target++ = (c & 64) * 64;
}
}
void AY38910::skip_samples(unsigned int number_of_samples)
@ -30,6 +40,33 @@ void AY38910::select_register(uint8_t r)
void AY38910::set_register_value(uint8_t value)
{
_registers[_selected_register] = value;
if(value < 14)
{
int selected_register = _selected_register;
enqueue([=] () {
_output_registers[selected_register] = value;
switch(selected_register)
{
case 0: case 2: case 4:
_tone_generator_controls[selected_register >> 1] =
(_tone_generator_controls[selected_register >> 1] & ~0xff) | value;
break;
case 1: case 3: case 5:
_tone_generator_controls[selected_register >> 1] =
(_tone_generator_controls[selected_register >> 1] & 0xff) | (uint16_t)((value&0xf) << 8);
break;
case 11:
_envelope_period = (_envelope_period & ~0xff) | value;
break;
case 12:
_envelope_period = (_envelope_period & 0xff) | (uint16_t)(value << 8);
break;
}
});
}
}
uint8_t AY38910::get_register_value()

5
Components/AY38910/AY38910.hpp
View File

@ -16,6 +16,7 @@ namespace GI {
class AY38910: public ::Outputs::Filter<AY38910> {
public:
AY38910();
void set_clock_rate(double clock_rate);
void get_samples(unsigned int number_of_samples, int16_t *target);
void skip_samples(unsigned int number_of_samples);
@ -28,8 +29,10 @@ class AY38910: public ::Outputs::Filter<AY38910> {
private:
int _selected_register;
uint8_t _registers[16];
uint8_t _registers[16], _output_registers[16];
uint16_t _tone_generator_controls[3];
uint16_t _envelope_period;
};
};

2
Machines/Oric/Oric.cpp
View File

@ -73,11 +73,13 @@ void Machine::setup_output(float aspect_ratio)
{
_videoOutput.reset(new VideoOutput(_ram));
_via.ay8910.reset(new GI::AY38910());
_via.ay8910->set_clock_rate(1000000);
}
void Machine::close_output()
{
_videoOutput.reset();
_via.ay8910.reset();
}
void Machine::mos6522_did_change_interrupt_status(void *mos6522)

14
Machines/Oric/Oric.hpp
View File

@ -22,6 +22,7 @@
#include <cstdint>
#include <vector>
#include <memory>
namespace Oric {
@ -70,7 +71,7 @@ class Machine:
virtual void setup_output(float aspect_ratio);
virtual void close_output();
virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() { return _videoOutput->get_crt(); }
virtual std::shared_ptr<Outputs::Speaker> get_speaker() { return nullptr; }
virtual std::shared_ptr<Outputs::Speaker> get_speaker() { return _via.ay8910; }
virtual void run_for_cycles(int number_of_cycles) { CPU6502::Processor<Machine>::run_for_cycles(number_of_cycles); }
// to satisfy MOS::MOS6522IRQDelegate::Delegate
@ -128,12 +129,20 @@ class Machine:
}
}
std::unique_ptr<GI::AY38910> ay8910;
inline void run_for_half_cycles(unsigned int number_of_cycles)
{
_half_cycles_since_ay_update += number_of_cycles;
MOS::MOS6522<VIA>::run_for_half_cycles(number_of_cycles);
}
std::shared_ptr<GI::AY38910> ay8910;
std::shared_ptr<Keyboard> keyboard;
private:
void update_ay()
{
ay8910->run_for_cycles(_half_cycles_since_ay_update >> 1);
_half_cycles_since_ay_update &= 1;
if(_ay_bdir)
{
if(_ay_bc1) ay8910->select_register(_port_a_output);
@ -146,6 +155,7 @@ class Machine:
}
uint8_t _port_a_output, _port_a_input;
bool _ay_bdir, _ay_bc1;
unsigned int _half_cycles_since_ay_update;
};
VIA _via;
std::shared_ptr<Keyboard> _keyboard;