Merge branch 'master' of github.com:sethm/symon

README.md

@@ -9,7 +9,7 @@ SYMON - A 6502 System Simulator
 
 Copyright (c) 2014 Seth J. Morabito <web@loomcom.com>
 
-Portions Copyright (c) 2014 Maik Marten <maikmarten@googlemail.com>
+Portions Copyright (c) 2014 Maik Merten <maikmerten@googlemail.com>
 
 See the file COPYING for license.
 
@@ -39,7 +39,7 @@ for more information about this functional test suite).
 
 ## 3.0 Features
 
-Symon can simiulate multiple 6502 based architectures. At present, two
+Symon can simulate multiple 6502 based architectures. At present, two
 machines are implemented: Symon (the default), and MULTICOMP.
 
 ### 3.1 Memory Maps
@@ -221,7 +221,7 @@ running.
     'Reset' now performs a memory clear.
 
   - **0.9.9:** 26 July, 2014 - MULTICOMP and multi-machine support
-    contributed by Maik Marten <maikmarten@googlemail.com>
+    contributed by Maik Merten <maikmerten@googlemail.com>
 
   - **0.9.1:** 26 January, 2014 - Support for IRQ and NMI handling.
 

src/main/java/com/loomcom/symon/Bus.java

@@ -113,6 +113,7 @@ public class Bus {
             deviceMap.put(priority, deviceSet);
         }
         
+        device.setBus(this);
         deviceSet.add(device);
         buildDeviceAddressArray();
     }