[simu] SD Card Manager hanged
This commit is contained in:
@@ -543,12 +543,14 @@ extern uint32_t transSpeed;
|
|||||||
|
|
||||||
#define SD_CSD_BLOCKNR_HC(pSd) ((SD_CSD_C_SIZE_HC(pSd) + 1) * 1024)
|
#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_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_BLOCKNR() (SD_IS_HC() ? (SD_CSD_BLOCKNR_HC(Card_CSD)) : (SD_CSD_BLOCKNR(Card_CSD)))
|
||||||
|
|
||||||
#define SD_GET_SPEED() (transSpeed)
|
#define SD_GET_SPEED() (transSpeed)
|
||||||
|
|
||||||
#define SD_GET_SIZE_MB() (SD_GET_BLOCKNR() / 2048)
|
#define SD_GET_SIZE_MB() (SD_GET_BLOCKNR() / 2048)
|
||||||
|
#endif
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -544,7 +544,7 @@ extern uint32_t sdAvailableAudioFiles; // TODO move that!
|
|||||||
void menuProcSdInfo(uint8_t event)
|
void menuProcSdInfo(uint8_t event)
|
||||||
{
|
{
|
||||||
SIMPLE_SUBMENU(PSTR("SD INFO"), 1);
|
SIMPLE_SUBMENU(PSTR("SD INFO"), 1);
|
||||||
#if !defined(SIMU)
|
|
||||||
lcd_putsLeft(2*FH, PSTR("Type:"));
|
lcd_putsLeft(2*FH, PSTR("Type:"));
|
||||||
lcd_puts(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
|
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_puts(lcdLastPos, 5*FH, "kb/s");
|
||||||
|
|
||||||
// lcd_putsLeft(7*FH, PSTR("CSD:"));
|
// lcd_putsLeft(7*FH, PSTR("CSD:"));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void menuProcSd(uint8_t event)
|
void menuProcSd(uint8_t event)
|
||||||
@@ -582,9 +581,7 @@ void menuProcSd(uint8_t event)
|
|||||||
event = 0;
|
event = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(SIMU)
|
|
||||||
SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, menuTabDiag, e_Sd, 1+reusableBuffer.sd.count);
|
SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, menuTabDiag, e_Sd, 1+reusableBuffer.sd.count);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (s_editMode > 0)
|
if (s_editMode > 0)
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
|
|||||||
+1
-1
@@ -87,7 +87,7 @@ extern uint32_t sd_card_mounted();
|
|||||||
#define O9X_FOURCC 0x31783967 // o9x for gruvin9x
|
#define O9X_FOURCC 0x31783967 // o9x for gruvin9x
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PCBV4)
|
#if defined(PCBV4) || defined(SIMU)
|
||||||
#define SD_IS_HC() (0)
|
#define SD_IS_HC() (0)
|
||||||
#define SD_GET_BLOCKNR() (0)
|
#define SD_GET_BLOCKNR() (0)
|
||||||
#define SD_GET_SIZE_MB() (0)
|
#define SD_GET_SIZE_MB() (0)
|
||||||
|
|||||||
Reference in New Issue
Block a user