@ -195,7 +195,6 @@ static bool sd_is_emmc(SDState *sd)
static const char * sd_version_str ( enum SDPhySpecificationVersion version )
{
static const char * sdphy_version [ ] = {
[ SD_PHY_SPECv1_10_VERS ] = " v1.10 " ,
[ SD_PHY_SPECv2_00_VERS ] = " v2.00 " ,
[ SD_PHY_SPECv3_01_VERS ] = " v3.01 " ,
} ;
@ -407,11 +406,7 @@ static void sd_set_ocr(SDState *sd)
static void sd_set_scr ( SDState * sd )
{
sd - > scr [ 0 ] = 0 < < 4 ; /* SCR structure version 1.0 */
if ( sd - > spec_version = = SD_PHY_SPECv1_10_VERS ) {
sd - > scr [ 0 ] | = 1 ; /* Spec Version 1.10 */
} else {
sd - > scr [ 0 ] | = 2 ; /* Spec Version 2.00 or Version 3.0X */
}
sd - > scr [ 0 ] | = 2 ; /* Spec Version 2.00 or Version 3.0X */
sd - > scr [ 1 ] = ( 2 < < 4 ) /* SDSC Card (Security Version 1.01) */
| 0 b0101 ; /* 1-bit or 4-bit width bus modes */
sd - > scr [ 2 ] = 0x00 ; /* Extended Security is not supported. */
@ -1555,9 +1550,6 @@ static sd_rsp_type_t sd_cmd_DE_SELECT_CARD(SDState *sd, SDRequest req)
/* CMD8 */
static sd_rsp_type_t sd_cmd_SEND_IF_COND ( SDState * sd , SDRequest req )
{
if ( sd - > spec_version < SD_PHY_SPECv2_00_VERS ) {
return sd_cmd_illegal ( sd , req ) ;
}
if ( sd - > state ! = sd_idle_state ) {
return sd_invalid_state_for_cmd ( sd , req ) ;
}
@ -2773,7 +2765,7 @@ static void sd_realize(DeviceState *dev, Error **errp)
int ret ;
switch ( sd - > spec_version ) {
case SD_PHY_SPECv1_1 0_VERS
case SD_PHY_SPECv2_0 0_VERS
. . . SD_PHY_SPECv3_01_VERS :
break ;
default :