diff --git a/src/device/ai.rs b/src/device/ai.rs index 919fa4e..fbc989f 100644 --- a/src/device/ai.rs +++ b/src/device/ai.rs @@ -27,7 +27,7 @@ pub struct AiDma { pub duration: u64, } -fn get_remaining_dma_length(device: &mut device::Device) -> u64 { +fn get_remaining_dma_length(device: &device::Device) -> u64 { if device.ai.fifo[0].duration == 0 { return 0; } diff --git a/src/device/cart/rom.rs b/src/device/cart/rom.rs index 1bd953d..985d73c 100644 --- a/src/device/cart/rom.rs +++ b/src/device/cart/rom.rs @@ -4,7 +4,7 @@ use sha2::{Digest, Sha256}; const CART_MASK: usize = 0xFFFFFFF; -fn read_cart_word(device: &mut device::Device, address: usize) -> u32 { +fn read_cart_word(device: &device::Device, address: usize) -> u32 { let mut data: [u8; 4] = [0; 4]; for i in 0..4 { if let Some(value) = device diff --git a/src/device/controller.rs b/src/device/controller.rs index a8f4b5e..c4ceb64 100644 --- a/src/device/controller.rs +++ b/src/device/controller.rs @@ -57,10 +57,10 @@ pub fn process(device: &mut device::Device, channel: usize) { JCMD_CONTROLLER_READ => { let offset = device.pif.channels[channel].rx_buf.unwrap(); let input = if device.netplay.is_none() { - ui::input::get(&mut device.ui, channel) + ui::input::get(&device.ui, channel) } else { if device.netplay.as_ref().unwrap().player_number as usize == channel { - let local_input = ui::input::get(&mut device.ui, 0); + let local_input = ui::input::get(&device.ui, 0); netplay::send_input(device.netplay.as_ref().unwrap(), local_input); } @@ -163,9 +163,9 @@ pub fn pak_switch_event(device: &mut device::Device) { if channel.change_pak != PakType::None { //stop rumble if it is on if device.netplay.is_none() { - device::ui::input::set_rumble(&mut device.ui, i, 0); + device::ui::input::set_rumble(&device.ui, i, 0); } else if device.netplay.as_ref().unwrap().player_number as usize == i { - device::ui::input::set_rumble(&mut device.ui, 0, 0); + device::ui::input::set_rumble(&device.ui, 0, 0); } let new_pak_type = match channel.change_pak { @@ -202,7 +202,7 @@ pub fn pak_switch_event(device: &mut device::Device) { pak_type: new_pak_type, }); } - ui::audio::play_pak_switch(&mut device.ui, new_pak_type); + ui::audio::play_pak_switch(&device.ui, new_pak_type); channel.change_pak = PakType::None; } } diff --git a/src/device/controller/gbcart.rs b/src/device/controller/gbcart.rs index b31275d..2b67dc0 100644 --- a/src/device/controller/gbcart.rs +++ b/src/device/controller/gbcart.rs @@ -29,7 +29,7 @@ pub enum CartType { } fn write_mbc1( - pif_ram: &mut [u8], + pif_ram: &[u8], cart: &mut device::controller::gbcart::GbCart, address: u16, data: usize, @@ -66,7 +66,7 @@ fn write_mbc1( fn read_mbc1( pif_ram: &mut [u8], - cart: &mut device::controller::gbcart::GbCart, + cart: &device::controller::gbcart::GbCart, address: u16, data: usize, size: usize, @@ -100,7 +100,7 @@ fn read_mbc1( } fn write_mbc3( - pif_ram: &mut [u8], + pif_ram: &[u8], cart: &mut device::controller::gbcart::GbCart, address: u16, data: usize, @@ -161,7 +161,7 @@ fn write_mbc3( fn read_mbc3( pif_ram: &mut [u8], - cart: &mut device::controller::gbcart::GbCart, + cart: &device::controller::gbcart::GbCart, address: u16, data: usize, size: usize, @@ -213,7 +213,7 @@ fn read_mbc3( } fn write_mbc5( - pif_ram: &mut [u8], + pif_ram: &[u8], cart: &mut device::controller::gbcart::GbCart, address: u16, data: usize, @@ -247,7 +247,7 @@ fn write_mbc5( fn read_mbc5( pif_ram: &mut [u8], - cart: &mut device::controller::gbcart::GbCart, + cart: &device::controller::gbcart::GbCart, address: u16, data: usize, size: usize, @@ -278,7 +278,7 @@ fn read_mbc5( pub fn read( pif_ram: &mut [u8], - cart: &mut device::controller::gbcart::GbCart, + cart: &device::controller::gbcart::GbCart, address: u16, data: usize, size: usize, @@ -299,7 +299,7 @@ pub fn read( } pub fn write( - pif_ram: &mut [u8], + pif_ram: &[u8], cart: &mut device::controller::gbcart::GbCart, address: u16, data: usize, diff --git a/src/device/controller/rumble.rs b/src/device/controller/rumble.rs index 36d5aa5..2109cbb 100644 --- a/src/device/controller/rumble.rs +++ b/src/device/controller/rumble.rs @@ -16,9 +16,9 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us if address == 0xc000 { let rumble = device.pif.ram[data + size - 1]; if device.netplay.is_none() { - device::ui::input::set_rumble(&mut device.ui, channel, rumble); + device::ui::input::set_rumble(&device.ui, channel, rumble); } else if device.netplay.as_ref().unwrap().player_number as usize == channel { - device::ui::input::set_rumble(&mut device.ui, 0, rumble); + device::ui::input::set_rumble(&device.ui, 0, rumble); } } } diff --git a/src/device/controller/transferpak.rs b/src/device/controller/transferpak.rs index 858f8a8..9704afc 100644 --- a/src/device/controller/transferpak.rs +++ b/src/device/controller/transferpak.rs @@ -54,7 +54,7 @@ pub fn read(device: &mut device::Device, channel: usize, address: u16, data: usi 0xC..=0xF => { device::controller::gbcart::read( &mut device.pif.ram, - &mut pak.cart, + &pak.cart, 0x4000 * pak.bank + (address & 0x7fff) - 0x4000, data, size, @@ -119,7 +119,7 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us } 0xC..=0xF => { device::controller::gbcart::write( - &mut device.pif.ram, + &device.pif.ram, &mut pak.cart, 0x4000 * pak.bank + (address & 0x7fff) - 0x4000, data, diff --git a/src/device/events.rs b/src/device/events.rs index 49f1874..8d85e15 100644 --- a/src/device/events.rs +++ b/src/device/events.rs @@ -36,9 +36,9 @@ pub fn create_event_at(device: &mut device::Device, name: usize, when: u64) { set_next_event(device); } -pub fn get_event(device: &mut device::Device, name: usize) -> Option<&mut Event> { +pub fn get_event(device: &device::Device, name: usize) -> Option<&Event> { if device.cpu.events[name].enabled { - return Some(&mut device.cpu.events[name]); + return Some(&device.cpu.events[name]); } None } diff --git a/src/device/pif.rs b/src/device/pif.rs index d9dea17..eaf6e2b 100644 --- a/src/device/pif.rs +++ b/src/device/pif.rs @@ -232,7 +232,7 @@ pub fn connect_pif_channels(device: &mut device::Device) { device.pif.channels[4].process = Some(device::cart::process) } -pub fn get_default_handler(device: &device::Device) -> device::controller::PakHandler { +fn get_default_handler(device: &device::Device) -> device::controller::PakHandler { if device.ui.game_id == "NCT" { // Chameleon Twist does not support the mempak device::controller::PakHandler { diff --git a/src/device/rsp_su_instructions.rs b/src/device/rsp_su_instructions.rs index eb8a6f5..498b82c 100644 --- a/src/device/rsp_su_instructions.rs +++ b/src/device/rsp_su_instructions.rs @@ -606,19 +606,19 @@ pub fn mfc2(device: &mut device::Device, opcode: u32) { pub fn cfc2(device: &mut device::Device, opcode: u32) { let hi; let lo; - let mut zero = unsafe { _mm_setzero_si128() }; + let zero = unsafe { _mm_setzero_si128() }; match rd(opcode) & 3 { 0x00 => { - hi = &mut device.rsp.cpu.vcoh; - lo = &mut device.rsp.cpu.vcol; + hi = &device.rsp.cpu.vcoh; + lo = &device.rsp.cpu.vcol; } 0x01 => { - hi = &mut device.rsp.cpu.vcch; - lo = &mut device.rsp.cpu.vccl; + hi = &device.rsp.cpu.vcch; + lo = &device.rsp.cpu.vccl; } 0x02 | 0x03 => { - hi = &mut zero; - lo = &mut device.rsp.cpu.vce; + hi = &zero; + lo = &device.rsp.cpu.vce; } _ => { panic!("unknown cfc2") diff --git a/src/device/tlb.rs b/src/device/tlb.rs index 5c0cd89..b6e58db 100644 --- a/src/device/tlb.rs +++ b/src/device/tlb.rs @@ -146,7 +146,7 @@ pub fn probe(device: &mut device::Device) { } fn tlb_unmap(device: &mut device::Device, index: u64) { - let e = &mut device.cpu.cop0.tlb_entries[index as usize]; + let e = &device.cpu.cop0.tlb_entries[index as usize]; if e.v_even != 0 { let mut i = e.start_even; @@ -184,7 +184,7 @@ fn tlb_unmap(device: &mut device::Device, index: u64) { } fn tlb_map(device: &mut device::Device, index: u64) { - let e = &mut device.cpu.cop0.tlb_entries[index as usize]; + let e = &device.cpu.cop0.tlb_entries[index as usize]; if e.v_even != 0 && e.start_even < e.end_even diff --git a/src/netplay.rs b/src/netplay.rs index f251a4a..6b7c68c 100644 --- a/src/netplay.rs +++ b/src/netplay.rs @@ -144,7 +144,7 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> ui::input::Inpu let timeout = std::time::Instant::now() + std::time::Duration::from_secs(10); let mut request_timer = std::time::Instant::now() - std::time::Duration::from_millis(5); while input.is_none() { - process_incoming(netplay, &mut device.ui); // we execute process_incoming before request_input so that we send an accurate buffer count + process_incoming(netplay, &device.ui); // we execute process_incoming before request_input so that we send an accurate buffer count if std::time::Instant::now() > request_timer { // sends a request packet every 5ms request_input(netplay, channel); @@ -155,7 +155,7 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> ui::input::Inpu .remove(&netplay.player_data[channel].count); if std::time::Instant::now() > timeout { - ui::audio::play_netplay_audio(&mut device.ui, NETPLAY_ERROR_LOST_CONNECTION); + ui::audio::play_netplay_audio(&device.ui, NETPLAY_ERROR_LOST_CONNECTION); input = Some(InputEvent { input: 0, plugin: 0, @@ -186,7 +186,7 @@ fn request_input(netplay: &Netplay, channel: usize) { netplay.udp_socket.send(&request).unwrap(); } -fn process_incoming(netplay: &mut Netplay, ui: &mut ui::Ui) { +fn process_incoming(netplay: &mut Netplay, ui: &ui::Ui) { let mut buf: [u8; 1024] = [0; 1024]; while let Ok(_incoming) = netplay.udp_socket.recv(&mut buf) { match buf[0] { diff --git a/src/savestates.rs b/src/savestates.rs index d75520c..2fd0d72 100644 --- a/src/savestates.rs +++ b/src/savestates.rs @@ -88,7 +88,7 @@ pub fn create_savestate(device: &device::Device) { } pub fn load_savestate(device: &mut device::Device) { - let savestate = std::fs::read(&mut device.ui.storage.paths.savestate_file_path); + let savestate = std::fs::read(&device.ui.storage.paths.savestate_file_path); if savestate.is_ok() { let device_bytes = ui::storage::decompress_file(savestate.as_ref().unwrap(), "device"); let save_bytes = ui::storage::decompress_file(savestate.as_ref().unwrap(), "saves"); diff --git a/src/ui/audio.rs b/src/ui/audio.rs index eb3887d..dbfccf3 100644 --- a/src/ui/audio.rs +++ b/src/ui/audio.rs @@ -113,7 +113,7 @@ pub fn raise_audio_volume(ui: &mut ui::Ui) { } } -pub fn play_netplay_audio(ui: &mut ui::Ui, error: u32) { +pub fn play_netplay_audio(ui: &ui::Ui, error: u32) { if ui.audio.event_audio_stream.is_null() { return; } @@ -145,7 +145,7 @@ pub fn play_netplay_audio(ui: &mut ui::Ui, error: u32) { } } -pub fn play_pak_switch(ui: &mut ui::Ui, pak: device::controller::PakType) { +pub fn play_pak_switch(ui: &ui::Ui, pak: device::controller::PakType) { if ui.audio.event_audio_stream.is_null() { return; } @@ -167,7 +167,7 @@ pub fn play_pak_switch(ui: &mut ui::Ui, pak: device::controller::PakType) { } } -pub fn play_audio(device: &mut device::Device, dram_addr: usize, length: u64) { +pub fn play_audio(device: &device::Device, dram_addr: usize, length: u64) { if device.ui.audio.audio_stream.is_null() { return; } diff --git a/src/ui/gui.rs b/src/ui/gui.rs index 313c035..454572c 100644 --- a/src/ui/gui.rs +++ b/src/ui/gui.rs @@ -194,7 +194,7 @@ impl Drop for GopherEguiApp { fn configure_profile(app: &mut GopherEguiApp, ctx: &egui::Context) { egui::Window::new("Configure Input Profile") - // .open(&mut self.configure_profile) + // .open(& self.configure_profile) .show(ctx, |ui| { ui.horizontal(|ui| { let name_label = ui.label("Profile Name:"); diff --git a/src/ui/input.rs b/src/ui/input.rs index 92f6a00..54f5359 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -276,7 +276,7 @@ fn set_buttons_from_controller( } } -pub fn set_rumble(ui: &mut ui::Ui, channel: usize, rumble: u8) { +pub fn set_rumble(ui: &ui::Ui, channel: usize, rumble: u8) { if !ui.input.controllers[channel].rumble { return; } @@ -334,7 +334,7 @@ fn change_paks( pressed } -pub fn get(ui: &mut ui::Ui, channel: usize) -> InputData { +pub fn get(ui: &ui::Ui, channel: usize) -> InputData { let profile_name = ui.config.input.input_profile_binding[channel].clone(); let profile = ui.config.input.input_profiles.get(&profile_name).unwrap(); let mut keys = 0; diff --git a/src/ui/storage.rs b/src/ui/storage.rs index 4cae812..b600c5b 100644 --- a/src/ui/storage.rs +++ b/src/ui/storage.rs @@ -196,27 +196,27 @@ pub fn init(ui: &mut ui::Ui, rom: &[u8]) { pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option) { if netplay.is_none() || netplay.as_ref().unwrap().player_number == 0 { - let eep = std::fs::read(&mut ui.storage.paths.eep_file_path); + let eep = std::fs::read(&ui.storage.paths.eep_file_path); if eep.is_ok() { ui.storage.saves.eeprom.data = eep.unwrap(); } - let sra = std::fs::read(&mut ui.storage.paths.sra_file_path); + let sra = std::fs::read(&ui.storage.paths.sra_file_path); if sra.is_ok() { ui.storage.saves.sram.data = sra.unwrap(); } - let fla = std::fs::read(&mut ui.storage.paths.fla_file_path); + let fla = std::fs::read(&ui.storage.paths.fla_file_path); if fla.is_ok() { ui.storage.saves.flash.data = fla.unwrap(); } - let mempak = std::fs::read(&mut ui.storage.paths.pak_file_path); + let mempak = std::fs::read(&ui.storage.paths.pak_file_path); if mempak.is_ok() { ui.storage.saves.mempak.data = mempak.unwrap(); } - let sdcard = std::fs::read(&mut ui.storage.paths.sdcard_file_path); + let sdcard = std::fs::read(&ui.storage.paths.sdcard_file_path); if sdcard.is_ok() { ui.storage.saves.sdcard.data = sdcard.unwrap(); } - let romsave = std::fs::read(&mut ui.storage.paths.romsave_file_path); + let romsave = std::fs::read(&ui.storage.paths.romsave_file_path); if romsave.is_ok() { ui.storage.saves.romsave.data = postcard::from_bytes(romsave.unwrap().as_ref()).unwrap();