lauchmelder/rusty-nes
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cleaned up file io code

Browse source
This commit is contained in:
Lauchmelder 2022-08-23 20:03:05 +02:00
parent d7bd8a6c24
commit 907b9da1fc
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cartridge.rs
View file

@ -1,4 +1,4 @@
use std::fs; use std::{fs::{self, File}, io::{BufReader, Read}};
struct Header struct Header
{ {
@ -18,30 +18,30 @@ impl Cartridge
{ {
pub fn new(filepath: &str) -> Cartridge pub fn new(filepath: &str) -> Cartridge
{ {
let contents = fs::read(filepath).expect("Failed to load ROM"); let fp = File::open(filepath).expect("Failed to load ROM");
let iter = contents.iter(); let mut reader = BufReader::new(fp);
let mut curr_pos: usize = 0; let mut header_data = vec![0u8; 16];
reader.read_exact(&mut header_data).expect("Header not present in ROM");
let header_data = &contents[curr_pos..curr_pos + 16];
let header = Header { let header = Header {
prg_blocks: header_data[4], prg_blocks: header_data[4],
chr_blocks: header_data[5] chr_blocks: header_data[5]
}; };
// TODO: For now assume there is no trainer // TODO: For now assume there is no trainer
curr_pos = 16; let mut prg_data = vec![0u8; 0x4000 * header.prg_blocks as usize];
let prg_data = &contents[curr_pos..(curr_pos + 0x4000 * header.prg_blocks as usize)]; let mut chr_data = vec![0u8; 0x2000 * header.chr_blocks as usize];
curr_pos += 0x4000 * header.prg_blocks as usize; reader.read_exact(&mut prg_data).expect("ROM does not contain specified amount of PRG data");
let chr_data = &contents[curr_pos..(curr_pos + 0x2000 * header.chr_blocks as usize)]; reader.read_exact(&mut chr_data).expect("ROM does not contain specified amount of CHR data");
Cartridge Cartridge
{ {
header: header, header: header,
prg: prg_data.to_vec(), prg: prg_data,
chr: chr_data.to_vec() chr: chr_data
} }
} }