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

Give sound and video somewhere to read from.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-21 20:22:20 -04:00
parent 5c645fb3c2
commit 1f49c3b113
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Machines/Acorn/Archimedes/InputOutputController.hpp
View File

@ -314,11 +314,11 @@ struct InputOutputController {
return true; return true;
} }
InputOutputController(InterruptObserverT &observer) : InputOutputController(InterruptObserverT &observer, const uint8_t *ram) :
observer_(observer), observer_(observer),
keyboard_(serial_), keyboard_(serial_),
sound_(*this), sound_(*this, ram),
video_(*this, sound_) video_(*this, sound_, ram)
{ {
irq_a_.status = IRQA::SetAlways | IRQA::PowerOnReset; irq_a_.status = IRQA::SetAlways | IRQA::PowerOnReset;
irq_b_.status = 0x00; irq_b_.status = 0x00;

2
Machines/Acorn/Archimedes/MemoryController.hpp
View File

@ -32,7 +32,7 @@ static_assert(BitMask<15, 14>::value == 49152);
template <typename InterruptObserverT> template <typename InterruptObserverT>
struct MemoryController { struct MemoryController {
MemoryController(InterruptObserverT &observer) : MemoryController(InterruptObserverT &observer) :
ioc_(observer) {} ioc_(observer, ram_.data()) {}
int interrupt_mask() const { int interrupt_mask() const {
return ioc_.interrupt_mask(); return ioc_.interrupt_mask();

4
Machines/Acorn/Archimedes/Sound.hpp
View File

@ -15,7 +15,7 @@ namespace Archimedes {
/// Models the Archimedes sound output; in a real machine this is a joint efort between the VIDC and the MEMC. /// Models the Archimedes sound output; in a real machine this is a joint efort between the VIDC and the MEMC.
template <typename InterruptObserverT> template <typename InterruptObserverT>
struct Sound { struct Sound {
Sound(InterruptObserverT &observer) : observer_(observer) {} Sound(InterruptObserverT &observer, const uint8_t *ram) : ram_(ram), observer_(observer) {}
void set_next_end(uint32_t value) { void set_next_end(uint32_t value) {
next_.end = value; next_.end = value;
@ -83,6 +83,8 @@ struct Sound {
} }
private: private:
const uint8_t *ram_ = nullptr;
uint8_t divider_ = 0, reload_ = 0; uint8_t divider_ = 0, reload_ = 0;
int byte_ = 0; int byte_ = 0;

8
Machines/Acorn/Archimedes/Video.hpp
View File

@ -16,8 +16,8 @@ namespace Archimedes {
template <typename InterruptObserverT, typename SoundT> template <typename InterruptObserverT, typename SoundT>
struct Video { struct Video {
Video(InterruptObserverT &observer, SoundT &sound) : Video(InterruptObserverT &observer, SoundT &sound, const uint8_t *ram) :
observer_(observer), sound_(sound) {} observer_(observer), sound_(sound), ram_(ram) {}
void write(uint32_t value) { void write(uint32_t value) {
const auto target = (value >> 24) & 0xfc; const auto target = (value >> 24) & 0xfc;
@ -166,6 +166,10 @@ private:
InterruptObserverT &observer_; InterruptObserverT &observer_;
SoundT &sound_; SoundT &sound_;
// In the current version of this code, video DMA occurrs costlessly,
// being deferred to the component itself.
const uint8_t *ram_ = nullptr;
// TODO: real video output. // TODO: real video output.
uint32_t position_ = 0; uint32_t position_ = 0;