jtagspi: fix build on MacOS

[openocd.git] / src / flash / nor / sfdp.c

diff --git a/src/flash/nor/sfdp.c b/src/flash/nor/sfdp.c
index 02b4cedecf6b4b31225d467b7012cc41c5b730e9..88d3b96f43316b328078872b3c4c8d51f1986e45 100644 (file)
--- a/src/flash/nor/sfdp.c
+++ b/src/flash/nor/sfdp.c
@@ -81,7 +81,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
 
        /* retrieve SFDP header */
        memset(&header, 0, sizeof(header));
-       retval = read_sfdp_block(bank, 0x0, sizeof(header) >> 2, (uint32_t *) &header);
+       retval = read_sfdp_block(bank, 0x0, sizeof(header) >> 2, (uint32_t *)&header);
        if (retval != ERROR_OK)
                return retval;
        LOG_DEBUG("header 0x%08" PRIx32 " 0x%08" PRIx32, header.signature, header.revision);
@@ -90,8 +90,8 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
        if (((header.revision >> 24) & 0xFF) != SFDP_ACCESS_PROT) {
-               LOG_ERROR("access protocol 0x%02" PRIx8 " not implemented",
-                       (header.revision >> 24) & 0xFF);
+               LOG_ERROR("access protocol 0x%02x not implemented",
+                       (header.revision >> 24) & 0xFFU);
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
 
@@ -99,13 +99,13 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
        nph = ((header.revision >> 16) & 0xFF) + 1;
        LOG_DEBUG("parameter headers: %d", nph);
        pheaders = malloc(sizeof(struct sfdp_phdr) * nph);
-       if (pheaders == NULL) {
+       if (!pheaders) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
        memset(pheaders, 0, sizeof(struct sfdp_phdr) * nph);
        retval = read_sfdp_block(bank, sizeof(header),
-               (sizeof(struct sfdp_phdr) >> 2) * nph, (uint32_t *) pheaders);
+               (sizeof(struct sfdp_phdr) >> 2) * nph, (uint32_t *)pheaders);
        if (retval != ERROR_OK)
                goto err;
 
@@ -119,7 +119,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
 
                /* retrieve parameter table */
                ptable = malloc(words << 2);
-               if (ptable == NULL) {
+               if (!ptable) {
                        LOG_ERROR("not enough memory");
                        retval = ERROR_FAIL;
                        goto err;
@@ -132,7 +132,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
                        LOG_DEBUG("word %02d 0x%08X", j + 1, ptable[j]);
 
                if (id == SFDP_BASIC_FLASH) {
-                       struct sfdp_basic_flash_param *table = (struct sfdp_basic_flash_param *) ptable;
+                       struct sfdp_basic_flash_param *table = (struct sfdp_basic_flash_param *)ptable;
                        uint16_t erase;
 
                        if (words < 9) {
@@ -215,7 +215,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
                                        LOG_INFO("device has to be switched to 4-byte addresses");
                        }
                } else if (id == SFDP_4BYTE_ADDR) {
-                       struct sfdp_4byte_addr_param *table = (struct sfdp_4byte_addr_param *) ptable;
+                       struct sfdp_4byte_addr_param *table = (struct sfdp_4byte_addr_param *)ptable;
 
                        if (words >= (offsetof(struct sfdp_4byte_addr_param, erase_t1234)
                                + sizeof(table->erase_t1234)) >> 2) {