OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/sd.c: convert binary variables to bool

Browse Source 
Several members of SDState have type int when they actually are binary variables.
Change type of these variables to bool to improve code readability. Change SD API
to be in consistency with new variables type.

Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Mitsyanko Igor 2012-08-13 11:04:06 +01:00 committed by Peter Maydell
parent b7202b8870
commit bebd12717c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/sd.c
View File

@ -81,7 +81,7 @@ struct SDState {
uint32_t card_status; uint32_t card_status;
uint8_t sd_status[64]; uint8_t sd_status[64];
uint32_t vhs; uint32_t vhs;
int wp_switch; bool wp_switch;
unsigned long *wp_groups; unsigned long *wp_groups;
uint64_t size; uint64_t size;
int blk_len; int blk_len;
@ -91,12 +91,12 @@ struct SDState {
int pwd_len; int pwd_len;
int function_group[6]; int function_group[6];
int spi; bool spi;
int current_cmd; int current_cmd;
/* True if we will handle the next command as an ACMD. Note that this does /* True if we will handle the next command as an ACMD. Note that this does
* *not* track the APP_CMD status bit! * *not* track the APP_CMD status bit!
*/ */
int expecting_acmd; bool expecting_acmd;
int blk_written; int blk_written;
uint64_t data_start; uint64_t data_start;
uint32_t data_offset; uint32_t data_offset;
@ -106,7 +106,7 @@ struct SDState {
BlockDriverState *bdrv; BlockDriverState *bdrv;
uint8_t *buf; uint8_t *buf;
int enable; bool enable;
}; };
static void sd_set_mode(SDState *sd) static void sd_set_mode(SDState *sd)
@ -420,7 +420,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
if (sd->wp_groups) if (sd->wp_groups)
g_free(sd->wp_groups); g_free(sd->wp_groups);
sd->wp_switch = bdrv ? bdrv_is_read_only(bdrv) : 0; sd->wp_switch = bdrv ? bdrv_is_read_only(bdrv) : false;
sd->wp_groups = bitmap_new(sect); sd->wp_groups = bitmap_new(sect);
memset(sd->function_group, 0, sizeof(int) * 6); memset(sd->function_group, 0, sizeof(int) * 6);
sd->erase_start = 0; sd->erase_start = 0;
@ -428,7 +428,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
sd->size = size; sd->size = size;
sd->blk_len = 0x200; sd->blk_len = 0x200;
sd->pwd_len = 0; sd->pwd_len = 0;
sd->expecting_acmd = 0; sd->expecting_acmd = false;
} }
static void sd_cardchange(void *opaque, bool load) static void sd_cardchange(void *opaque, bool load)
@ -450,14 +450,14 @@ static const BlockDevOps sd_block_ops = {
whether card should be in SSI or MMC/SD mode. It is also up to the whether card should be in SSI or MMC/SD mode. It is also up to the
board to ensure that ssi transfers only occur when the chip select board to ensure that ssi transfers only occur when the chip select
is asserted. */ is asserted. */
SDState *sd_init(BlockDriverState *bs, int is_spi) SDState *sd_init(BlockDriverState *bs, bool is_spi)
{ {
SDState *sd; SDState *sd;
sd = (SDState *) g_malloc0(sizeof(SDState)); sd = (SDState *) g_malloc0(sizeof(SDState));
sd->buf = qemu_blockalign(bs, 512); sd->buf = qemu_blockalign(bs, 512);
sd->spi = is_spi; sd->spi = is_spi;
sd->enable = 1; sd->enable = true;
sd_reset(sd, bs); sd_reset(sd, bs);
if (sd->bdrv) { if (sd->bdrv) {
bdrv_attach_dev_nofail(sd->bdrv, sd); bdrv_attach_dev_nofail(sd->bdrv, sd);
@ -1129,7 +1129,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
if (sd->rca != rca) if (sd->rca != rca)
return sd_r0; return sd_r0;
sd->expecting_acmd = 1; sd->expecting_acmd = true;
sd->card_status |= APP_CMD; sd->card_status |= APP_CMD;
return sd_r1; return sd_r1;
@ -1311,7 +1311,7 @@ int sd_do_command(SDState *sd, SDRequest *req,
if (sd->card_status & CARD_IS_LOCKED) { if (sd->card_status & CARD_IS_LOCKED) {
if (!cmd_valid_while_locked(sd, req)) { if (!cmd_valid_while_locked(sd, req)) {
sd->card_status |= ILLEGAL_COMMAND; sd->card_status |= ILLEGAL_COMMAND;
sd->expecting_acmd = 0; sd->expecting_acmd = false;
fprintf(stderr, "SD: Card is locked\n"); fprintf(stderr, "SD: Card is locked\n");
rtype = sd_illegal; rtype = sd_illegal;
goto send_response; goto send_response;
@ -1322,7 +1322,7 @@ int sd_do_command(SDState *sd, SDRequest *req,
sd_set_mode(sd); sd_set_mode(sd);
if (sd->expecting_acmd) { if (sd->expecting_acmd) {
sd->expecting_acmd = 0; sd->expecting_acmd = false;
rtype = sd_app_command(sd, *req); rtype = sd_app_command(sd, *req);
} else { } else {
rtype = sd_normal_command(sd, *req); rtype = sd_normal_command(sd, *req);
@ -1708,7 +1708,7 @@ int sd_data_ready(SDState *sd)
return sd->state == sd_sendingdata_state; return sd->state == sd_sendingdata_state;
} }
void sd_enable(SDState *sd, int enable) void sd_enable(SDState *sd, bool enable)
{ {
sd->enable = enable; sd->enable = enable;
} }

4
hw/sd.h
View File

@ -67,13 +67,13 @@ typedef struct {
typedef struct SDState SDState; typedef struct SDState SDState;
SDState *sd_init(BlockDriverState *bs, int is_spi); SDState *sd_init(BlockDriverState *bs, bool is_spi);
int sd_do_command(SDState *sd, SDRequest *req, int sd_do_command(SDState *sd, SDRequest *req,
uint8_t *response); uint8_t *response);
void sd_write_data(SDState *sd, uint8_t value); void sd_write_data(SDState *sd, uint8_t value);
uint8_t sd_read_data(SDState *sd); uint8_t sd_read_data(SDState *sd);
void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert);
int sd_data_ready(SDState *sd); int sd_data_ready(SDState *sd);
void sd_enable(SDState *sd, int enable); void sd_enable(SDState *sd, bool enable);
#endif /* __hw_sd_h */ #endif /* __hw_sd_h */