devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

rustfmt

Browse source 
Former-commit-id: a73535e556d1fb44e30927f0ab1f6238a8df8739
This commit is contained in:
Michel Heily 2020-02-21 14:08:08 +02:00
parent 0476342278
commit b333ae7f65
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/gpu/render/text.rs
View file

@ -9,7 +9,10 @@ use crate::core::Bus;
impl Gpu { impl Gpu {
pub(in super::super) fn render_reg_bg(&mut self, bg: usize) { pub(in super::super) fn render_reg_bg(&mut self, bg: usize) {
let (h_ofs, v_ofs) = (self.backgrounds[bg].bghofs as u32, self.backgrounds[bg].bgvofs as u32); let (h_ofs, v_ofs) = (
self.backgrounds[bg].bghofs as u32,
self.backgrounds[bg].bgvofs as u32,
);
let tileset_base = self.backgrounds[bg].bgcnt.char_block(); let tileset_base = self.backgrounds[bg].bgcnt.char_block();
let tilemap_base = self.backgrounds[bg].bgcnt.screen_block(); let tilemap_base = self.backgrounds[bg].bgcnt.screen_block();
let (tile_size, pixel_format) = self.backgrounds[bg].bgcnt.tile_format(); let (tile_size, pixel_format) = self.backgrounds[bg].bgcnt.tile_format();

10
src/core/iodev.rs
View file

@ -255,8 +255,14 @@ impl Bus for IoDevices {
fn write_8(&mut self, addr: Addr, value: u8) { fn write_8(&mut self, addr: Addr, value: u8) {
match addr + IO_BASE { match addr + IO_BASE {
/* FIFO_A */ 0x0400_00A0 | 0x0400_00A1 | 0x0400_00A2 | 0x0400_00A3 => self.sound.write_fifo(0, value as i8), /* FIFO_A */
/* FIFO_B */ 0x0400_00A4 | 0x0400_00A5 | 0x0400_00A6 | 0x0400_00A7 => self.sound.write_fifo(1, value as i8), 0x0400_00A0 | 0x0400_00A1 | 0x0400_00A2 | 0x0400_00A3 => {
self.sound.write_fifo(0, value as i8)
}
/* FIFO_B */
0x0400_00A4 | 0x0400_00A5 | 0x0400_00A6 | 0x0400_00A7 => {
self.sound.write_fifo(1, value as i8)
}
_ => { _ => {
let t = self.read_16(addr & !1); let t = self.read_16(addr & !1);
let t = if addr & 1 != 0 { let t = if addr & 1 != 0 {

4
src/core/sound/mod.rs
View file

@ -190,12 +190,12 @@ impl SoundController {
if io_addr == REG_SOUNDCNT_X { if io_addr == REG_SOUNDCNT_X {
if value & bit(7) != 0 { if value & bit(7) != 0 {
if !self.mse { if !self.mse {
trace!("MSE enabled!"); info!("MSE enabled!");
self.mse = true; self.mse = true;
} }
} else { } else {
if self.mse { if self.mse {
trace!("MSE disabled!"); info!("MSE disabled!");
self.mse = false; self.mse = false;
} }
} }