Last CR fixes

alloncm · Aug 19, 2023 · be21fa2 · be21fa2
1 parent a3c50c8
commit be21fa2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/rpi/src/delay.rs b/rpi/src/delay.rs
@@ -7,12 +7,12 @@ const CNTP_CTL_ISTATUS:u32  = 1<<2;
 // This function is busy waiting, when the interrupt controller will be implemented 
 // I could make this function not busy wait
 pub fn wait_ms(duration:u32){
-    let mut counter_timer_freq_reg:u32;                 // the freq of the system timer
-    // read CNTFRQ ARM register
-    unsafe{asm!("mrc p15, 0, {r}, c14, c0, 0", r = out(reg) counter_timer_freq_reg)};
-
-    let required_count_increase:u32 = (counter_timer_freq_reg / 1000) * duration;
     unsafe{
+        let mut counter_timer_freq_reg:u32;                 // the freq of the system timer
+        // read CNTFRQ ARM register
+        asm!("mrc p15, 0, {r}, c14, c0, 0", r = out(reg) counter_timer_freq_reg);
+
+        let required_count_increase:u32 = (counter_timer_freq_reg / 1000) * duration;
         // set CNTP_TVAL ARM register
         asm!("mcr p15, 0, {r}, c14, c2, 0", r = in(reg) required_count_increase);
         // set CNTP_CTL ARM register to start and disable timer interrupt
@@ -21,16 +21,14 @@ pub fn wait_ms(duration:u32){
         asm!("mrc p15, 0, {r}, c14, c2, 1", r = out(reg) cntp_ctl_reg);
         cntp_ctl_reg |= CNTP_CTL_ENABLE | CNTP_CTL_IMASK;
         asm!("mcr p15, 0, {r}, c14, c2, 1", r = in(reg) cntp_ctl_reg);
-    }
-    loop {
-        let mut cntp_ctl_reg:u32;
-        unsafe{asm!("mrc p15, 0, {r}, c14, c2, 1", r = out(reg) cntp_ctl_reg)};
-        if cntp_ctl_reg & CNTP_CTL_ISTATUS != 0{
-            break;
+        loop {
+            let mut cntp_ctl_reg:u32;
+            asm!("mrc p15, 0, {r}, c14, c2, 1", r = out(reg) cntp_ctl_reg);
+            if cntp_ctl_reg & CNTP_CTL_ISTATUS != 0{
+                break;
+            }
         }
-    }
-    // set ARM Timer to stop counting
-    unsafe{
+        // set ARM Timer to stop counting
         let mut cntp_ctl_reg:u32;
         // read CNTP_CTL ARM register
         asm!("mrc p15, 0, {r}, c14, c2, 1", r = out(reg) cntp_ctl_reg);

diff --git a/rpi/src/drivers/fat32.rs b/rpi/src/drivers/fat32.rs
@@ -174,11 +174,12 @@ impl Fat32{
                 if dir.file_name[0] == DIR_EOF_PREFIX{
                     break 'search;
                 }
-                else if dir.file_name[0] == DELETED_DIR_ENTRY_PREFIX{
+                if dir.file_name[0] == DELETED_DIR_ENTRY_PREFIX{
                     continue;
                 }
                 if dir.attributes == ATTR_LONG_NAME{
                     continue;
+                    // handle long file names here
                 }
                 if discard > 0{
                     discard -= 1;