Commit f6fb1f9b authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdcard: Correct CRC16 offset in sd_function_switch() 



Per the Physical Layer Simplified Spec. "4.3.10.4 Switch Function Status":

  The block length is predefined to 512 bits

and "4.10.2 SD Status":

  The SD Status contains status bits that are related to the SD Memory Card
  proprietary features and may be used for future application-specific usage.
  The size of the SD Status is one data block of 512 bit. The content of this
  register is transmitted to the Host over the DAT bus along with a 16-bit CRC.

Thus the 16-bit CRC goes at offset 64.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180509060104.4458-3-f4bug@amsat.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 905edee9

hw/sd/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg) 
        sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4);

    }

    memset(&sd->data[17], 0, 47);

    stw_be_p(sd->data + 65, sd_crc16(sd->data, 64));

    stw_be_p(sd->data + 64, sd_crc16(sd->data, 64));

}



static inline bool sd_wp_addr(SDState *sd, uint64_t addr)