[PATCH]: ea552eb1f2 flash/nor/sfdp, stmqspi: use native type for buffer size

[gerrit]

This is an automated email from Gerrit.

"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which 
you can find at https://review.openocd.org/c/openocd/+/8439

-- gerrit

commit ea552eb1f27b1d775f1f297d8cd75f6f5616936a
Author: Tomas Vanek <van...@fbl.cz>
Date:   Wed Aug 14 09:17:36 2024 +0200

    flash/nor/sfdp, stmqspi: use native type for buffer size
    
    Two different sizes uint8_t and uint32_t was used for this value
    without a good reason.
    
    Signed-off-by: Tomas Vanek <van...@fbl.cz>
    Change-Id: I4bb60cc5397ffd0d37e7034e3930e62793140c8d

diff --git a/src/flash/nor/sfdp.c b/src/flash/nor/sfdp.c
index b411a3b639..917f1626fb 100644
--- a/src/flash/nor/sfdp.c
+++ b/src/flash/nor/sfdp.c
@@ -99,7 +99,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device 
*dev,
                goto err;
 
        for (k = 0; k < nph; k++) {
-               uint8_t words = (pheaders[k].revision >> 24) & 0xFF;
+               unsigned int words = (pheaders[k].revision >> 24) & 0xFF;
                uint16_t id = (((pheaders[k].ptr) >> 16) & 0xFF00) | 
(pheaders[k].revision & 0xFF);
                uint32_t ptr = pheaders[k].ptr & 0xFFFFFF;
 
diff --git a/src/flash/nor/sfdp.h b/src/flash/nor/sfdp.h
index 7a7af9931f..0d43519f65 100644
--- a/src/flash/nor/sfdp.h
+++ b/src/flash/nor/sfdp.h
@@ -18,7 +18,7 @@
  *
  * buffer contents is supposed to be returned in ***host*** endianness */
 typedef int (*read_sfdp_block_t)(struct flash_bank *bank, uint32_t addr,
-       uint32_t words, uint32_t *buffer);
+       unsigned int words, uint32_t *buffer);
 
 extern int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
        read_sfdp_block_t read_sfdp_block);
diff --git a/src/flash/nor/stmqspi.c b/src/flash/nor/stmqspi.c
index a1e1d34116..df58f6c55d 100644
--- a/src/flash/nor/stmqspi.c
+++ b/src/flash/nor/stmqspi.c
@@ -1807,7 +1807,7 @@ err:
 
 /* Read SFDP parameter block */
 static int read_sfdp_block(struct flash_bank *bank, uint32_t addr,
-       uint32_t words, uint32_t *buffer)
+       unsigned int words, uint32_t *buffer)
 {
        struct target *target = bank->target;
        struct stmqspi_flash_bank *stmqspi_info = bank->driver_priv;
@@ -1848,7 +1848,7 @@ static int read_sfdp_block(struct flash_bank *bank, 
uint32_t addr,
                }
        }
 
-       LOG_DEBUG("%s: addr=0x%08" PRIx32 " words=0x%08" PRIx32 " dummy=%u",
+       LOG_DEBUG("%s: addr=0x%08" PRIx32 " words=0x%08x dummy=%u",
                __func__, addr, words, *dummy);
 
        /* Abort any previous operation */

--