diff mbox

[V3,3/5] hw/sd.c: convert wp_groups, expecting_acmd and enable to bool

Message ID 1325086342-25653-4-git-send-email-i.mitsyanko@samsung.com
State New
Headers show

Commit Message

Mitsyanko Igor Dec. 28, 2011, 3:32 p.m. UTC 
SDState variables wp_groups, expecting_acmd and enable are of bool data type but
are currently treated as int type variables by rest of the code. This patch updates
sd_enable() and sd_wp_addr() so now they explicitly work with bool type, and
replaces 0 and 1 with 'false' and 'true' where it's required.

Signed-off-by: Mitsyanko Igor <i.mitsyanko@samsung.com>
---
 hw/sd.c |   18 +++++++++---------
 hw/sd.h |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
diff mbox

Patch

diff --git a/hw/sd.c b/hw/sd.c
index 3e5628e..955f4fb 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -426,7 +426,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)
@@ -494,7 +494,7 @@  SDState *sd_init(BlockDriverState *bs, int is_spi)
     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);
@@ -578,7 +578,7 @@  static void sd_function_switch(SDState *sd, uint32_t arg)
     sd->data[66] = crc & 0xff;
 }
 
-static inline int sd_wp_addr(SDState *sd, uint32_t addr)
+static inline bool sd_wp_addr(SDState *sd, uint32_t addr)
 {
     return sd->wp_groups[addr >>
             (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT)];
@@ -1052,7 +1052,7 @@  static sd_rsp_type_t sd_normal_command(SDState *sd,
 
             sd->state = sd_programming_state;
             sd->wp_groups[addr >> (HWBLOCK_SHIFT +
-                            SECTOR_SHIFT + WPGROUP_SHIFT)] = 1;
+                            SECTOR_SHIFT + WPGROUP_SHIFT)] = true;
             /* Bzzzzzzztt .... Operation complete.  */
             sd->state = sd_transfer_state;
             return sd_r1b;
@@ -1072,7 +1072,7 @@  static sd_rsp_type_t sd_normal_command(SDState *sd,
 
             sd->state = sd_programming_state;
             sd->wp_groups[addr >> (HWBLOCK_SHIFT +
-                            SECTOR_SHIFT + WPGROUP_SHIFT)] = 0;
+                            SECTOR_SHIFT + WPGROUP_SHIFT)] = false;
             /* Bzzzzzzztt .... Operation complete.  */
             sd->state = sd_transfer_state;
             return sd_r1b;
@@ -1169,7 +1169,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;
 
@@ -1351,7 +1351,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;
@@ -1362,7 +1362,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);
@@ -1748,7 +1748,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..f446783 100644
--- a/hw/sd.h
+++ b/hw/sd.h
@@ -74,6 +74,6 @@  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 */