aboutsummaryrefslogtreecommitdiff
path: root/src/mmio.rs
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-05-22 14:07:19 +0200
committerAstatin <[email protected]>2025-05-22 14:07:19 +0200
commit0c7f945407561f7c4531b2780e908bb2098551d8 (patch)
tree082b5cef5430a787ca524b0f846be999e5633334 /src/mmio.rs
parent4fce95c86e12f91e127605d440118e1b6a64208b (diff)
Add load/save parameters to the CLI & remove errors
Diffstat (limited to 'src/mmio.rs')
-rw-r--r--src/mmio.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mmio.rs b/src/mmio.rs
index aa2f61d..366c94b 100644
--- a/src/mmio.rs
+++ b/src/mmio.rs
@@ -1,5 +1,5 @@
use crate::io::{Audio, Serial};
-use crate::state::{MemError, Memory};
+use crate::state::Memory;
impl<S: Serial, A: Audio> Memory<S, A> {
pub fn r_io(&self, addr: u8) -> u8 {
@@ -61,7 +61,7 @@ impl<S: Serial, A: Audio> Memory<S, A> {
}
}
- pub fn w_io(&mut self, addr: u8, value: u8) -> Result<(), MemError> {
+ pub fn w_io(&mut self, addr: u8, value: u8) {
match addr {
0x00 => {
self.joypad_is_action = !value & 0b00100000 != 0;
@@ -213,7 +213,7 @@ impl<S: Serial, A: Audio> Memory<S, A> {
let addr = (value as u16) << 8;
for i in 0..0xa0 {
- self.w(0xfe00 | i, self.r(addr | i)?)?;
+ self.w(0xfe00 | i, self.r(addr | i))
}
}
}
@@ -262,7 +262,5 @@ impl<S: Serial, A: Audio> Memory<S, A> {
self.audio.ch3.wave_pattern[i * 2] = value >> 4;
self.audio.ch3.wave_pattern[i * 2 + 1] = value & 0xf;
}
-
- Ok(())
}
}