flash/nor: improved API of flash_driver.info & fixed buffer overruns

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

diff --git a/src/flash/nor/mrvlqspi.c b/src/flash/nor/mrvlqspi.c
index 57461be183db38a5aed2b4ca0576bb6625d3cd8b..44de98907fde1b59f66b79ccbb030a3ba67cd9d7 100644 (file)
--- a/src/flash/nor/mrvlqspi.c
+++ b/src/flash/nor/mrvlqspi.c
@@ -37,7 +37,7 @@
 #define QSPI_W_EN (0x1)
 #define QSPI_SS_DISABLE (0x0)
 #define QSPI_SS_ENABLE (0x1)
-#define WRITE_DISBALE (0x0)
+#define WRITE_DISABLE (0x0)
 #define WRITE_ENABLE (0x1)
 
 #define QSPI_TIMEOUT (1000)
@@ -73,7 +73,7 @@
 #define DINCNT 0x20
 
 struct mrvlqspi_flash_bank {
-       int probed;
+       bool probed;
        uint32_t reg_base;
        uint32_t bank_num;
        const struct flash_device *dev;
@@ -328,7 +328,7 @@ static int mrvlqspi_flash_busy_status(struct flash_bank *bank, int timeout)
        uint8_t val;
        int retval;
 
-       /* Flush read/write fifo's */
+       /* Flush read/write fifos */
        retval = mrvlqspi_fifo_flush(bank, FIFO_FLUSH_TIMEOUT);
        if (retval != ERROR_OK)
                return retval;
@@ -379,7 +379,7 @@ static int mrvlqspi_set_write_status(struct flash_bank *bank, bool mode)
        int retval;
        uint32_t instr;
 
-       /* Flush read/write fifo's */
+       /* Flush read/write fifos */
        retval = mrvlqspi_fifo_flush(bank, FIFO_FLUSH_TIMEOUT);
        if (retval != ERROR_OK)
                return retval;
@@ -417,7 +417,7 @@ static int mrvlqspi_read_id(struct flash_bank *bank, uint32_t *id)
 
        LOG_DEBUG("Getting ID");
 
-       /* Flush read/write fifo's */
+       /* Flush read/write fifos */
        retval = mrvlqspi_fifo_flush(bank, FIFO_FLUSH_TIMEOUT);
        if (retval != ERROR_OK)
                return retval;
@@ -761,7 +761,7 @@ static int mrvlqspi_flash_write(struct flash_bank *bank, const uint8_t *buffer,
        return retval;
 }
 
-int mrvlqspi_flash_read(struct flash_bank *bank, uint8_t *buffer,
+static int mrvlqspi_flash_read(struct flash_bank *bank, uint8_t *buffer,
                                uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -779,7 +779,7 @@ int mrvlqspi_flash_read(struct flash_bank *bank, uint8_t *buffer,
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
 
-       /* Flush read/write fifo's */
+       /* Flush read/write fifos */
        retval = mrvlqspi_fifo_flush(bank, FIFO_FLUSH_TIMEOUT);
        if (retval != ERROR_OK)
                return retval;
@@ -844,7 +844,7 @@ static int mrvlqspi_probe(struct flash_bank *bank)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       mrvlqspi_info->probed = 0;
+       mrvlqspi_info->probed = false;
        mrvlqspi_info->bank_num = bank->bank_number;
 
        /* Read flash JEDEC ID */
@@ -895,7 +895,7 @@ static int mrvlqspi_probe(struct flash_bank *bank)
        }
 
        bank->sectors = sectors;
-       mrvlqspi_info->probed = 1;
+       mrvlqspi_info->probed = true;
 
        return ERROR_OK;
 }
@@ -914,17 +914,16 @@ static int mrvlqspi_flash_erase_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-int mrvlqspi_get_info(struct flash_bank *bank, char *buf, int buf_size)
+static int mrvlqspi_get_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct mrvlqspi_flash_bank *mrvlqspi_info = bank->driver_priv;
 
        if (!(mrvlqspi_info->probed)) {
-               snprintf(buf, buf_size,
-                       "\nQSPI flash bank not probed yet\n");
+               command_print_sameline(cmd, "\nQSPI flash bank not probed yet\n");
                return ERROR_OK;
        }
 
-       snprintf(buf, buf_size, "\nQSPI flash information:\n"
+       command_print_sameline(cmd, "\nQSPI flash information:\n"
                "  Device \'%s\' ID 0x%08" PRIx32 "\n",
                mrvlqspi_info->dev->name, mrvlqspi_info->dev->device_id);
 
@@ -947,7 +946,7 @@ FLASH_BANK_COMMAND_HANDLER(mrvlqspi_flash_bank_command)
        /* Get QSPI controller register map base address */
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[6], mrvlqspi_info->reg_base);
        bank->driver_priv = mrvlqspi_info;
-       mrvlqspi_info->probed = 0;
+       mrvlqspi_info->probed = false;
 
        return ERROR_OK;
 }