diff --git a/Source/HBIOS/sd.asm b/Source/HBIOS/sd.asm index 0ae34c9e..16ebed91 100644 --- a/Source/HBIOS/sd.asm +++ b/Source/HBIOS/sd.asm @@ -947,15 +947,10 @@ SD_INITCARD3: LD (SD_CMDP0),A ; SET COMMAND PARM 0 CALL SD_EXECCMDND ; EXEC COMMAND W/ NO DATA RETURNED ;RET NZ ; ABORT ON ERROR - JR Z,SD_INITCARD3AA ; IF GOOD SKIP AHEAD - ; SOME CARDS DON'T SUPPORT ACMD41, SO TRY CMD1 AS ALTERNATIVE - LD A,SD_CMD_SEND_OP_COND ; SD_CMD_SEND_OP_COND - CALL SD_INITCMD ; SETUP COMMAND BUFFER - LD A,$40 ; P0 = $40 INDICATES WE SUPPORT V2 CARDS - LD (SD_CMDP0),A ; SET COMMAND PARM 0 - CALL SD_EXECCMDND ; EXEC COMMAND W/ NO DATA RETURNED - RET NZ ; ABORT ON ERROR -SD_INITCARD3AA: + CP SD_STCMDERR ; COMMAND ERROR? + JR Z,SD_INITCARD3A ; IF SO, TRY MMC CARD INIT + OR A ; SET FLAGS + RET NZ ; ABORT IF ANY OTHER ERROR ; CHECK FOR IDLE, EXIT LOOP IF IDLE CLEARED LD A,(SD_RC) ; GET CARD RESULT CODE OR A ; SET FLAGS diff --git a/Source/ver.inc b/Source/ver.inc index d2b2aede..3df45cbb 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.25" +#DEFINE BIOSVER "3.1.1-pre.26" diff --git a/Source/ver.lib b/Source/ver.lib index 7d1a2b36..5cb9993b 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.25" + db "3.1.1-pre.26" endm