FranLMSP/rmg-001
1
0
Fork 0
mirror of https://github.com/FranLMSP/rmg-001.git synced 2024-09-20 10:10:50 +00:00
Code Issues Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
Franco Colmenarez 2021-11-15 11:28:36 -05:00
parent 7fa6857ac3
commit 0aa6e56fc1
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/render.rs
View File

@ -3,8 +3,6 @@ use crate::frames::Frames;
use crate::cpu::{Cycles}; use crate::cpu::{Cycles};
use crate::ppu::{WIDTH, HEIGHT}; use crate::ppu::{WIDTH, HEIGHT};
use std::{thread, time};
use log::error; use log::error;
use pixels::{wgpu, Pixels, PixelsBuilder, SurfaceTexture}; use pixels::{wgpu, Pixels, PixelsBuilder, SurfaceTexture};
use winit::dpi::LogicalSize; use winit::dpi::LogicalSize;

5
src/rom.rs
View File

@ -26,14 +26,12 @@ enum MBC {
MBC1, MBC1,
MBC2, MBC2,
MBC3, MBC3,
MBC4,
MBC5, MBC5,
MBC6, MBC6,
MBC7, MBC7,
HuC1, HuC1,
HuC3, HuC3,
MMM01, MMM01,
MBC1M,
PocketCamera, PocketCamera,
BandaiTIMA5, BandaiTIMA5,
} }
@ -207,14 +205,13 @@ impl ROM {
}, },
_ => unimplemented!(), _ => unimplemented!(),
} }
self.data[address as usize]
} }
pub fn write(&mut self, address: u16, data: u8) { pub fn write(&mut self, address: u16, data: u8) {
match self.info.mbc { match self.info.mbc {
MBC::NoMBC => {}, MBC::NoMBC => {},
MBC::MBC1 => { MBC::MBC1 => {
if address >= 0x0000 && address <= 0x1FFF { // RAM enable register if address <= 0x1FFF { // RAM enable register
if !self.info.has_ram { if !self.info.has_ram {
return; return;
} }

4
src/timer.rs
View File

@ -50,7 +50,7 @@ impl Timer {
fn cycle(&mut self, bus: &mut Bus) { fn cycle(&mut self, bus: &mut Bus) {
self.divider = self.divider.wrapping_add(1); self.divider = self.divider.wrapping_add(1);
let result = self.is_enabled && self.get_tima_rate(bus); let result = self.is_enabled && self.get_tima_rate();
if self.prev_result && !result { if self.prev_result && !result {
let tima = bus.read(TIMER_COUNTER_ADDRESS).wrapping_add(1); let tima = bus.read(TIMER_COUNTER_ADDRESS).wrapping_add(1);
@ -69,7 +69,7 @@ impl Timer {
get_bit(bus.read(TIMER_CONTROL_ADDRESS), BitIndex::I2) get_bit(bus.read(TIMER_CONTROL_ADDRESS), BitIndex::I2)
} }
fn get_tima_rate(&self, bus: &Bus) -> bool { fn get_tima_rate(&self) -> bool {
let clock_select = self.control & 0b0000_0011; let clock_select = self.control & 0b0000_0011;
match clock_select { match clock_select {
0b00 => ((self.divider >> 9) & 1) == 1, 0b00 => ((self.divider >> 9) & 1) == 1,