From 87b5b77dbfac97c30bcb3eaa5e3e863c2114b187 Mon Sep 17 00:00:00 2001 From: Maik Merten Date: Sat, 26 Jul 2014 23:07:06 +0200 Subject: [PATCH 1/2] minor typo fixes in README.m --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28a8377..ad6728f 100644 --- a/README.md +++ b/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 @@ -218,7 +218,7 @@ running. ## 5.0 Revision History - **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. From 004087a7423a2a537069e32a4fbf76f0fd31cd42 Mon Sep 17 00:00:00 2001 From: Maik Merten Date: Mon, 28 Jul 2014 18:19:52 +0200 Subject: [PATCH 2/2] invoke setBus() on devices added to the bus --- src/main/java/com/loomcom/symon/Bus.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/loomcom/symon/Bus.java b/src/main/java/com/loomcom/symon/Bus.java index 63f8070..813c62e 100644 --- a/src/main/java/com/loomcom/symon/Bus.java +++ b/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(); }