diff --git a/src/emulator/bus.rs b/src/emulator/bus.rs index 77b7ea0..e029c6e 100644 --- a/src/emulator/bus.rs +++ b/src/emulator/bus.rs @@ -134,7 +134,7 @@ impl Bus { 0xA000 ..= 0xBFFF => Module::Cartrigbe, 0xC000 ..= 0xFDFF => Module::Memory, 0xFE00 ..= 0xFE9F => Module::GPU, - 0xFEA0 ..= 0xFEFF => Module::Memory, + 0xFEA0 ..= 0xFEFF => Module::Unusable, TMA | TIMA | DIV | TAC => Module::Timer, 0xFF00 ..= 0xFF7F => Module::IO, 0xFF80 ..= 0xFFFE => Module::Memory, diff --git a/src/emulator/interrupt.rs b/src/emulator/interrupt.rs index af873e6..997aba8 100644 --- a/src/emulator/interrupt.rs +++ b/src/emulator/interrupt.rs @@ -16,6 +16,7 @@ impl Default for EI { #[derive(Copy, Clone, PartialEq)] +#[allow(dead_code)] //Serial will be used when we implement it pub enum Interrupt { VBlank, LCDC, diff --git a/src/emulator/io_constants.rs b/src/emulator/io_constants.rs index e6c5803..383327b 100644 --- a/src/emulator/io_constants.rs +++ b/src/emulator/io_constants.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] //unused constants will be used when sound is implemented + pub const JOYP: u16 = 0xFF00; // Joypad info pub const SB: u16 = 0xFF01; // Serial transfer data diff --git a/src/emulator/mod.rs b/src/emulator/mod.rs index b4f1e57..f769a35 100644 --- a/src/emulator/mod.rs +++ b/src/emulator/mod.rs @@ -1,5 +1,3 @@ -#![allow(dead_code)] - mod cpu; mod gpu; mod memory; @@ -143,7 +141,7 @@ impl Gameboy { return 4; } } - + pub fn insert(&mut self, file_name: String){ self.bus.insert_cartrigbe(file_name); }