flash/nor/fm3: Use 'bool' data type

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

diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c
index d4bd5b9c120cf8ccb9ca0f1ef27daee49541f4a0..afeba8e0bdb95d6470ba5e78dac1172ca4187618 100644 (file)
--- a/src/flash/nor/fm3.c
+++ b/src/flash/nor/fm3.c
@@ -17,9 +17,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -63,7 +61,7 @@ enum fm3_flash_type {
 struct fm3_flash_bank {
        enum fm3_variant variant;
        enum fm3_flash_type flashtype;
-       int probed;
+       bool probed;
 };
 
 FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command)
@@ -134,7 +132,7 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       fm3_info->probed = 0;
+       fm3_info->probed = false;
 
        return ERROR_OK;
 }
@@ -203,13 +201,14 @@ static int fm3_busy_wait(struct target *target, uint32_t offset, int timeout_ms)
        return retval;
 }
 
-static int fm3_erase(struct flash_bank *bank, int first, int last)
+static int fm3_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct fm3_flash_bank *fm3_info = bank->driver_priv;
        struct target *target = bank->target;
        int retval = ERROR_OK;
        uint32_t u32DummyRead;
-       int sector, odd;
+       int odd;
        uint32_t u32FlashType;
        uint32_t u32FlashSeqAddress1;
        uint32_t u32FlashSeqAddress2;
@@ -240,7 +239,7 @@ static int fm3_erase(struct flash_bank *bank, int first, int last)
        /* R0 keeps Flash Sequence address 1     (u32FlashSeq1)    */
        /* R1 keeps Flash Sequence address 2     (u32FlashSeq2)    */
        /* R2 keeps Flash Offset address         (ofs)                     */
-       const uint8_t fm3_flash_erase_sector_code[] = {
+       static const uint8_t fm3_flash_erase_sector_code[] = {
                                                /*    *(uint16_t*)u32FlashSeq1 = 0xAA; */
                0xAA, 0x24,             /*        MOVS  R4, #0xAA              */
                0x04, 0x80,             /*        STRH  R4, [R0, #0]           */
@@ -262,7 +261,7 @@ static int fm3_erase(struct flash_bank *bank, int first, int last)
                0x00, 0xBE,             /*        BKPT  #0                     */
        };
 
-       LOG_INFO("Fujitsu MB9[A/B]FXXX: Sector Erase ... (%d to %d)", first, last);
+       LOG_INFO("Fujitsu MB9[A/B]FXXX: Sector Erase ... (%u to %u)", first, last);
 
        /* disable HW watchdog */
        retval = target_write_u32(target, 0x40011C00, 0x1ACCE551);
@@ -306,7 +305,7 @@ static int fm3_erase(struct flash_bank *bank, int first, int last)
        init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT); /* offset                          */
 
        /* write code buffer and use Flash sector erase code within fm3                         */
-       for (sector = first ; sector <= last ; sector++) {
+       for (unsigned int sector = first ; sector <= last ; sector++) {
                uint32_t offset = bank->sectors[sector].offset;
 
                for (odd = 0; odd < 2 ; odd++) {
@@ -658,7 +657,7 @@ static int fm3_probe(struct flash_bank *bank)
  */
 
        num_pages = 10;                         /* max number of Flash pages for malloc */
-       fm3_info->probed = 0;
+       fm3_info->probed = false;
 
        bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
        bank->base = 0x00000000;
@@ -798,7 +797,7 @@ static int fm3_probe(struct flash_bank *bank)
                bank->sectors[9].is_protected = -1;
        }
 
-       fm3_info->probed = 1;
+       fm3_info->probed = true;
 
        return ERROR_OK;
 }
@@ -849,7 +848,7 @@ static int fm3_chip_erase(struct flash_bank *bank)
        /* RAMCODE used for fm3 Flash chip erase:                                  */
        /* R0 keeps Flash Sequence address 1     (u32FlashSeq1)    */
        /* R1 keeps Flash Sequence address 2     (u32FlashSeq2)    */
-       const uint8_t fm3_flash_erase_chip_code[] = {
+       static const uint8_t fm3_flash_erase_chip_code[] = {
                                                /*    *(uint16_t*)u32FlashSeq1 = 0xAA; */
                0xAA, 0x22,             /*        MOVS  R2, #0xAA              */
                0x02, 0x80,             /*        STRH  R2, [R0, #0]           */
@@ -945,8 +944,6 @@ static int fm3_chip_erase(struct flash_bank *bank)
 
 COMMAND_HANDLER(fm3_handle_chip_erase_command)
 {
-       int i;
-
        if (CMD_ARGC < 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
@@ -957,12 +954,12 @@ COMMAND_HANDLER(fm3_handle_chip_erase_command)
 
        if (fm3_chip_erase(bank) == ERROR_OK) {
                /* set all sectors as erased */
-               for (i = 0; i < bank->num_sectors; i++)
+               for (unsigned int i = 0; i < bank->num_sectors; i++)
                        bank->sectors[i].is_erased = 1;
 
-               command_print(CMD_CTX, "fm3 chip erase complete");
+               command_print(CMD, "fm3 chip erase complete");
        } else {
-               command_print(CMD_CTX, "fm3 chip erase failed");
+               command_print(CMD, "fm3 chip erase failed");
        }
 
        return ERROR_OK;
@@ -990,7 +987,7 @@ static const struct command_registration fm3_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver fm3_flash = {
+const struct flash_driver fm3_flash = {
        .name = "fm3",
        .commands = fm3_command_handlers,
        .flash_bank_command = fm3_flash_bank_command,
@@ -999,4 +996,5 @@ struct flash_driver fm3_flash = {
        .probe = fm3_probe,
        .auto_probe = fm3_auto_probe,
        .erase_check = default_flash_blank_check,
+       .free_driver_priv = default_flash_free_driver_priv,
 };