fix clippy warnings (#1366)

* fix clippy warnings

* more

* more

* more
This commit is contained in:
Logan McNaughton authored and GitHub committed 2026-11-09 08:32:49 +00:00
1 parent c8078773eb
commit 45f5c30011
6 files changed
+40 -25

No files matched your search

+14 -4
View File
@@ -77,14 +77,24 @@ fn update_init_mode(device: &mut device::Device, w: u32) {
device.mi.regs[MI_INIT_MODE_REG] |= w & MI_INIT_LENGTH_MASK;
if w & MI_CLR_INIT != 0 {
for i in 0..(0x3F00000 >> 16) {
device.memory.memory_map_write[i] = device::rdram::write_mem;
for item in device
.memory
.memory_map_write
.iter_mut()
.take(0x3F00000 >> 16)
{
*item = device::rdram::write_mem;
}
device.mi.regs[MI_INIT_MODE_REG] &= !MI_INIT_MODE
}
if w & MI_SET_INIT != 0 {
for i in 0..(0x3F00000 >> 16) {
device.memory.memory_map_write[i] = device::rdram::write_mem_repeat;
for item in device
.memory
.memory_map_write
.iter_mut()
.take(0x3F00000 >> 16)
{
*item = device::rdram::write_mem_repeat;
}
device.mi.regs[MI_INIT_MODE_REG] |= MI_INIT_MODE
}
+10 -10
View File
@@ -1,13 +1,19 @@
mod rom;
use crate::device;
pub const PIF_RAM_SIZE: usize = 64;
const PIF_CHANNELS_COUNT: usize = 5;
const PIF_RAM_OFFSET: usize = 0x7C0;
const PIF_MASK: usize = 0xFFFF;
const CHL_LEN: usize = 0x20;
#[derive(Clone, serde::Serialize, serde::Deserialize)]
pub struct Pif {
#[serde(with = "serde_big_array::BigArray")]
pub rom: [u8; 1984],
#[serde(with = "serde_big_array::BigArray")]
pub ram: [u8; 64],
pub channels: [PifChannel; 5],
pub ram: [u8; PIF_RAM_SIZE],
pub channels: [PifChannel; PIF_CHANNELS_COUNT],
}
#[derive(Copy, Clone, serde::Serialize, serde::Deserialize)]
@@ -22,12 +28,6 @@ pub struct PifChannel {
pub change_pak: device::controller::PakType,
}
pub const PIF_RAM_SIZE: usize = 64;
const PIF_CHANNELS_COUNT: usize = 5;
const PIF_RAM_OFFSET: usize = 0x7C0;
const PIF_MASK: usize = 0xFFFF;
const CHL_LEN: usize = 0x20;
pub fn read_mem(
device: &mut device::Device,
address: u64,
@@ -191,8 +191,8 @@ pub fn process_ram(device: &mut device::Device) {
if command & 0x02 != 0 {
// Challenge / response for protection
/* disable channel processing when doing CIC challenge */
for k in 0..PIF_CHANNELS_COUNT {
disable_pif_channel(&mut device.pif.channels[k]);
for item in device.pif.channels.iter_mut() {
disable_pif_channel(item);
}
/* CIC Challenge */
+7 -2
View File
@@ -123,8 +123,13 @@ pub fn write_mem_repeat(device: &mut device::Device, address: u64, value: u32, m
}
device.mi.regs[device::mi::MI_INIT_MODE_REG] &= !device::mi::MI_INIT_MODE;
for i in 0..(0x3F00000 >> 16) {
device.memory.memory_map_write[i] = device::rdram::write_mem;
for item in device
.memory
.memory_map_write
.iter_mut()
.take(0x3F00000 >> 16)
{
*item = device::rdram::write_mem;
}
}
+5 -5
View File
@@ -345,29 +345,29 @@ pub fn load_savestate(device: &mut device::Device, rewind: bool, rewind_frame: O
}
device::pif::connect_pif_channels(device);
for i in 0..4 {
if let Some(handler) = device.pif.channels[i].pak_handler {
for item in device.pif.channels.iter_mut().take(4) {
if let Some(handler) = item.pak_handler {
if handler.pak_type == device::controller::PakType::RumblePak {
let rumblepak_handler = device::controller::PakHandler {
read: device::controller::rumble::read,
write: device::controller::rumble::write,
pak_type: device::controller::PakType::RumblePak,
};
device.pif.channels[i].pak_handler = Some(rumblepak_handler);
item.pak_handler = Some(rumblepak_handler);
} else if handler.pak_type == device::controller::PakType::MemPak {
let mempak_handler = device::controller::PakHandler {
read: device::controller::mempak::read,
write: device::controller::mempak::write,
pak_type: device::controller::PakType::MemPak,
};
device.pif.channels[i].pak_handler = Some(mempak_handler);
item.pak_handler = Some(mempak_handler);
} else if handler.pak_type == device::controller::PakType::TransferPak {
let tpak_handler = device::controller::PakHandler {
read: device::controller::transferpak::read,
write: device::controller::transferpak::write,
pak_type: device::controller::PakType::TransferPak,
};
device.pif.channels[i].pak_handler = Some(tpak_handler);
item.pak_handler = Some(tpak_handler);
}
}
}
+2 -2
View File
@@ -197,8 +197,8 @@ fn set_buttons(
alt_pressed: bool,
) -> u32 {
let mut keys = 0;
for i in 0..14 {
for input in profile.inputs[i].iter() {
for (i, item) in profile.inputs.iter().enumerate().take(14) {
for input in item.iter() {
if let Some(ui::config::InputItem::Key(key)) = input
&& !alt_pressed
&& unsafe { *keyboard_state.offset(key.id as isize) }
+2 -2
View File
@@ -202,8 +202,8 @@ pub fn load_state(device: &mut device::Device, rdp_state: *const u8, rdp_state_l
let gfx_info = build_gfx_info(device, device.netplay.is_some());
unsafe {
rdp_load_state(gfx_info, rdp_state, rdp_state_len);
for reg in 0..device::vi::VI_REGS_COUNT {
rdp_set_vi_register(reg as u32, device.vi.regs[reg])
for (reg, item) in device.vi.regs.iter().enumerate() {
rdp_set_vi_register(reg as u32, *item)
}
}
}