From 188e3d69747594b89e6616ad8a6917af964751e7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Tue, 16 Mar 2021 17:20:49 +1100
Subject: [PATCH] AP_Bootloader: save some flash space

gets our largest F4 bootloaders under 16k again
---
 Tools/AP_Bootloader/support.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/Tools/AP_Bootloader/support.cpp b/Tools/AP_Bootloader/support.cpp
index da48ca6981..4ca9351b7b 100644
--- a/Tools/AP_Bootloader/support.cpp
+++ b/Tools/AP_Bootloader/support.cpp
@@ -35,32 +35,34 @@ static uint8_t last_uart;
 
 // #pragma GCC optimize("O0")
 
-int16_t cin(unsigned timeout_ms)
+static bool cin_data(uint8_t *data, uint8_t len, unsigned timeout_ms)
 {
-    uint8_t b = 0;
     for (uint8_t i=0; i<ARRAY_SIZE(uarts); i++) {
         if (locked_uart == -1 || locked_uart == i) {
-            if (chnReadTimeout(uarts[i], &b, 1, chTimeMS2I(timeout_ms)) == 1) {
+            if (chnReadTimeout(uarts[i], data, len, chTimeMS2I(timeout_ms)) == len) {
                 last_uart = i;
-                return b;
+                return true;
             }
         }
     }
     chThdSleepMicroseconds(500);
+    return false;
+}
+
+int16_t cin(unsigned timeout_ms)
+{
+    uint8_t b = 0;
+    if (cin_data(&b, 1, timeout_ms)) {
+        return b;
+    }
     return -1;
 }
 
 int cin_word(uint32_t *wp, unsigned timeout_ms)
 {
-    for (uint8_t i=0; i<ARRAY_SIZE(uarts); i++) {
-        if (locked_uart == -1 || locked_uart == i) {
-            if (chnReadTimeout(uarts[i], (uint8_t *)wp, 4, chTimeMS2I(timeout_ms)) == 4) {
-                last_uart = i;
-                return 0;
-            }
-        }
+    if (cin_data((uint8_t *)wp, 4, timeout_ms)) {
+        return 0;
     }
-    chThdSleepMicroseconds(500);
     return -1;
 }