[ot] hw/opentitan: ot_spi_device: move address size to own function

Also renames `ADDR_MODE_ADDR*` variants to `ADDR_MODE_*`

Signed-off-by: Alice Ziuziakowska <[email protected]>

Author: ziuziakowska

hw/opentitan/ot_spi_device.c

@@ -362,10 +362,10 @@ typedef enum {
 } OtSpiDeviceMode;
 
 typedef enum {
-    ADDR_MODE_ADDRDISABLED,
-    ADDR_MODE_ADDRCFG,
-    ADDR_MODE_ADDR3B,
-    ADDR_MODE_ADDR4B,
+    ADDR_MODE_DISABLED,
+    ADDR_MODE_CFG,
+    ADDR_MODE_3B,
+    ADDR_MODE_4B,
 } OtSpiDeviceAddrMode;
 
 typedef enum {
@@ -769,6 +769,24 @@ static bool ot_spi_device_is_mailbox_en(const OtSPIDeviceState *s)
     return (bool)(s->spi_regs[R_CFG] & R_CFG_MAILBOX_EN_MASK);
 }
 
+static unsigned int ot_spi_device_get_address_size(const OtSPIDeviceState *s,
+                                                   OtSpiDeviceAddrMode mode)
+{
+    switch (mode) {
+    case ADDR_MODE_CFG:
+        return ot_spi_device_is_addr4b_en(s) ? 4u : 3u;
+    case ADDR_MODE_4B:
+        return 4u;
+    case ADDR_MODE_3B:
+        return 3u;
+    case ADDR_MODE_DISABLED:
+        return 0;
+    default:
+        g_assert_not_reached();
+        break;
+    }
+}
+
 static bool
 ot_spi_device_is_mailbox_match(const OtSPIDeviceState *s, uint32_t addr)
 {
@@ -1243,25 +1261,9 @@ static void ot_spi_device_flash_decode_sw_command(OtSPIDeviceState *s)
 {
     SpiDeviceFlash *f = &s->flash;
 
-    unsigned addr_count;
-    uint32_t addr_mode = SHARED_FIELD_EX32(f->cmd_info, CMD_INFO_ADDR_MODE);
-    switch ((int)addr_mode) {
-    case ADDR_MODE_ADDRDISABLED:
-        addr_count = 0;
-        break;
-    case ADDR_MODE_ADDRCFG:
-        addr_count = ot_spi_device_is_addr4b_en(s) ? 4u : 3u;
-        break;
-    case ADDR_MODE_ADDR3B:
-        addr_count = 3u;
-        break;
-    case ADDR_MODE_ADDR4B:
-        addr_count = 4u;
-        break;
-    default:
-        g_assert_not_reached();
-        break;
-    }
+    unsigned int addr_count = ot_spi_device_get_address_size(
+        s, (OtSpiDeviceAddrMode)SHARED_FIELD_EX32(f->cmd_info,
+                                                  CMD_INFO_ADDR_MODE));
 
     f->pos = 0;
     if (addr_count != 0) {