diff --git a/src/cartridge/cnrom.rs b/src/cartridge/cnrom.rs index b63aefa..ce399e3 100644 --- a/src/cartridge/cnrom.rs +++ b/src/cartridge/cnrom.rs @@ -33,7 +33,7 @@ impl Mapper for Cnrom { } } - fn get_mirroring(&mut self) -> Mirror { + fn get_mirroring(&self) -> Mirror { self.cart.mirroring } diff --git a/src/cartridge/mmc1.rs b/src/cartridge/mmc1.rs index 71a7330..24a26a1 100644 --- a/src/cartridge/mmc1.rs +++ b/src/cartridge/mmc1.rs @@ -175,7 +175,7 @@ impl Mapper for Mmc1 { } } - fn get_mirroring(&mut self) -> Mirror { + fn get_mirroring(&self) -> Mirror { self.mirroring } diff --git a/src/cartridge/mmc3.rs b/src/cartridge/mmc3.rs index d78bb5c..a0995ee 100644 --- a/src/cartridge/mmc3.rs +++ b/src/cartridge/mmc3.rs @@ -175,7 +175,7 @@ impl Mapper for Mmc3 { } } - fn get_mirroring(&mut self) -> Mirror { + fn get_mirroring(&self) -> Mirror { if self.cart.four_screen_vram { Mirror::FourScreen } else { diff --git a/src/cartridge/mod.rs b/src/cartridge/mod.rs index 74ec843..c0ddb89 100644 --- a/src/cartridge/mod.rs +++ b/src/cartridge/mod.rs @@ -17,7 +17,7 @@ use std::io::Read; pub trait Mapper { fn read(&self, address: usize) -> u8; fn write(&mut self, address: usize, value: u8); - fn get_mirroring(&mut self) -> Mirror; + fn get_mirroring(&self) -> Mirror; fn load_battery_backed_ram(&mut self); fn save_battery_backed_ram(&self); fn clock(&mut self); diff --git a/src/cartridge/nrom.rs b/src/cartridge/nrom.rs index e85a3c5..881cc18 100644 --- a/src/cartridge/nrom.rs +++ b/src/cartridge/nrom.rs @@ -49,7 +49,7 @@ impl Mapper for Nrom { } } - fn get_mirroring(&mut self) -> Mirror { + fn get_mirroring(&self) -> Mirror { self.cart.mirroring } diff --git a/src/cartridge/uxrom.rs b/src/cartridge/uxrom.rs index 697319b..c660bda 100644 --- a/src/cartridge/uxrom.rs +++ b/src/cartridge/uxrom.rs @@ -44,7 +44,7 @@ impl Mapper for Uxrom { } } - fn get_mirroring(&mut self) -> Mirror { + fn get_mirroring(&self) -> Mirror { self.cart.mirroring } diff --git a/src/ppu/memory.rs b/src/ppu/memory.rs index 176eefc..f26e7dd 100644 --- a/src/ppu/memory.rs +++ b/src/ppu/memory.rs @@ -53,7 +53,7 @@ impl super::Ppu { fn read_nametable(&mut self, address: usize) -> u8 { let base = address % 0x1000; let offset = base % 0x0400; - match self.mapper.borrow_mut().get_mirroring() { + match self.mapper.borrow().get_mirroring() { Mirror::LowBank => self.nametable_A[offset], Mirror::HighBank => self.nametable_B[offset], Mirror::Horizontal => { @@ -85,7 +85,7 @@ impl super::Ppu { fn write_nametable(&mut self, address: usize, value: u8) { let base = address % 0x1000; let offset = base % 0x0400; - match self.mapper.borrow_mut().get_mirroring() { + match self.mapper.borrow().get_mirroring() { Mirror::LowBank => self.nametable_A[offset] = value, Mirror::HighBank => self.nametable_B[offset] = value, Mirror::Horizontal => {