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

chore: Cleanup eeprom.

Browse source 
Removed unused code and added meaningful log message to indicate eeprom size assumption due to save file size


Former-commit-id: 12fa73c197cc2c9c695ed209114b803f2255e95d
This commit is contained in:
Michel Heily 2020-02-01 11:26:56 +02:00
parent 13037f334c
commit 7625feee6b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/cartridge/backup/eeprom.rs
View file

@ -2,6 +2,7 @@ use super::{BackupFile, BackupMemoryInterface};
use num::FromPrimitive; use num::FromPrimitive;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
extern crate bytesize;
use std::cell::RefCell; use std::cell::RefCell;
use std::fs; use std::fs;
@ -289,12 +290,14 @@ impl EepromController {
let eeprom_type = if let Some(path) = &path { let eeprom_type = if let Some(path) = &path {
let metadata = fs::metadata(&path).unwrap(); let metadata = fs::metadata(&path).unwrap();
let human_size = bytesize::ByteSize::b(metadata.len());
let eeprom_type = match metadata.len() { let eeprom_type = match metadata.len() {
512 => EepromType::Eeprom512, 512 => EepromType::Eeprom512,
8192 => EepromType::Eeprom8k, 8192 => EepromType::Eeprom8k,
_ => panic!("invalid file size ({}) for eeprom save", metadata.len()), _ => panic!("invalid file size ({}) for eeprom save", human_size),
}; };
detect = false; detect = false;
info!("save file is size {}, assuming eeprom type is {:?}", human_size, eeprom_type);
eeprom_type eeprom_type
} else { } else {
EepromType::Eeprom512 EepromType::Eeprom512
@ -366,7 +369,6 @@ impl EepromController {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::super::super::EEPROM_BASE_ADDR; use super::super::super::EEPROM_BASE_ADDR;
use super::super::BackupFile;
use super::*; use super::*;
use bit::BitIndex; use bit::BitIndex;
@ -453,7 +455,7 @@ mod tests {
// TODO - implement EepromController initialization with data buffer and not files // TODO - implement EepromController initialization with data buffer and not files
{ {
let mut chip = spi.chip.borrow_mut(); let mut chip = spi.chip.borrow_mut();
let mut bytes = chip.memory.bytes_mut(); let bytes = chip.memory.bytes_mut();
bytes[16] = 'T' as u8; bytes[16] = 'T' as u8;
bytes[17] = 'E' as u8; bytes[17] = 'E' as u8;
bytes[18] = 'S' as u8; bytes[18] = 'S' as u8;