Remove cpu dependency from peripherals
This commit is contained in:
parent
0e330f8285
commit
7e5c7131ef
|
@ -92,7 +92,7 @@ class System
|
||||||
decoder.nullRead = &video_.scanner.floatingBus;
|
decoder.nullRead = &video_.scanner.floatingBus;
|
||||||
|
|
||||||
peripherals = newPeripherals();
|
peripherals = newPeripherals();
|
||||||
peripherals.install(cpu, decoder, memory_.mainRom);
|
peripherals.install(decoder, memory_.mainRom);
|
||||||
ioMem.initialize(decoder, switches, timer, peripherals);
|
ioMem.initialize(decoder, switches, timer, peripherals);
|
||||||
|
|
||||||
input.onReset = &reset;
|
input.onReset = &reset;
|
||||||
|
|
|
@ -23,9 +23,6 @@
|
||||||
module system.peripheral;
|
module system.peripheral;
|
||||||
|
|
||||||
import memory;
|
import memory;
|
||||||
import d6502.base;
|
|
||||||
|
|
||||||
private alias d6502.base.CpuBase!(Strict.no, Cumulative.no) CpuBase;
|
|
||||||
|
|
||||||
import peripheral.base;
|
import peripheral.base;
|
||||||
import peripheral.diskii;
|
import peripheral.diskii;
|
||||||
|
@ -36,7 +33,7 @@ class Peripherals
|
||||||
{
|
{
|
||||||
Peripheral[8] cards;
|
Peripheral[8] cards;
|
||||||
|
|
||||||
abstract void install(CpuBase cpu, AddressDecoder decoder, Rom mainRom);
|
abstract void install(AddressDecoder decoder, Rom mainRom);
|
||||||
|
|
||||||
void reboot()
|
void reboot()
|
||||||
{
|
{
|
||||||
|
@ -59,7 +56,7 @@ class Peripherals
|
||||||
|
|
||||||
class Peripherals_II : Peripherals
|
class Peripherals_II : Peripherals
|
||||||
{
|
{
|
||||||
void install(CpuBase cpu, AddressDecoder decoder, Rom mainRom)
|
void install(AddressDecoder decoder, Rom mainRom)
|
||||||
{
|
{
|
||||||
auto diskController = new Controller();
|
auto diskController = new Controller();
|
||||||
cards[6] = diskController; // XXX
|
cards[6] = diskController; // XXX
|
||||||
|
@ -78,7 +75,7 @@ class Peripherals_II : Peripherals
|
||||||
|
|
||||||
class Peripherals_IIe : Peripherals
|
class Peripherals_IIe : Peripherals
|
||||||
{
|
{
|
||||||
void install(CpuBase cpu, AddressDecoder decoder, Rom mainRom)
|
void install(AddressDecoder decoder, Rom mainRom)
|
||||||
{
|
{
|
||||||
auto diskController = new Controller();
|
auto diskController = new Controller();
|
||||||
cards[6] = diskController; // XXX
|
cards[6] = diskController; // XXX
|
||||||
|
|
Loading…
Reference in New Issue