From 7e5c7131ef576e618eaf8d56de9609fc055c759f Mon Sep 17 00:00:00 2001
From: edmccard <edmccard@hotmail.com>
Date: Tue, 10 Apr 2012 17:58:26 -0400
Subject: [PATCH] Remove cpu dependency from peripherals

---
 src/system/base.d       | 2 +-
 src/system/peripheral.d | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/system/base.d b/src/system/base.d
index 2e6328a..417773b 100644
--- a/src/system/base.d
+++ b/src/system/base.d
@@ -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;
diff --git a/src/system/peripheral.d b/src/system/peripheral.d
index 2291e91..8dd3014 100644
--- a/src/system/peripheral.d
+++ b/src/system/peripheral.d
@@ -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