srenblad/rust-fatfs
1
0
Fork 0
forked from M-Labs/rust-fatfs
Code Pull Requests Activity

Keep only BPB in FileSystem struct instead of entire BootRecord.

Browse Source
This commit is contained in:
Rafał Harabień 2017-11-08 19:41:05 +01:00
parent 4366b1836d
commit 681ee56cb3
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dir.rs
View File

@ -269,7 +269,7 @@ impl <'a, 'b> Dir<'a, 'b> {
} }
// create and write short name entry // create and write short name entry
let mut raw_entry = DirFileEntryData::new(short_name, attrs); let mut raw_entry = DirFileEntryData::new(short_name, attrs);
raw_entry.set_first_cluster(first_cluster, self.fs.fat_type); raw_entry.set_first_cluster(first_cluster, self.fs.fat_type());
raw_entry.reset_created(); raw_entry.reset_created();
raw_entry.reset_accessed(); raw_entry.reset_accessed();
raw_entry.reset_modified(); raw_entry.reset_modified();

2
src/dir_entry.rs
View File

@ -582,7 +582,7 @@ impl <'a, 'b> DirEntry<'a, 'b> {
} }
pub(crate) fn first_cluster(&self) -> Option<u32> { pub(crate) fn first_cluster(&self) -> Option<u32> {
self.data.first_cluster(self.fs.fat_type) self.data.first_cluster(self.fs.fat_type())
} }
fn editor(&self) -> DirEntryEditor { fn editor(&self) -> DirEntryEditor {

4
src/file.rs
View File

@ -49,7 +49,7 @@ impl <'a, 'b> File<'a, 'b> {
Some(ref mut e) => { Some(ref mut e) => {
e.set_size(self.offset); e.set_size(self.offset);
if self.offset == 0 { if self.offset == 0 {
e.set_first_cluster(None, self.fs.fat_type); e.set_first_cluster(None, self.fs.fat_type());
} }
}, },
_ => {}, _ => {},
@ -131,7 +131,7 @@ impl <'a, 'b> File<'a, 'b> {
fn set_first_cluster(&mut self, cluster: u32) { fn set_first_cluster(&mut self, cluster: u32) {
self.first_cluster = Some(cluster); self.first_cluster = Some(cluster);
match self.entry { match self.entry {
Some(ref mut e) => e.set_first_cluster(self.first_cluster, self.fs.fat_type), Some(ref mut e) => e.set_first_cluster(self.first_cluster, self.fs.fat_type()),
None => {}, None => {},
} }
} }

42
src/fs.rs
View File

@ -26,7 +26,7 @@ impl<T> ReadWriteSeek for T where T: Read + Write + Seek {}
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Default, Debug, Clone)] #[derive(Default, Debug, Clone)]
pub(crate) struct BiosParameterBlock { struct BiosParameterBlock {
bytes_per_sector: u16, bytes_per_sector: u16,
sectors_per_cluster: u8, sectors_per_cluster: u8,
reserved_sectors: u16, reserved_sectors: u16,
@ -57,7 +57,7 @@ pub(crate) struct BiosParameterBlock {
} }
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) struct BootRecord { struct BootRecord {
bootjmp: [u8; 3], bootjmp: [u8; 3],
oem_name: [u8; 8], oem_name: [u8; 8],
bpb: BiosParameterBlock, bpb: BiosParameterBlock,
@ -82,11 +82,11 @@ pub(crate) type FileSystemRef<'a, 'b: 'a> = &'a FileSystem<'b>;
/// FAT filesystem main struct. /// FAT filesystem main struct.
pub struct FileSystem<'a> { pub struct FileSystem<'a> {
pub(crate) disk: RefCell<&'a mut ReadWriteSeek>, pub(crate) disk: RefCell<&'a mut ReadWriteSeek>,
pub(crate) fat_type: FatType,
pub(crate) boot: BootRecord,
pub(crate) first_data_sector: u32,
pub(crate) root_dir_sectors: u32,
pub(crate) read_only: bool, pub(crate) read_only: bool,
fat_type: FatType,
bpb: BiosParameterBlock,
first_data_sector: u32,
root_dir_sectors: u32,
} }
impl <'a> FileSystem<'a> { impl <'a> FileSystem<'a> {
@ -113,11 +113,11 @@ impl <'a> FileSystem<'a> {
Ok(FileSystem { Ok(FileSystem {
disk: RefCell::new(disk), disk: RefCell::new(disk),
read_only,
fat_type, fat_type,
boot, bpb: boot.bpb,
first_data_sector, first_data_sector,
root_dir_sectors, root_dir_sectors,
read_only,
}) })
} }
@ -128,7 +128,7 @@ impl <'a> FileSystem<'a> {
/// Returns volume identifier read from BPB in Boot Sector. /// Returns volume identifier read from BPB in Boot Sector.
pub fn volume_id(&self) -> u32 { pub fn volume_id(&self) -> u32 {
self.boot.bpb.volume_id self.bpb.volume_id
} }
/// Returns volume label from BPB in Boot Sector. /// Returns volume label from BPB in Boot Sector.
@ -136,7 +136,7 @@ impl <'a> FileSystem<'a> {
/// Note: File with VOLUME_ID attribute in root directory is ignored by this library. /// Note: File with VOLUME_ID attribute in root directory is ignored by this library.
/// Only label from BPB is used. /// Only label from BPB is used.
pub fn volume_label(&self) -> String { pub fn volume_label(&self) -> String {
String::from_utf8_lossy(&self.boot.bpb.volume_label).trim_right().to_string() String::from_utf8_lossy(&self.bpb.volume_label).trim_right().to_string()
} }
/// Returns root directory object allowing futher penetration of filesystem structure. /// Returns root directory object allowing futher penetration of filesystem structure.
@ -145,7 +145,7 @@ impl <'a> FileSystem<'a> {
match self.fat_type { match self.fat_type {
FatType::Fat12 | FatType::Fat16 => DirRawStream::Root(DiskSlice::from_sectors( FatType::Fat12 | FatType::Fat16 => DirRawStream::Root(DiskSlice::from_sectors(
self.first_data_sector - self.root_dir_sectors, self.root_dir_sectors, 1, self)), self.first_data_sector - self.root_dir_sectors, self.root_dir_sectors, 1, self)),
_ => DirRawStream::File(File::new(Some(self.boot.bpb.root_dir_first_cluster), None, self)), _ => DirRawStream::File(File::new(Some(self.bpb.root_dir_first_cluster), None, self)),
} }
}; };
Dir::new(root_rdr, self) Dir::new(root_rdr, self)
@ -231,15 +231,15 @@ impl <'a> FileSystem<'a> {
} }
pub(crate) fn offset_from_sector(&self, sector: u32) -> u64 { pub(crate) fn offset_from_sector(&self, sector: u32) -> u64 {
(sector as u64) * self.boot.bpb.bytes_per_sector as u64 (sector as u64) * self.bpb.bytes_per_sector as u64
} }
pub(crate) fn sector_from_cluster(&self, cluster: u32) -> u32 { pub(crate) fn sector_from_cluster(&self, cluster: u32) -> u32 {
((cluster - 2) * self.boot.bpb.sectors_per_cluster as u32) + self.first_data_sector ((cluster - 2) * self.bpb.sectors_per_cluster as u32) + self.first_data_sector
} }
pub(crate) fn get_cluster_size(&self) -> u32 { pub(crate) fn get_cluster_size(&self) -> u32 {
self.boot.bpb.sectors_per_cluster as u32 * self.boot.bpb.bytes_per_sector as u32 self.bpb.sectors_per_cluster as u32 * self.bpb.bytes_per_sector as u32
} }
pub(crate) fn offset_from_cluster(&self, cluser: u32) -> u64 { pub(crate) fn offset_from_cluster(&self, cluser: u32) -> u64 {
@ -248,14 +248,14 @@ impl <'a> FileSystem<'a> {
fn fat_slice<'b>(&'b self) -> DiskSlice<'b, 'a> { fn fat_slice<'b>(&'b self) -> DiskSlice<'b, 'a> {
let sectors_per_fat = let sectors_per_fat =
if self.boot.bpb.sectors_per_fat_16 == 0 { self.boot.bpb.sectors_per_fat_32 } if self.bpb.sectors_per_fat_16 == 0 { self.bpb.sectors_per_fat_32 }
else { self.boot.bpb.sectors_per_fat_16 as u32 }; else { self.bpb.sectors_per_fat_16 as u32 };
let mirroring_enabled = self.boot.bpb.extended_flags & 0x80 == 0; let mirroring_enabled = self.bpb.extended_flags & 0x80 == 0;
let (fat_first_sector, mirrors) = if mirroring_enabled { let (fat_first_sector, mirrors) = if mirroring_enabled {
(self.boot.bpb.reserved_sectors as u32, self.boot.bpb.fats) (self.bpb.reserved_sectors as u32, self.bpb.fats)
} else { } else {
let active_fat = (self.boot.bpb.extended_flags & 0x0F) as u32; let active_fat = (self.bpb.extended_flags & 0x0F) as u32;
let fat_first_sector = (self.boot.bpb.reserved_sectors as u32) + active_fat * sectors_per_fat; let fat_first_sector = (self.bpb.reserved_sectors as u32) + active_fat * sectors_per_fat;
(fat_first_sector, 1) (fat_first_sector, 1)
}; };
DiskSlice::from_sectors(fat_first_sector, sectors_per_fat, mirrors, self) DiskSlice::from_sectors(fat_first_sector, sectors_per_fat, mirrors, self)
@ -287,7 +287,7 @@ impl <'a, 'b> DiskSlice<'a, 'b> {
} }
pub(crate) fn from_sectors(first_sector: u32, sector_count: u32, mirrors: u8, fs: FileSystemRef<'a, 'b>) -> Self { pub(crate) fn from_sectors(first_sector: u32, sector_count: u32, mirrors: u8, fs: FileSystemRef<'a, 'b>) -> Self {
let bytes_per_sector = fs.boot.bpb.bytes_per_sector as u64; let bytes_per_sector = fs.bpb.bytes_per_sector as u64;
Self::new(first_sector as u64 * bytes_per_sector, sector_count as u64 * bytes_per_sector, mirrors, fs) Self::new(first_sector as u64 * bytes_per_sector, sector_count as u64 * bytes_per_sector, mirrors, fs)
} }