diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
| commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
| tree | 39e92c2f818e3e8144978740b914731613af0e40 /hw/sd.c | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
| download | focaccia-qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.gz focaccia-qemu-c227f0995e1722a1abccc28cadf0664266bd8043.zip | |
Revert "Get rid of _t suffix"
In the very least, a change like this requires discussion on the list. The naming convention is goofy and it causes a massive merge problem. Something like this _must_ be presented on the list first so people can provide input and cope with it. This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/sd.c')
| -rw-r--r-- | hw/sd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/sd.c b/hw/sd.c index b7f053b0ba..9888547436 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -51,7 +51,7 @@ typedef enum { sd_r6 = 6, /* Published RCA response */ sd_r7, /* Operating voltage */ sd_r1b = -1, -} e_sd_rsp_type; +} sd_rsp_type_t; struct SDState { enum { @@ -130,7 +130,7 @@ static void sd_set_status(SDState *sd) sd->card_status |= sd->state << 9; } -static const e_sd_cmd_type sd_cmd_type[64] = { +static const sd_cmd_type_t sd_cmd_type[64] = { sd_bc, sd_none, sd_bcr, sd_bcr, sd_none, sd_none, sd_none, sd_ac, sd_bcr, sd_ac, sd_ac, sd_adtc, sd_ac, sd_ac, sd_none, sd_ac, sd_ac, sd_adtc, sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, @@ -141,7 +141,7 @@ static const e_sd_cmd_type sd_cmd_type[64] = { sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, }; -static const e_sd_cmd_type sd_acmd_type[64] = { +static const sd_cmd_type_t sd_acmd_type[64] = { sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_ac, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_ac, @@ -579,7 +579,7 @@ static void sd_lock_command(SDState *sd) sd->card_status &= ~CARD_IS_LOCKED; } -static e_sd_rsp_type sd_normal_command(SDState *sd, +static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca = 0x0000; @@ -1118,7 +1118,7 @@ static e_sd_rsp_type sd_normal_command(SDState *sd, return sd_r0; } -static e_sd_rsp_type sd_app_command(SDState *sd, +static sd_rsp_type_t sd_app_command(SDState *sd, SDRequest req) { uint32_t rca; @@ -1231,7 +1231,7 @@ static e_sd_rsp_type sd_app_command(SDState *sd, int sd_do_command(SDState *sd, SDRequest *req, uint8_t *response) { uint32_t last_status = sd->card_status; - e_sd_rsp_type rtype; + sd_rsp_type_t rtype; int rsplen; if (!sd->bdrv || !bdrv_is_inserted(sd->bdrv) || !sd->enable) { |