From 12c28f7681beb06fa4d5e9fba81e6b3550447548 Mon Sep 17 00:00:00 2001
From: Baptiste <baptiste.meauze@etudiant.univ-rennes1.fr>
Date: Wed, 22 Mar 2023 15:33:33 +0100
Subject: [PATCH] read disk works

---
 disk_file               | Bin 5 -> 8 bytes
 src/drivers/drv_disk.rs |   2 +-
 src/simulator/disk.rs   |  15 +++++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/disk_file b/disk_file
index 550d34e8b72ed88b66f42d200e86c636451bd5b4..8067c5cb5a154f56055743e60bfb4e16a0b399a4 100644
GIT binary patch
literal 8
NcmZQzU|?Vb0ssIK00jU5

literal 5
McmZ3z>+Br{019IR4*&oF

diff --git a/src/drivers/drv_disk.rs b/src/drivers/drv_disk.rs
index 3633169..c4fa5d7 100644
--- a/src/drivers/drv_disk.rs
+++ b/src/drivers/drv_disk.rs
@@ -52,7 +52,7 @@ mod test {
     }
 
     #[test]
-    fn test_read_write_disk() {
+    fn test_read_write_drv_disk() {
         let disk = Disk::init_disk();
         let mut drv_disk = DrvDisk::init_drv_disk(disk);
 
diff --git a/src/simulator/disk.rs b/src/simulator/disk.rs
index 5499fa1..1d8fddf 100644
--- a/src/simulator/disk.rs
+++ b/src/simulator/disk.rs
@@ -9,7 +9,7 @@ pub const SECTORS_PER_TRACK: i32 = 32;
 pub const NUM_TRACKS: i32 = 64;
 pub const NUM_SECTORS: i32 = SECTORS_PER_TRACK * NUM_TRACKS;
 pub const SECTOR_SIZE: i32 = 4;//4 octects ?
-
+pub const DISK_PATH: &str = "disk_file";
 
 pub const MAGIC_NUMBER : u32 = 0xABBACDDC; 
 //taille en octets, a confirmer
@@ -33,27 +33,30 @@ impl Disk {
         let result_open = File::options().
                                 read(true).
                                 write(true).
-                                open("disk_file");
+                                open(DISK_PATH);
         
         match result_open {
 
             Err(e) => {
                 //On creer le fichier et on y écrit le magic number
-                let magic_to_write : [u8 ; 5] = [0xAB, 0xBA, 0xCD, 0xDC, 0];
+                let magic_to_write : [u8 ; 4] = [0xAB, 0xBA, 0xCD, 0xDC];
                 println!("Error opening file : {}", e);
 
                 disk_file = File::options().
                             read(true).
                             write(true).
                             create_new(true).
-                            open("disk_file").unwrap();
+                            open(DISK_PATH).unwrap();
 
                 disk_file.write_at(&magic_to_write[..], 0);
             }
 
             Ok(f) => {
                 disk_file = f;
+                let magic_to_write : [u8 ; 5] = [0xAB, 0xBA, 0xCD, 0xDC, 0];
+                disk_file.write_at(&magic_to_write[..], 0);
             }
+
         }
 
         match disk_file.read_at(&mut magic_buff[..], 0) {
@@ -105,7 +108,7 @@ impl Disk {
         }
 
         disk.active = true;
-        let mut f = File::open("test/disk.txt")?;
+        let mut f = File::open(DISK_PATH)?;
         f.seek(SeekFrom::Start((sector_number * SECTOR_SIZE) as u64))?;
         let mut buffer = [0; SECTOR_SIZE as usize];
         f.read(&mut buffer)?;
@@ -138,7 +141,7 @@ impl Disk {
         }
 
         disk.active = true;
-        let mut f = File::create("test/disk.txt")?;
+        let mut f = File::create(DISK_PATH)?;
         f.seek(SeekFrom::Start((sector_number * SECTOR_SIZE) as u64))?;
         let mut i = 0;
         let mut buff = Vec::new();