From cec017597e3a10692aaa8e056ec8b2fcd126cddd Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Sat, 29 May 2021 13:51:32 +0200
Subject: [PATCH] Move disk_init directly after spi init

---
 ili9341.c | 3 +--
 main.c    | 9 +++++++++
 nanovna.h | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ili9341.c b/ili9341.c
index 453783e..e1b2535 100644
--- a/ili9341.c
+++ b/ili9341.c
@@ -307,7 +307,7 @@ void spi_DMARxBuffer(uint8_t *buffer, uint16_t len, bool wait) {
 }
 #endif // __USE_DISPLAY_DMA__
 
-static void spi_init(void)
+void spi_init(void)
 {
   rccEnableSPI1(FALSE);
   LCD_SPI->CR1 = 0;
@@ -528,7 +528,6 @@ void lcd_setBrightness(uint16_t b){
 
 void ili9341_init(void)
 {
-  spi_init();
   // Init Brightness if LCD support
   lcd_initBrightness();
 
diff --git a/main.c b/main.c
index eb69ba3..2efc5c9 100644
--- a/main.c
+++ b/main.c
@@ -2110,6 +2110,7 @@ int main(void)
   #ifdef __USE_RTC__
     rtc_init();
   #endif
+
   //palSetPadMode(GPIOB, 8, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN);
   //palSetPadMode(GPIOB, 9, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN);
 #ifdef __VNA__
@@ -2166,11 +2167,19 @@ int main(void)
   }
 #endif
 
+  spi_init();
+
+#ifdef TINYSA4
+  disk_initialize(0);
+//  SD_PowerOn();
+#endif
+
   /*
  * SPI LCD Initialize
  */
   ili9341_init();
 
+
 /*
  *  Initiate 1 micro second timer
  */
diff --git a/nanovna.h b/nanovna.h
index b593328..19eb4c4 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -926,6 +926,7 @@ void ili9341_read_memory(int x, int y, int w, int h, uint16_t* out);
 void ili9341_line(int x0, int y0, int x1, int y1);
 void show_version(void);
 void lcd_setBrightness(uint16_t b);
+void spi_init(void);
 
 /*
  * flash.c