Skip to contentSkip to conversation

hw/sd/sdcard: Use the available enums

PATCH In review Philippe Mathieu-Daudé 3 participants 4 messages May 5, 2019 – May 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/sd/sdcard: Use the available enums

We already define SDCardModes/SDCardStates as enums. Declare the mode/state as enums too, this make gdb debugging sessions
friendlier: instead of numbers, the mode/state name is displayed.

---
 hw/sd/sd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/sd/sd.c +3 -3
index aaab15f3868..a66b3d5b45e 100644
@@ -96,8 +96,8 @@ struct SDState {
     BlockBackend *blk;
     bool spi;
 
-    uint32_t mode;    /* current card mode, one of SDCardModes */
-    int32_t state;    /* current card state, one of SDCardStates */
+    enum SDCardModes mode;
+    enum SDCardStates state;
     uint32_t vhs;
     bool wp_switch;
     unsigned long *wp_groups;
@@ -1640,7 +1640,7 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest *req)
 
 int sd_do_command(SDState *sd, SDRequest *req,
                   uint8_t *response) {
-    int last_state;
+    enum SDCardStates last_state;
     sd_rsp_type_t rtype;
     int rsplen;
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 25 lines · Philippe Mathieu-Daudé

We already define SDCardModes/SDCardStates as enums. Declare the mode/state as enums too, this make gdb debugging sessions
friendlier: instead of numbers, the mode/state name is displayed.

---
 hw/sd/sd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/sd/sd.c +2 -2
index aaab15f3868..a66b3d5b45e 100644
@@ -96,8 +96,8 @@ struct SDState {
     BlockBackend *blk;
     bool spi;
 
-    uint32_t mode;    /* current card mode, one of SDCardModes */
-    int32_t state;    /* current card state, one of SDCardStates */
+    enum SDCardModes mode;
+    enum SDCardStates state;
     uint32_t vhs;
     bool wp_switch;
     unsigned long *wp_groups;

hw/sd/sd.c static int cmd_valid_while_locked(SDState *sd, SDRequest *req) · line 1645

Quoted 7 lines
hw/sd/sd.c +1 -1
@@ -1640,7 +1640,7 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest *req)
 
 int sd_do_command(SDState *sd, SDRequest *req,
                   uint8_t *response) {
-    int last_state;
+    enum SDCardStates last_state;
     sd_rsp_type_t rtype;
     int rsplen;

These guys are part of the migration state:

   static const VMStateDescription sd_vmstate = {
       .name = "sd-card",
       .version_id = 1,
       .minimum_version_id = 1,
       .pre_load = sd_vmstate_pre_load,
       .fields = (VMStateField[]) {
           VMSTATE_UINT32(mode, SDState),
           VMSTATE_INT32(state, SDState),
   [...]

Juan, David, are VMSTATE_UINT32() and VMSTATE_INT32() safe to use with enums?

#2 lore raw
Quoted 37 lines · Markus Armbruster
Quoted 25 lines · Philippe Mathieu-Daudé

We already define SDCardModes/SDCardStates as enums. Declare the mode/state as enums too, this make gdb debugging sessions
friendlier: instead of numbers, the mode/state name is displayed.

---
 hw/sd/sd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/sd/sd.c +2 -2
index aaab15f3868..a66b3d5b45e 100644
@@ -96,8 +96,8 @@ struct SDState {
     BlockBackend *blk;
     bool spi;
 
-    uint32_t mode;    /* current card mode, one of SDCardModes */
-    int32_t state;    /* current card state, one of SDCardStates */
+    enum SDCardModes mode;
+    enum SDCardStates state;
     uint32_t vhs;
     bool wp_switch;
     unsigned long *wp_groups;

hw/sd/sd.c static int cmd_valid_while_locked(SDState *sd, SDRequest *req) · line 1645

Quoted 7 lines
hw/sd/sd.c +1 -1
@@ -1640,7 +1640,7 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest *req)
 
 int sd_do_command(SDState *sd, SDRequest *req,
                   uint8_t *response) {
-    int last_state;
+    enum SDCardStates last_state;
     sd_rsp_type_t rtype;
     int rsplen;

These guys are part of the migration state:

Quoted 9 lines
   static const VMStateDescription sd_vmstate = {
       .name = "sd-card",
       .version_id = 1,
       .minimum_version_id = 1,
       .pre_load = sd_vmstate_pre_load,
       .fields = (VMStateField[]) {
           VMSTATE_UINT32(mode, SDState),
           VMSTATE_INT32(state, SDState),
   [...]

Oh good point, I missed that.

Quoted 2 lines

Juan, David, are VMSTATE_UINT32() and VMSTATE_INT32() safe to use with enums?

I'll wait Juan/Dave to enlighten us, else I can use anonymous union to ease my debugging sessions:

-- >8 --

hw/sd/sd.c +5 -2
@@ -96,7 +96,10 @@ struct SDState {
     BlockBackend *blk;
     bool spi;
 
-    uint32_t mode;    /* current card mode, one of SDCardModes */
+    union {
+        uint32_t migratable_mode;
+        enum SDCardModes mode;
+    };
     int32_t state;    /* current card state, one of SDCardStates */
     uint32_t vhs;
     bool wp_switch;
@@ -659,7 +662,7 @@ static const VMStateDescription sd_vmstate = {
     .minimum_version_id = 1,
     .pre_load = sd_vmstate_pre_load,
     .fields = (VMStateField[]) {
-        VMSTATE_UINT32(mode, SDState),
+        VMSTATE_UINT32(migratable_mode, SDState),
         VMSTATE_INT32(state, SDState),
         VMSTATE_UINT8_ARRAY(cid, SDState, 16),
         VMSTATE_UINT8_ARRAY(csd, SDState, 16),

---

Thanks for the review!

Phil.

#3 lore raw
In reply to Markus Armbruster
Quoted 47 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 25 lines · Philippe Mathieu-Daudé

We already define SDCardModes/SDCardStates as enums. Declare the mode/state as enums too, this make gdb debugging sessions
friendlier: instead of numbers, the mode/state name is displayed.

---
 hw/sd/sd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/sd/sd.c +2 -2
index aaab15f3868..a66b3d5b45e 100644
@@ -96,8 +96,8 @@ struct SDState {
     BlockBackend *blk;
     bool spi;
 
-    uint32_t mode;    /* current card mode, one of SDCardModes */
-    int32_t state;    /* current card state, one of SDCardStates */
+    enum SDCardModes mode;
+    enum SDCardStates state;
     uint32_t vhs;
     bool wp_switch;
     unsigned long *wp_groups;

hw/sd/sd.c static int cmd_valid_while_locked(SDState *sd, SDRequest *req) · line 1645

Quoted 7 lines
hw/sd/sd.c +1 -1
@@ -1640,7 +1640,7 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest *req)
 
 int sd_do_command(SDState *sd, SDRequest *req,
                   uint8_t *response) {
-    int last_state;
+    enum SDCardStates last_state;
     sd_rsp_type_t rtype;
     int rsplen;

These guys are part of the migration state:

   static const VMStateDescription sd_vmstate = {
       .name = "sd-card",
       .version_id = 1,
       .minimum_version_id = 1,
       .pre_load = sd_vmstate_pre_load,
       .fields = (VMStateField[]) {
           VMSTATE_UINT32(mode, SDState),
           VMSTATE_INT32(state, SDState),
   [...]
Quoted 2 lines

Juan, David, are VMSTATE_UINT32() and VMSTATE_INT32() safe to use with enums?

I think that is compiler dependent, so no.

Dave

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK