David Brownell <david-b@pacbell.net>:

[openocd.git] / src / flash / str9xpec.c

diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index c5e50bd8bbfdc03d68d904625483b317730c6aa2..bca3b88fc6ff769b1dc0c3a1131716094c7678fb 100644 (file)
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -24,27 +24,15 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "str9xpec.h"
-#include "flash.h"
-#include "target.h"
-#include "log.h"
-#include "armv4_5.h"
 #include "arm7_9_common.h"
-#include "jtag.h"
-#include "binarybuffer.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
 
 static int str9xpec_register_commands(struct command_context_s *cmd_ctx);
 static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int str9xpec_erase(struct flash_bank_s *bank, int first, int last);
 static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 static int str9xpec_probe(struct flash_bank_s *bank);
 static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int str9xpec_protect_check(struct flash_bank_s *bank);
@@ -52,7 +40,7 @@ static int str9xpec_erase_check(struct flash_bank_s *bank);
 static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
 static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last);
-static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector);
+static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector);
 static int str9xpec_write_options(struct flash_bank_s *bank);
 
 static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -111,9 +99,9 @@ static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
+int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
 {
-       if( tap == NULL ){
+       if (tap == NULL) {
                return ERROR_TARGET_INVALID;
        }
 
@@ -125,12 +113,7 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
                field.num_bits = tap->ir_length;
                field.out_value = calloc(CEIL(field.num_bits, 8), 1);
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               
                field.in_value = NULL;
-               
-               
-               field.in_handler = NULL;
-               
 
                jtag_add_ir_scan(1, &field, end_state);
 
@@ -140,10 +123,10 @@ int str9xpec_set_instr(jtag_tap_t *tap, u32 new_instr, tap_state_t end_state)
        return ERROR_OK;
 }
 
-static u8 str9xpec_isc_status(jtag_tap_t *tap)
+static uint8_t str9xpec_isc_status(jtag_tap_t *tap)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
 
        if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK)
                return ISC_STATUS_ERROR;
@@ -151,14 +134,10 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap)
        field.tap = tap;
        field.num_bits = 8;
        field.out_value = NULL;
-       
        field.in_value = &status;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        LOG_DEBUG("status: 0x%2.2x", status);
@@ -171,7 +150,7 @@ static u8 str9xpec_isc_status(jtag_tap_t *tap)
 
 static int str9xpec_isc_enable(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -198,7 +177,7 @@ static int str9xpec_isc_enable(struct flash_bank_s *bank)
 
 static int str9xpec_isc_disable(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
@@ -228,7 +207,7 @@ static int str9xpec_isc_disable(struct flash_bank_s *bank)
 static int str9xpec_read_config(struct flash_bank_s *bank)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -243,14 +222,10 @@ static int str9xpec_read_config(struct flash_bank_s *bank)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = NULL;
-       
        field.in_value = str9xpec_info->options;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        status = str9xpec_isc_status(tap);
@@ -265,7 +240,7 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
        int i;
        int num_sectors;
        int b0_sectors = 0, b1_sectors = 0;
-       u32 offset = 0;
+       uint32_t offset = 0;
        int b1_size = 0x2000;
 
        switch (bank->size)
@@ -298,7 +273,7 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
 
        bank->num_sectors = num_sectors;
        bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
-       str9xpec_info->sector_bits = malloc(sizeof(u32) * num_sectors);
+       str9xpec_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
        num_sectors = 0;
 
@@ -343,14 +318,14 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
        str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
        bank->driver_priv = str9xpec_info;
 
-       /* find out jtag position of flash controller
-        * it is always after the arm966 core */
-
+       /* REVISIT verify that the jtag position of flash controller is
+        * right after *THIS* core, which must be a STR9xx core ...
+        */
        armv4_5 = bank->target->arch_info;
        arm7_9 = armv4_5->arch_info;
        jtag_info = &arm7_9->jtag_info;
 
-       str9xpec_info->tap = jtag_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1);
+       str9xpec_info->tap = bank->target->tap;
        str9xpec_info->isc_enable = 0;
 
        str9xpec_build_block_list(bank);
@@ -364,17 +339,17 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
 static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        int i;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -395,26 +370,16 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = buffer;
-       
        field.in_value = NULL;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_add_sleep(40000);
 
        /* read blank check result */
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = NULL;
-       
        field.in_value = buffer;
-       
-       
-       field.in_handler = NULL;
-       
 
        jtag_add_dr_scan(1, &field, TAP_IRPAUSE);
        jtag_execute_queue();
@@ -440,7 +405,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 
 static int str9xpec_protect_check(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
        int i;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -463,17 +428,17 @@ static int str9xpec_protect_check(struct flash_bank_s *bank)
 static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        int i;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
 
        tap = str9xpec_info->tap;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -511,14 +476,9 @@ static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = buffer;
-       
        field.in_value = NULL;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        jtag_add_sleep(10);
@@ -550,7 +510,7 @@ static int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
 static int str9xpec_lock_device(struct flash_bank_s *bank)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
@@ -558,7 +518,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank)
        tap = str9xpec_info->tap;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -577,17 +537,12 @@ static int str9xpec_lock_device(struct flash_bank_s *bank)
                field.tap = tap;
                field.num_bits = 8;
                field.out_value = NULL;
-               
                field.in_value = &status;
-               
-               
-               field.in_handler = NULL;
-               
 
-               jtag_add_dr_scan(1, &field, -1);
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                jtag_execute_queue();
 
-       } while(!(status & ISC_STATUS_BUSY));
+       } while (!(status & ISC_STATUS_BUSY));
 
        str9xpec_isc_disable(bank);
 
@@ -596,7 +551,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank)
 
 static int str9xpec_unlock_device(struct flash_bank_s *bank)
 {
-       u8 status;
+       uint8_t status;
 
        status = str9xpec_erase_area(bank, 0, 255);
 
@@ -605,7 +560,7 @@ static int str9xpec_unlock_device(struct flash_bank_s *bank)
 
 static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       u8 status;
+       uint8_t status;
        int i;
 
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
@@ -620,7 +575,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
        /* last bank: 0xFF signals a full device protect */
        if (last == 0xFF)
        {
-               if( set )
+               if (set)
                {
                        status = str9xpec_lock_device(bank);
                }
@@ -634,7 +589,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
        {
                for (i = first; i <= last; i++)
                {
-                       if( set )
+                       if (set)
                                buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 1);
                        else
                                buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 0);
@@ -649,7 +604,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
        return ERROR_OK;
 }
 
-static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
+static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector)
 {
        jtag_tap_t *tap;
        scan_field_t field;
@@ -663,29 +618,24 @@ static int str9xpec_set_address(struct flash_bank_s *bank, u8 sector)
        field.tap = tap;
        field.num_bits = 8;
        field.out_value = &sector;
-       
        field.in_value = NULL;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, -1);
+       jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        return ERROR_OK;
 }
 
-static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
-       u32 dwords_remaining = (count / 8);
-       u32 bytes_remaining = (count & 0x00000007);
-       u32 bytes_written = 0;
-       u8 status;
-       u32 check_address = offset;
+       uint32_t dwords_remaining = (count / 8);
+       uint32_t bytes_remaining = (count & 0x00000007);
+       uint32_t bytes_written = 0;
+       uint8_t status;
+       uint32_t check_address = offset;
        jtag_tap_t *tap;
        scan_field_t field;
-       u8 *scanbuf;
+       uint8_t *scanbuf;
        int i;
        int first_sector = 0;
        int last_sector = 0;
@@ -702,14 +652,14 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
        if (offset & 0x7)
        {
-               LOG_WARNING("offset 0x%x breaks required 8-byte alignment", offset);
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required 8-byte alignment", offset);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
 
        for (i = 0; i < bank->num_sectors; i++)
        {
-               u32 sec_start = bank->sectors[i].offset;
-               u32 sec_end = sec_start + bank->sectors[i].size;
+               uint32_t sec_start = bank->sectors[i].offset;
+               uint32_t sec_end = sec_start + bank->sectors[i].size;
 
                /* check if destination falls within the current sector */
                if ((check_address >= sec_start) && (check_address < sec_end))
@@ -721,11 +671,11 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                                check_address = sec_end;
                }
 
-               if ((offset >= sec_start) && (offset < sec_end)){
+               if ((offset >= sec_start) && (offset < sec_end)) {
                        first_sector = i;
                }
 
-               if ((offset + count >= sec_start) && (offset + count < sec_end)){
+               if ((offset + count >= sec_start) && (offset + count < sec_end)) {
                        last_sector = i;
                }
        }
@@ -752,14 +702,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                        field.tap = tap;
                        field.num_bits = 64;
                        field.out_value = (buffer + bytes_written);
-                       
                        field.in_value = NULL;
-                       
-                       
-                       field.in_handler = NULL;
-                       
 
-                       jtag_add_dr_scan(1, &field, TAP_IDLE);
+                       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
                        /* small delay before polling */
                        jtag_add_sleep(50);
@@ -770,19 +715,14 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                                field.tap = tap;
                                field.num_bits = 8;
                                field.out_value = NULL;
-                               
                                field.in_value = scanbuf;
-                               
-                               
-                               field.in_handler = NULL;
-                               
 
-                               jtag_add_dr_scan(1, &field, -1);
+                               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                                jtag_execute_queue();
 
                                status = buf_get_u32(scanbuf, 0, 8);
 
-                       } while(!(status & ISC_STATUS_BUSY));
+                       } while (!(status & ISC_STATUS_BUSY));
 
                        if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
                                return ERROR_FLASH_OPERATION_FAILED;
@@ -797,10 +737,10 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
        if (bytes_remaining)
        {
-               u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+               uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
                int i = 0;
 
-               while(bytes_remaining > 0)
+               while (bytes_remaining > 0)
                {
                        last_dword[i++] = *(buffer + bytes_written);
                        bytes_remaining--;
@@ -812,14 +752,9 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                field.tap = tap;
                field.num_bits = 64;
                field.out_value = last_dword;
-               
                field.in_value = NULL;
-               
-               
-               field.in_handler = NULL;
-               
 
-               jtag_add_dr_scan(1, &field, TAP_IDLE);
+               jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
                /* small delay before polling */
                jtag_add_sleep(50);
@@ -830,19 +765,14 @@ static int str9xpec_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                        field.tap = tap;
                        field.num_bits = 8;
                        field.out_value = NULL;
-                       
                        field.in_value = scanbuf;
-                       
-                       
-                       field.in_handler = NULL;
-                       
 
-                       jtag_add_dr_scan(1, &field, -1);
+                       jtag_add_dr_scan(1, &field, jtag_get_end_state());
                        jtag_execute_queue();
 
                        status = buf_get_u32(scanbuf, 0, 8);
 
-               } while(!(status & ISC_STATUS_BUSY));
+               } while (!(status & ISC_STATUS_BUSY));
 
                if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
                        return ERROR_FLASH_OPERATION_FAILED;
@@ -867,9 +797,9 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
 {
        flash_bank_t *bank;
        scan_field_t field;
-       u8 *buffer = NULL;
+       uint8_t *buffer = NULL;
        jtag_tap_t *tap;
-       u32 idcode;
+       uint32_t idcode;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -894,19 +824,14 @@ static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, ch
        field.tap = tap;
        field.num_bits = 32;
        field.out_value = NULL;
-       
        field.in_value = buffer;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
        jtag_execute_queue();
 
        idcode = buf_get_u32(buffer, 0, 32);
 
-       command_print(cmd_ctx, "str9xpec part id: 0x%8.8x", idcode);
+       command_print(cmd_ctx, "str9xpec part id: 0x%8.8" PRIx32 "", idcode);
 
        free(buffer);
 
@@ -920,14 +845,14 @@ static int str9xpec_erase_check(struct flash_bank_s *bank)
 
 static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
-       snprintf(buf, buf_size, "str9xpec flash driver info" );
+       snprintf(buf, buf_size, "str9xpec flash driver info");
        return ERROR_OK;
 }
 
 static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
-       u8 status;
+       uint8_t status;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
        if (argc < 1)
@@ -986,7 +911,7 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s *
 static int str9xpec_write_options(struct flash_bank_s *bank)
 {
        scan_field_t field;
-       u8 status;
+       uint8_t status;
        jtag_tap_t *tap;
        str9xpec_flash_controller_t *str9xpec_info = NULL;
 
@@ -994,13 +919,13 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
        tap = str9xpec_info->tap;
 
        /* erase config options first */
-       status = str9xpec_erase_area( bank, 0xFE, 0xFE );
+       status = str9xpec_erase_area(bank, 0xFE, 0xFE);
 
        if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
                return status;
 
        if (!str9xpec_info->isc_enable) {
-               str9xpec_isc_enable( bank );
+               str9xpec_isc_enable(bank);
        }
 
        if (!str9xpec_info->isc_enable) {
@@ -1019,14 +944,9 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
        field.tap = tap;
        field.num_bits = 64;
        field.out_value = str9xpec_info->options;
-       
        field.in_value = NULL;
-       
-       
-       field.in_handler = NULL;
-       
 
-       jtag_add_dr_scan(1, &field, TAP_IDLE);
+       jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_IDLE));
 
        /* small delay before polling */
        jtag_add_sleep(50);
@@ -1037,17 +957,12 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
                field.tap = tap;
                field.num_bits = 8;
                field.out_value = NULL;
-               
                field.in_value = &status;
-               
-               
-               field.in_handler = NULL;
-               
 
-               jtag_add_dr_scan(1, &field, -1);
+               jtag_add_dr_scan(1, &field, jtag_get_end_state());
                jtag_execute_queue();
 
-       } while(!(status & ISC_STATUS_BUSY));
+       } while (!(status & ISC_STATUS_BUSY));
 
        str9xpec_isc_disable(bank);
 
@@ -1057,7 +972,7 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
 static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        flash_bank_t *bank;
-       u8 status;
+       uint8_t status;
 
        if (argc < 1)
        {
@@ -1087,7 +1002,7 @@ static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_cmap <bank> <bank0|bank1>");
+               command_print(cmd_ctx, "str9xpec options_cmap <bank> <bank0 | bank1>");
                return ERROR_OK;
        }
 
@@ -1119,7 +1034,7 @@ static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_lvdthd <bank> <2.4v|2.7v>");
+               command_print(cmd_ctx, "str9xpec options_lvdthd <bank> <2.4v | 2.7v>");
                return ERROR_OK;
        }
 
@@ -1151,7 +1066,7 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_lvdsel <bank> <vdd|vdd_vddq>");
+               command_print(cmd_ctx, "str9xpec options_lvdsel <bank> <vdd | vdd_vddq>");
                return ERROR_OK;
        }
 
@@ -1183,7 +1098,7 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_
 
        if (argc < 2)
        {
-               command_print(cmd_ctx, "str9xpec options_lvdwarn <bank> <vdd|vdd_vddq>");
+               command_print(cmd_ctx, "str9xpec options_lvdwarn <bank> <vdd | vdd_vddq>");
                return ERROR_OK;
        }
 
@@ -1210,7 +1125,7 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_
 
 static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       u8 status;
+       uint8_t status;
        flash_bank_t *bank;
 
        if (argc < 1)
@@ -1236,7 +1151,7 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx,
 
 static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       u8 status;
+       uint8_t status;
        flash_bank_t *bank;
 
        if (argc < 1)