summaryrefslogtreecommitdiff
path: root/src/devices.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices.rs')
-rw-r--r--src/devices.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices.rs b/src/devices.rs
index b843aca..4ba29a8 100644
--- a/src/devices.rs
+++ b/src/devices.rs
@@ -102,8 +102,8 @@ impl DeviceBus for StandardDevices {
0x13 => read_l!(self.memory.address_1),
0x14 => self.memory.read_from_head_1(),
0x15 => self.memory.read_from_head_1(),
- 0x16 => read_h!(self.memory.page_count()),
- 0x17 => read_l!(self.memory.page_count()),
+ 0x16 => read_h!(self.memory.page_limit),
+ 0x17 => read_l!(self.memory.page_limit),
0x18 => read_h!(self.memory.page_2),
0x19 => read_l!(self.memory.page_2),
0x1A => read_h!(self.memory.address_2),
@@ -247,16 +247,16 @@ impl DeviceBus for StandardDevices {
0x0E => no_write!(),
0x0F => no_write!(),
// Memory
- 0x10 => { write_h!(self.memory.page_1); self.memory.expand_memory() },
- 0x11 => { write_l!(self.memory.page_1); self.memory.expand_memory() },
+ 0x10 => write_h!(self.memory.page_1),
+ 0x11 => write_l!(self.memory.page_1),
0x12 => write_h!(self.memory.address_1),
0x13 => write_l!(self.memory.address_1),
0x14 => self.memory.write_to_head_1(val),
0x15 => self.memory.write_to_head_1(val),
- 0x16 => write_h!(self.memory.page_limit),
- 0x17 => write_l!(self.memory.page_limit),
- 0x18 => { write_h!(self.memory.page_2); self.memory.expand_memory() },
- 0x19 => { write_l!(self.memory.page_2); self.memory.expand_memory() },
+ 0x16 => no_write!(),
+ 0x17 => no_write!(),
+ 0x18 => write_h!(self.memory.page_2),
+ 0x19 => write_l!(self.memory.page_2),
0x1A => write_h!(self.memory.address_2),
0x1B => write_l!(self.memory.address_2),
0x1C => self.memory.write_to_head_2(val),