This commit is contained in:
Baptiste
2023-03-17 17:39:14 +01:00
parent c5c82ac567
commit 274a8d2c0e
2 changed files with 69 additions and 46 deletions

View File

@ -2,7 +2,7 @@ use crate::Disk;
/// driver disk
pub struct DrvDisk {
disk: Disk
disk: Disk,
}
impl DrvDisk {
@ -11,34 +11,33 @@ impl DrvDisk {
DrvDisk { disk: disk }
}
///read inside the disk
///
/// read inside the disk
///
/// ### Parameters
///
/// - **self** driver disk
///
/// - **self** driver disk
/// - **sector_number** sector where to read the data
/// - **data** where the readed data will be stored
pub fn read_sector(&mut self, sector_number : i32, data : &mut Vec<u8>) {
match Disk::read_request(&mut self.disk,sector_number, data) {
pub fn read_sector(&mut self, sector_number: i32, data: &mut Vec<u8>) {
match Disk::read_request(&mut self.disk, sector_number, data) {
Err(e) => println!("{:?}", e),
_ => ()
_ => (),
}
}
///write inside the disk
///
/// write inside the disk
///
/// ### Parameters
///
/// - **self** driver disk
///
/// - **self** driver disk
/// - **sector_number** sector where to write the data
/// - **data** where the data to write is stored
pub fn write_sector(&mut self, sector_number : i32, data : &mut Vec<u8>) {
pub fn write_sector(&mut self, sector_number: i32, data: &mut Vec<u8>) {
match Disk::write_request(&mut self.disk, sector_number, data) {
Err(e) => println!("{:?}", e),
_ => ()
_ => (),
}
}
}
#[cfg(test)]
@ -58,10 +57,16 @@ mod test {
let mut drv_disk = DrvDisk::init_drv_disk(disk);
let mut data = Vec::new();
data.push(0 as u8); data.push(0 as u8); data.push(0 as u8); data.push(0 as u8);
data.push(0 as u8);
data.push(0 as u8);
data.push(0 as u8);
data.push(0 as u8);
let mut data1 = Vec::new();
data1.push(1 as u8); data1.push(1 as u8); data1.push(1 as u8); data1.push(1 as u8);
data1.push(1 as u8);
data1.push(1 as u8);
data1.push(1 as u8);
data1.push(1 as u8);
let mut data2: Vec<u8> = Vec::new();
@ -69,10 +74,8 @@ mod test {
drv_disk.write_sector(1, &mut data1);
drv_disk.read_sector(1, &mut data2);
assert_eq!(data1,data2);
assert_ne!(data,data1);
assert_ne!(data,data2);
assert_eq!(data1, data2);
assert_ne!(data, data1);
assert_ne!(data, data2);
}
}
}