[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 05/13] hw/sd.c: convert binary variables to bool
From: |
Igor Mitsyanko |
Subject: |
[Qemu-devel] [PATCH V3 05/13] hw/sd.c: convert binary variables to bool |
Date: |
Fri, 27 Apr 2012 19:50:51 +0400 |
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 <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
hw/sd.c | 24 ++++++++++++------------
hw/sd.h | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/sd.c b/hw/sd.c
index f7aa580..d4a8927 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -81,7 +81,7 @@ struct SDState {
uint32_t card_status;
uint8_t sd_status[64];
uint32_t vhs;
- int wp_switch;
+ bool wp_switch;
unsigned long *wp_groups;
uint64_t size;
int blk_len;
@@ -91,12 +91,12 @@ struct SDState {
int pwd_len;
int function_group[6];
- int spi;
+ bool spi;
int current_cmd;
/* True if we will handle the next command as an ACMD. Note that this does
* *not* track the APP_CMD status bit!
*/
- int expecting_acmd;
+ bool expecting_acmd;
int blk_written;
uint64_t data_start;
uint32_t data_offset;
@@ -106,7 +106,7 @@ struct SDState {
BlockDriverState *bdrv;
uint8_t *buf;
- int enable;
+ bool enable;
};
static void sd_set_mode(SDState *sd)
@@ -420,7 +420,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
if (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);
memset(sd->function_group, 0, sizeof(int) * 6);
sd->erase_start = 0;
@@ -428,7 +428,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
sd->size = size;
sd->blk_len = 0x200;
sd->pwd_len = 0;
- sd->expecting_acmd = 0;
+ sd->expecting_acmd = false;
}
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
board to ensure that ssi transfers only occur when the chip select
is asserted. */
-SDState *sd_init(BlockDriverState *bs, int is_spi)
+SDState *sd_init(BlockDriverState *bs, bool is_spi)
{
SDState *sd;
sd = (SDState *) g_malloc0(sizeof(SDState));
sd->buf = qemu_blockalign(bs, 512);
sd->spi = is_spi;
- sd->enable = 1;
+ sd->enable = true;
sd_reset(sd, bs);
if (sd->bdrv) {
bdrv_attach_dev_nofail(sd->bdrv, sd);
@@ -1131,7 +1131,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
if (sd->rca != rca)
return sd_r0;
- sd->expecting_acmd = 1;
+ sd->expecting_acmd = true;
sd->card_status |= APP_CMD;
return sd_r1;
@@ -1313,7 +1313,7 @@ int sd_do_command(SDState *sd, SDRequest *req,
if (sd->card_status & CARD_IS_LOCKED) {
if (!cmd_valid_while_locked(sd, req)) {
sd->card_status |= ILLEGAL_COMMAND;
- sd->expecting_acmd = 0;
+ sd->expecting_acmd = false;
fprintf(stderr, "SD: Card is locked\n");
rtype = sd_illegal;
goto send_response;
@@ -1324,7 +1324,7 @@ int sd_do_command(SDState *sd, SDRequest *req,
sd_set_mode(sd);
if (sd->expecting_acmd) {
- sd->expecting_acmd = 0;
+ sd->expecting_acmd = false;
rtype = sd_app_command(sd, *req);
} else {
rtype = sd_normal_command(sd, *req);
@@ -1710,7 +1710,7 @@ int sd_data_ready(SDState *sd)
return sd->state == sd_sendingdata_state;
}
-void sd_enable(SDState *sd, int enable)
+void sd_enable(SDState *sd, bool enable)
{
sd->enable = enable;
}
diff --git a/hw/sd.h b/hw/sd.h
index ac4b7c4..d25342f 100644
--- a/hw/sd.h
+++ b/hw/sd.h
@@ -67,13 +67,13 @@ typedef struct {
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,
uint8_t *response);
void sd_write_data(SDState *sd, uint8_t value);
uint8_t sd_read_data(SDState *sd);
void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert);
int sd_data_ready(SDState *sd);
-void sd_enable(SDState *sd, int enable);
+void sd_enable(SDState *sd, bool enable);
#endif /* __hw_sd_h */
--
1.7.4.1
- [Qemu-devel] [PATCH V3 00/13] SD save/load support, SD qomification and bug fixes, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 03/13] hw/sd.c: introduce wrapper for conversion address to wp group, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 02/13] hw/sd.c: make sd_wp_addr() accept 64 bit address argument, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 04/13] hw/sd.c: favour SD card type (SDSC or SDHC) when performing erase, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 05/13] hw/sd.c: convert binary variables to bool,
Igor Mitsyanko <=
- [Qemu-devel] [PATCH V3 07/13] hw/sd.c: make sd_wp_addr() return bool, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 06/13] hw/sd.c: make sd_dataready() return bool, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 01/13] hw/sd.c: convert wp_groups in SDState to bitfield, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 09/13] hw/sd.c: convert SD state to QOM object, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 08/13] hw/sd.c: add SD card save/load support, Igor Mitsyanko, 2012/04/27
- [Qemu-devel] [PATCH V3 12/13] hw/sd.c: introduce SD card "device-id" property, Igor Mitsyanko, 2012/04/27