From 702b956a2dfae1b00ddf6eaaaaa0dedef9764b11 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 28 Sep 2012 22:28:15 +0000
Subject: [PATCH] [simu] SD Card Manager hanged

---
 src/ersky9x/board.h   | 2 ++
 src/general_menus.cpp | 5 +----
 src/sdcard.h          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/ersky9x/board.h b/src/ersky9x/board.h
index 1ca8bd728..21eef09ce 100644
--- a/src/ersky9x/board.h
+++ b/src/ersky9x/board.h
@@ -543,12 +543,14 @@ extern uint32_t transSpeed;
 
 #define SD_CSD_BLOCKNR_HC(pSd)         ((SD_CSD_C_SIZE_HC(pSd) + 1) * 1024)
 
+#if !defined(SIMU)
 #define SD_IS_HC()                     (Cmd_A41_resp & OCR_SD_CCS)
 #define SD_GET_BLOCKNR()               (SD_IS_HC() ? (SD_CSD_BLOCKNR_HC(Card_CSD)) : (SD_CSD_BLOCKNR(Card_CSD)))
 
 #define SD_GET_SPEED()                 (transSpeed)
 
 #define SD_GET_SIZE_MB()               (SD_GET_BLOCKNR() / 2048)
+#endif
 
 //------------------------------------------------------------------------------
 
diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index ade5271a2..9f0a45a81 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -544,7 +544,7 @@ extern uint32_t sdAvailableAudioFiles; // TODO move that!
 void menuProcSdInfo(uint8_t event)
 {
   SIMPLE_SUBMENU(PSTR("SD INFO"), 1);
-#if !defined(SIMU)
+
   lcd_putsLeft(2*FH, PSTR("Type:"));
   lcd_puts(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
 
@@ -561,7 +561,6 @@ void menuProcSdInfo(uint8_t event)
   lcd_puts(lcdLastPos, 5*FH, "kb/s");
 
   // lcd_putsLeft(7*FH, PSTR("CSD:"));
-#endif  
 }
 
 void menuProcSd(uint8_t event)
@@ -582,9 +581,7 @@ void menuProcSd(uint8_t event)
     event = 0;
   }
 
-#if !defined(SIMU)
   SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, menuTabDiag, e_Sd, 1+reusableBuffer.sd.count);
-#endif  
 
   if (s_editMode > 0)
     s_editMode = 0;
diff --git a/src/sdcard.h b/src/sdcard.h
index 49bf6851f..5cd0e4068 100644
--- a/src/sdcard.h
+++ b/src/sdcard.h
@@ -87,7 +87,7 @@ extern uint32_t sd_card_mounted();
 #define O9X_FOURCC 0x31783967 // o9x for gruvin9x
 #endif
 
-#if defined(PCBV4)
+#if defined(PCBV4) || defined(SIMU)
 #define SD_IS_HC() (0)
 #define SD_GET_BLOCKNR() (0)
 #define SD_GET_SIZE_MB() (0)