Revision 99a0949b hw/sd.c

b/hw/sd.c
51 51
    sd_r6 = 6,    /* Published RCA response */
52 52
    sd_r7,        /* Operating voltage */
53 53
    sd_r1b = -1,
54
} sd_rsp_type_t;
54
} e_sd_rsp_type;
55 55

  
56 56
struct SDState {
57 57
    enum {
......
130 130
    sd->card_status |= sd->state << 9;
131 131
}
132 132

  
133
static const sd_cmd_type_t sd_cmd_type[64] = {
133
static const e_sd_cmd_type sd_cmd_type[64] = {
134 134
    sd_bc,   sd_none, sd_bcr,  sd_bcr,  sd_none, sd_none, sd_none, sd_ac,
135 135
    sd_bcr,  sd_ac,   sd_ac,   sd_adtc, sd_ac,   sd_ac,   sd_none, sd_ac,
136 136
    sd_ac,   sd_adtc, sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none,
......
141 141
    sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
142 142
};
143 143

  
144
static const sd_cmd_type_t sd_acmd_type[64] = {
144
static const e_sd_cmd_type sd_acmd_type[64] = {
145 145
    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_ac,   sd_none,
146 146
    sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_none, sd_none,
147 147
    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_ac,
......
579 579
        sd->card_status &= ~CARD_IS_LOCKED;
580 580
}
581 581

  
582
static sd_rsp_type_t sd_normal_command(SDState *sd,
582
static e_sd_rsp_type sd_normal_command(SDState *sd,
583 583
                                       SDRequest req)
584 584
{
585 585
    uint32_t rca = 0x0000;
......
1118 1118
    return sd_r0;
1119 1119
}
1120 1120

  
1121
static sd_rsp_type_t sd_app_command(SDState *sd,
1121
static e_sd_rsp_type sd_app_command(SDState *sd,
1122 1122
                                    SDRequest req) {
1123 1123
    uint32_t rca;
1124 1124

  
......
1231 1231
int sd_do_command(SDState *sd, SDRequest *req,
1232 1232
                  uint8_t *response) {
1233 1233
    uint32_t last_status = sd->card_status;
1234
    sd_rsp_type_t rtype;
1234
    e_sd_rsp_type rtype;
1235 1235
    int rsplen;
1236 1236

  
1237 1237
    if (!sd->bdrv || !bdrv_is_inserted(sd->bdrv) || !sd->enable) {

Also available in: Unified diff