From f907abb73036423d7dc6e2860c89cffb5ca00b3d Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 17 Mar 2014 17:32:14 +0100
Subject: [PATCH] Checks bootloader size not greater than 32k. Bug fixes.

---
 radio/src/Makefile                   | 4 +---
 radio/src/bootloader/boot.cpp        | 4 ++--
 radio/src/targets/taranis/diskio.cpp | 4 +++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index ca3665239..bf7412a89 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1104,10 +1104,8 @@ else
 endif
 
 # build bootloader
-# TODO
-# BL_SIZE=${shell sh -c "wc -c $^ | cut -d\  -f1"}
-# if $(BL_SIZE)>32768 then $(error Bootloader doesn't fit in 32k flash); fi
 bootloader.lbm: bootloader/bootloader_ramBoot.bin
+	test -z "$$(find $^ -size +32k)"
 	$(BIN2LBM) $^ $@ 
 
 .PHONY bootloader/bootloader_ramBoot.bin:
diff --git a/radio/src/bootloader/boot.cpp b/radio/src/bootloader/boot.cpp
index 58ee913f5..fe7b9daa1 100644
--- a/radio/src/bootloader/boot.cpp
+++ b/radio/src/bootloader/boot.cpp
@@ -699,8 +699,6 @@ int main()
   for (;;) {
     wdt_reset();
 
-    uint8_t event = getEvent();
-
     if (Tenms) {
       wdt_reset();  // Retrigger hardware watchdog
 
@@ -718,6 +716,8 @@ int main()
       lcd_putsLeft(0, BOOTLOADER_TITLE);
       lcd_hline(0, 10, LCD_W);
 
+      uint8_t event = getEvent();
+
       if (usbPlugged()) {
         state = ST_USB;
       }
diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp
index 652c41e2b..6cb17c7f0 100644
--- a/radio/src/targets/taranis/diskio.cpp
+++ b/radio/src/targets/taranis/diskio.cpp
@@ -950,7 +950,9 @@ FIL g_telemetryFile = {0};
 #if defined(BOOT)
 void sdInit(void)
 {
- f_mount(0, &g_FATFS_Obj);
+  if (f_mount(0, &g_FATFS_Obj) == FR_OK) {
+    f_chdir("/");
+  }
 }
 #else
 // TODO shouldn't be there!