Apple-2-Tools
/
twoapple-reboot
mirror of https://github.com/edmccard/twoapple-reboot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove cpu dependency from peripherals

This commit is contained in:
edmccard 2012-04-10 17:58:26 -04:00
parent 0e330f8285
commit 7e5c7131ef
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/base.d
View File

@ -92,7 +92,7 @@ class System
decoder.nullRead = &video_.scanner.floatingBus;
peripherals = newPeripherals();
peripherals.install(cpu, decoder, memory_.mainRom);
peripherals.install(decoder, memory_.mainRom);
ioMem.initialize(decoder, switches, timer, peripherals);
input.onReset = &reset;

9
src/system/peripheral.d
View File

@ -23,9 +23,6 @@
module system.peripheral;
import memory;
import d6502.base;
private alias d6502.base.CpuBase!(Strict.no, Cumulative.no) CpuBase;
import peripheral.base;
import peripheral.diskii;
@ -36,7 +33,7 @@ class Peripherals
{
Peripheral[8] cards;
abstract void install(CpuBase cpu, AddressDecoder decoder, Rom mainRom);
abstract void install(AddressDecoder decoder, Rom mainRom);
void reboot()
{
@ -59,7 +56,7 @@ class Peripherals
class Peripherals_II : Peripherals
{
void install(CpuBase cpu, AddressDecoder decoder, Rom mainRom)
void install(AddressDecoder decoder, Rom mainRom)
{
auto diskController = new Controller();
cards[6] = diskController; // XXX
@ -78,7 +75,7 @@ class Peripherals_II : Peripherals
class Peripherals_IIe : Peripherals
{
void install(CpuBase cpu, AddressDecoder decoder, Rom mainRom)
void install(AddressDecoder decoder, Rom mainRom)
{
auto diskController = new Controller();
cards[6] = diskController; // XXX