mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sdcard: simplify using the ldst API

Browse Source 
the code is easier to review/refactor.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180215221325.7611-7-f4bug@amsat.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-02-22 15:12:53 +00:00 committed by Peter Maydell
parent 0aad4fdfd4
commit 67bfddd62b
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/sd/sd.c
View File

@ -431,57 +431,39 @@ static int sd_req_crc_validate(SDRequest *req)
{ {
uint8_t buffer[5]; uint8_t buffer[5];
buffer[0] = 0x40 | req->cmd; buffer[0] = 0x40 | req->cmd;
buffer[1] = (req->arg >> 24) & 0xff; stl_be_p(&buffer[1], req->arg);
buffer[2] = (req->arg >> 16) & 0xff;
buffer[3] = (req->arg >> 8) & 0xff;
buffer[4] = (req->arg >> 0) & 0xff;
return 0; return 0;
return sd_crc7(buffer, 5) != req->crc; /* TODO */ return sd_crc7(buffer, 5) != req->crc; /* TODO */
} }
static void sd_response_r1_make(SDState *sd, uint8_t *response) static void sd_response_r1_make(SDState *sd, uint8_t *response)
{ {
uint32_t status = sd->card_status; stl_be_p(response, sd->card_status);
/* Clear the "clear on read" status bits */ /* Clear the "clear on read" status bits */
sd->card_status &= ~CARD_STATUS_C; sd->card_status &= ~CARD_STATUS_C;
response[0] = (status >> 24) & 0xff;
response[1] = (status >> 16) & 0xff;
response[2] = (status >> 8) & 0xff;
response[3] = (status >> 0) & 0xff;
} }
static void sd_response_r3_make(SDState *sd, uint8_t *response) static void sd_response_r3_make(SDState *sd, uint8_t *response)
{ {
response[0] = (sd->ocr >> 24) & 0xff; stl_be_p(response, sd->ocr);
response[1] = (sd->ocr >> 16) & 0xff;
response[2] = (sd->ocr >> 8) & 0xff;
response[3] = (sd->ocr >> 0) & 0xff;
} }
static void sd_response_r6_make(SDState *sd, uint8_t *response) static void sd_response_r6_make(SDState *sd, uint8_t *response)
{ {
uint16_t arg;
uint16_t status; uint16_t status;
arg = sd->rca;
status = ((sd->card_status >> 8) & 0xc000) | status = ((sd->card_status >> 8) & 0xc000) |
((sd->card_status >> 6) & 0x2000) | ((sd->card_status >> 6) & 0x2000) |
(sd->card_status & 0x1fff); (sd->card_status & 0x1fff);
sd->card_status &= ~(CARD_STATUS_C & 0xc81fff); sd->card_status &= ~(CARD_STATUS_C & 0xc81fff);
stw_be_p(response + 0, sd->rca);
response[0] = (arg >> 8) & 0xff; stw_be_p(response + 2, status);
response[1] = arg & 0xff;
response[2] = (status >> 8) & 0xff;
response[3] = status & 0xff;
} }
static void sd_response_r7_make(SDState *sd, uint8_t *response) static void sd_response_r7_make(SDState *sd, uint8_t *response)
{ {
response[0] = (sd->vhs >> 24) & 0xff; stl_be_p(response, sd->vhs);
response[1] = (sd->vhs >> 16) & 0xff;
response[2] = (sd->vhs >> 8) & 0xff;
response[3] = (sd->vhs >> 0) & 0xff;
} }
static inline uint64_t sd_addr_to_wpnum(uint64_t addr) static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
@ -727,7 +709,7 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr)
static void sd_function_switch(SDState *sd, uint32_t arg) static void sd_function_switch(SDState *sd, uint32_t arg)
{ {
int i, mode, new_func, crc; int i, mode, new_func;
mode = !!(arg & 0x80000000); mode = !!(arg & 0x80000000);
sd->data[0] = 0x00; /* Maximum current consumption */ sd->data[0] = 0x00; /* Maximum current consumption */
@ -751,9 +733,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg)
sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4); sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4);
} }
memset(&sd->data[17], 0, 47); memset(&sd->data[17], 0, 47);
crc = sd_crc16(sd->data, 64); stw_be_p(sd->data + 65, sd_crc16(sd->data, 64));
sd->data[65] = crc >> 8;
sd->data[66] = crc & 0xff;
} }
static inline bool sd_wp_addr(SDState *sd, uint64_t addr) static inline bool sd_wp_addr(SDState *sd, uint64_t addr)