6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Resolved some errors.

Browse Source
This commit is contained in:
Thomas Harte 2016-01-13 22:11:33 -05:00
parent 49e89a4bcb
commit 439d452e23
3 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Machines/Electron/Electron.cpp
View File

@ -138,9 +138,8 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
case 0x6: case 0x6:
if(!isReadOperation(operation)) if(!isReadOperation(operation))
{ {
if(_speaker.is_enabled) update_audio();
update_audio(); _speaker.set_divider(*value);
_speaker.divider = *value;
} }
break; break;
case 0x7: case 0x7:
@ -164,10 +163,10 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
// update speaker mode // update speaker mode
bool new_speaker_is_enabled = (*value & 6) == 2; bool new_speaker_is_enabled = (*value & 6) == 2;
if(new_speaker_is_enabled != _speaker.is_enabled) if(new_speaker_is_enabled != _speaker.get_is_enabled())
{ {
update_audio(); update_audio();
_speaker.is_enabled = new_speaker_is_enabled; _speaker.set_is_enabled(new_speaker_is_enabled);
} }
// TODO: tape mode, tape motor, caps lock LED // TODO: tape mode, tape motor, caps lock LED
@ -496,5 +495,23 @@ void Machine::set_key_state(Key key, bool isPressed)
void Machine::Speaker::get_sample_range(uint64_t start_time, int number_of_samples, uint16_t *target) void Machine::Speaker::get_sample_range(uint64_t start_time, int number_of_samples, uint16_t *target)
{ {
*target = 0; if(!_is_enabled)
{
*target = 0;
}
else
{
*target = ((start_time / _divider)&1) ? 255 : 0;
}
}
void Machine::Speaker::set_divider(uint8_t divider)
{
_divider = divider;
_time_base = 0;
}
void Machine::Speaker::set_is_enabled(bool is_enabled)
{
_is_enabled = false;
} }

11
Machines/Electron/Electron.hpp
View File

@ -98,10 +98,17 @@ class Machine: public CPU6502::Processor<Machine> {
class Speaker: public ::Outputs::Filter<Speaker> { class Speaker: public ::Outputs::Filter<Speaker> {
public: public:
uint8_t divider; void set_divider(uint8_t divider);
bool is_enabled;
void set_is_enabled(bool is_enabled);
inline bool get_is_enabled() { return _is_enabled; }
void get_sample_range(uint64_t start_time, int number_of_samples, uint16_t *target); void get_sample_range(uint64_t start_time, int number_of_samples, uint16_t *target);
private:
uint8_t _divider;
bool _is_enabled;
} _speaker; } _speaker;
}; };

6
Outputs/Speaker.hpp
View File

@ -78,7 +78,7 @@ template <class T> class Filter: public Speaker {
while(input_cycles--) while(input_cycles--)
{ {
// get a sample for the current location // get a sample for the current location
static_cast<T *>(this)->get_sample_range(time_base, 1, &_buffer_in_progress[_buffer_in_progress_pointer]); static_cast<T *>(this)->get_sample_range(_time_base, 1, &_buffer_in_progress[_buffer_in_progress_pointer]);
_buffer_in_progress_pointer++; _buffer_in_progress_pointer++;
// announce to delegate if full // announce to delegate if full
@ -92,12 +92,12 @@ template <class T> class Filter: public Speaker {
} }
// determine how many source samples to step // determine how many source samples to step
time_base += _stepper->update(); _time_base += _stepper->update();
} }
} }
protected: protected:
uint64_t time_base; uint64_t _time_base;
private: private:
SignalProcessing::Stepper *_stepper; SignalProcessing::Stepper *_stepper;