From bfc8ba8447dc8728c180204af42e8c3ad8ca3ab4 Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Tue, 29 Nov 2016 20:11:30 +0100
Subject: [PATCH] Minor cleanup

---
 source/config.c |  2 +-
 source/draw.c   |  2 +-
 source/fs.c     |  2 +-
 source/main.c   |  2 +-
 source/screen.c |  2 +-
 source/utils.c  | 13 ++++++-------
 source/utils.h  |  2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/source/config.c b/source/config.c
index 811d10a..f5b954b 100644
--- a/source/config.c
+++ b/source/config.c
@@ -393,5 +393,5 @@ void configMenu(bool isSdMode, bool oldPinStatus, u32 oldPinMode)
     else if(oldPinStatus) fileDelete(PIN_FILE);
 
     while(HID_PAD & PIN_BUTTONS);
-    wait(false, 2ULL);
+    wait(2000ULL);
 }
\ No newline at end of file
diff --git a/source/draw.c b/source/draw.c
index 9110845..b8e9f46 100644
--- a/source/draw.c
+++ b/source/draw.c
@@ -52,7 +52,7 @@ bool loadSplash(void)
     if(!isTopSplashValid && !isBottomSplashValid) return false;
 
     swapFramebuffers(true);
-    wait(false, 3ULL);
+    wait(3000ULL);
 
     return true;
 }
diff --git a/source/fs.c b/source/fs.c
index 7b2e3d3..9901b5b 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -256,7 +256,7 @@ void payloadMenu(void)
     }
 
     while(HID_PAD & MENU_BUTTONS);
-    wait(false, 2ULL);
+    wait(2000ULL);
 }
 
 u32 firmRead(void *dest, u32 firmType)
diff --git a/source/main.c b/source/main.c
index 8e18b34..e1e976f 100644
--- a/source/main.c
+++ b/source/main.c
@@ -148,7 +148,7 @@ void main(void)
         if(pinExists && !shouldLoadConfigMenu)
         {
             while(HID_PAD & PIN_BUTTONS);
-            wait(false, 2ULL);
+            wait(2000ULL);
         }
 
         goto boot;
diff --git a/source/screen.c b/source/screen.c
index 2448f67..14d21ab 100644
--- a/source/screen.c
+++ b/source/screen.c
@@ -285,7 +285,7 @@ void initScreens(void)
 
             //Turn on backlight
             i2cWriteRegister(I2C_DEV_MCU, 0x22, 0x2A);
-            wait(true, 3ULL);
+            wait(3ULL);
         }
         else updateBrightness(MULTICONFIG(BRIGHTNESS));
 
diff --git a/source/utils.c b/source/utils.c
index dda72e9..466295c 100644
--- a/source/utils.c
+++ b/source/utils.c
@@ -42,13 +42,12 @@ static void startChrono(void)
     for(u32 i = 1; i < 4; i++) REG_TIMER_CNT(i) = 0x84; //Count-up; enabled
 }
 
-static u64 chrono(bool isMilliseconds)
+static u64 chrono(void)
 {
-    u64 res;
+    u64 res = 0;
     for(u32 i = 0; i < 4; i++) res |= REG_TIMER_VAL(i) << (16 * i);
 
-    if(isMilliseconds) res /= (TICKS_PER_SEC / 1000);
-    else res /= TICKS_PER_SEC;
+    res /= (TICKS_PER_SEC / 1000);
 
     return res;
 }
@@ -77,7 +76,7 @@ u32 waitInput(bool isMenu)
             continue;
         }
 
-        if(key == oldKey && (!isMenu || (!(key & DPAD_BUTTONS) || chrono(true) < dPadDelay))) continue;
+        if(key == oldKey && (!isMenu || (!(key & DPAD_BUTTONS) || chrono() < dPadDelay))) continue;
 
         //Make sure the key is pressed
         u32 i;
@@ -99,10 +98,10 @@ void mcuPowerOff(void)
     while(true);
 }
 
-void wait(bool isMilliseconds, u64 amount)
+void wait(u64 amount)
 {
     startChrono();
-    while(chrono(isMilliseconds) < amount);
+    while(chrono() < amount);
 }
 
 void error(const char *message)
diff --git a/source/utils.h b/source/utils.h
index ea9c455..96fe265 100644
--- a/source/utils.h
+++ b/source/utils.h
@@ -34,5 +34,5 @@
 
 u32 waitInput(bool isMenu);
 void mcuPowerOff(void);
-void wait(bool isMilliseconds, u64 amount);
+void wait(u64 amount);
 void error(const char *message);
\ No newline at end of file