aboutsummaryrefslogtreecommitdiff
path: root/src/flash/nor/xcf.c
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2021-04-29 00:31:29 +0200
committerAntonio Borneo <borneo.antonio@gmail.com>2021-07-20 14:54:04 +0100
commit45d5ec2adeefe369d6a9999fcbcad546bf167241 (patch)
treeb12c28f2c0d78312f4b097958a3e60ebb9b2ebc8 /src/flash/nor/xcf.c
parente4c0f45a5f01b202b916deb950485c67c4a6fb10 (diff)
downloadriscv-openocd-45d5ec2adeefe369d6a9999fcbcad546bf167241.zip
riscv-openocd-45d5ec2adeefe369d6a9999fcbcad546bf167241.tar.gz
riscv-openocd-45d5ec2adeefe369d6a9999fcbcad546bf167241.tar.bz2
flash: use lowercase for C variables
Change-Id: I1c3cb5d1c8c0d73adb3c7320a1b8e3940183cd17 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: http://openocd.zylin.com/6347 Tested-by: jenkins Reviewed-by: Marc Schink <dev@zapb.de> Reviewed-by: Xiang W <wxjstz@126.com>
Diffstat (limited to 'src/flash/nor/xcf.c')
-rw-r--r--src/flash/nor/xcf.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/src/flash/nor/xcf.c b/src/flash/nor/xcf.c
index 33f79f5..1220a1e 100644
--- a/src/flash/nor/xcf.c
+++ b/src/flash/nor/xcf.c
@@ -68,25 +68,25 @@ struct xcf_status {
* GLOBAL VARIABLES
******************************************************************************
*/
-static const uint8_t CMD_BYPASS[2] = {0xFF, 0xFF};
-
-static const uint8_t CMD_ISC_ADDRESS_SHIFT[2] = {0xEB, 0x00};
-static const uint8_t CMD_ISC_DATA_SHIFT[2] = {0xED, 0x00};
-static const uint8_t CMD_ISC_DISABLE[2] = {0xF0, 0x00};
-static const uint8_t CMD_ISC_ENABLE[2] = {0xE8, 0x00};
-static const uint8_t CMD_ISC_ERASE[2] = {0xEC, 0x00};
-static const uint8_t CMD_ISC_PROGRAM[2] = {0xEA, 0x00};
-
-static const uint8_t CMD_XSC_BLANK_CHECK[2] = {0x0D, 0x00};
-static const uint8_t CMD_XSC_CONFIG[2] = {0xEE, 0x00};
-static const uint8_t CMD_XSC_DATA_BTC[2] = {0xF2, 0x00};
-static const uint8_t CMD_XSC_DATA_CCB[2] = {0x0C, 0x00};
-static const uint8_t CMD_XSC_DATA_DONE[2] = {0x09, 0x00};
-static const uint8_t CMD_XSC_DATA_SUCR[2] = {0x0E, 0x00};
-static const uint8_t CMD_XSC_DATA_WRPT[2] = {0xF7, 0x00};
-static const uint8_t CMD_XSC_OP_STATUS[2] = {0xE3, 0x00};
-static const uint8_t CMD_XSC_READ[2] = {0xEF, 0x00};
-static const uint8_t CMD_XSC_UNLOCK[2] = {0x55, 0xAA};
+static const uint8_t cmd_bypass[2] = {0xFF, 0xFF};
+
+static const uint8_t cmd_isc_address_shift[2] = {0xEB, 0x00};
+static const uint8_t cmd_isc_data_shift[2] = {0xED, 0x00};
+static const uint8_t cmd_isc_disable[2] = {0xF0, 0x00};
+static const uint8_t cmd_isc_enable[2] = {0xE8, 0x00};
+static const uint8_t cmd_isc_erase[2] = {0xEC, 0x00};
+static const uint8_t cmd_isc_program[2] = {0xEA, 0x00};
+
+static const uint8_t cmd_xsc_blank_check[2] = {0x0D, 0x00};
+static const uint8_t cmd_xsc_config[2] = {0xEE, 0x00};
+static const uint8_t cmd_xsc_data_btc[2] = {0xF2, 0x00};
+static const uint8_t cmd_xsc_data_ccb[2] = {0x0C, 0x00};
+static const uint8_t cmd_xsc_data_done[2] = {0x09, 0x00};
+static const uint8_t cmd_xsc_data_sucr[2] = {0x0E, 0x00};
+static const uint8_t cmd_xsc_data_wrpt[2] = {0xF7, 0x00};
+static const uint8_t cmd_xsc_op_status[2] = {0xE3, 0x00};
+static const uint8_t cmd_xsc_read[2] = {0xEF, 0x00};
+static const uint8_t cmd_xsc_unlock[2] = {0x55, 0xAA};
/*
******************************************************************************
@@ -135,7 +135,7 @@ static struct xcf_status read_status(struct flash_bank *bank)
scan.check_mask = NULL;
scan.check_value = NULL;
scan.num_bits = 16;
- scan.out_value = CMD_BYPASS;
+ scan.out_value = cmd_bypass;
scan.in_value = irdata;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
@@ -162,7 +162,7 @@ static int isc_enter(struct flash_bank *bank)
scan.check_mask = NULL;
scan.check_value = NULL;
scan.num_bits = 16;
- scan.out_value = CMD_ISC_ENABLE;
+ scan.out_value = cmd_isc_enable;
scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
@@ -191,7 +191,7 @@ static int isc_leave(struct flash_bank *bank)
scan.check_mask = NULL;
scan.check_value = NULL;
scan.num_bits = 16;
- scan.out_value = CMD_ISC_DISABLE;
+ scan.out_value = cmd_isc_disable;
scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
@@ -252,7 +252,7 @@ static int isc_wait_erase_program(struct flash_bank *bank, int64_t timeout_ms)
int64_t dt;
do {
- isc_read_register(bank, CMD_XSC_OP_STATUS, &isc_default, 8);
+ isc_read_register(bank, cmd_xsc_op_status, &isc_default, 8);
if (((isc_default >> 2) & 1) == 1)
return ERROR_OK;
dt = timeval_ms() - t0;
@@ -307,7 +307,7 @@ static int isc_program_register(struct flash_bank *bank, const uint8_t *cmd,
jtag_add_dr_scan(bank->target->tap, 1, &scan, TAP_IRSHIFT);
scan.num_bits = 16;
- scan.out_value = CMD_ISC_PROGRAM;
+ scan.out_value = cmd_isc_program;
scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
@@ -322,7 +322,7 @@ static int isc_clear_protect(struct flash_bank *bank, unsigned int first,
{
uint8_t select_block[3] = {0x0, 0x0, 0x0};
select_block[0] = fill_select_block(first, last);
- return isc_set_register(bank, CMD_XSC_UNLOCK, select_block, 24, 0);
+ return isc_set_register(bank, cmd_xsc_unlock, select_block, 24, 0);
}
static int isc_set_protect(struct flash_bank *bank, unsigned int first,
@@ -332,7 +332,7 @@ static int isc_set_protect(struct flash_bank *bank, unsigned int first,
for (unsigned int i = first; i <= last; i++)
wrpt[0] &= ~(1 << i);
- return isc_program_register(bank, CMD_XSC_DATA_WRPT, wrpt, 16, 0);
+ return isc_program_register(bank, cmd_xsc_data_wrpt, wrpt, 16, 0);
}
static int isc_erase_sectors(struct flash_bank *bank, unsigned int first,
@@ -341,19 +341,19 @@ static int isc_erase_sectors(struct flash_bank *bank, unsigned int first,
uint8_t select_block[3] = {0, 0, 0};
select_block[0] = fill_select_block(first, last);
int64_t timeout = SECTOR_ERASE_TIMEOUT_MS * (last - first + 1);
- return isc_set_register(bank, CMD_ISC_ERASE, select_block, 24, timeout);
+ return isc_set_register(bank, cmd_isc_erase, select_block, 24, timeout);
}
static int isc_adr_shift(struct flash_bank *bank, int adr)
{
uint8_t adr_buf[3];
h_u24_to_le(adr_buf, adr);
- return isc_set_register(bank, CMD_ISC_ADDRESS_SHIFT, adr_buf, 24, 0);
+ return isc_set_register(bank, cmd_isc_address_shift, adr_buf, 24, 0);
}
static int isc_program_data_page(struct flash_bank *bank, const uint8_t *page_buf)
{
- return isc_program_register(bank, CMD_ISC_DATA_SHIFT, page_buf, 8 * XCF_PAGE_SIZE, 100);
+ return isc_program_register(bank, cmd_isc_data_shift, page_buf, 8 * XCF_PAGE_SIZE, 100);
}
static void isc_data_read_out(struct flash_bank *bank, uint8_t *buffer, uint32_t count)
@@ -366,7 +366,7 @@ static void isc_data_read_out(struct flash_bank *bank, uint8_t *buffer, uint32_t
scan.check_mask = NULL;
scan.check_value = NULL;
scan.num_bits = 16;
- scan.out_value = CMD_XSC_READ;
+ scan.out_value = cmd_xsc_read;
scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
@@ -382,7 +382,7 @@ static int isc_set_data_done(struct flash_bank *bank, int sector)
{
uint8_t done = 0xFF;
done &= ~(1 << sector);
- return isc_program_register(bank, CMD_XSC_DATA_DONE, &done, 8, 100);
+ return isc_program_register(bank, cmd_xsc_data_done, &done, 8, 100);
}
static void flip_u8(uint8_t *out, const uint8_t *in, int len)
@@ -508,7 +508,7 @@ EXIT:
static uint16_t isc_read_ccb(struct flash_bank *bank)
{
uint8_t ccb[2];
- isc_read_register(bank, CMD_XSC_DATA_CCB, ccb, 16);
+ isc_read_register(bank, cmd_xsc_data_ccb, ccb, 16);
return le_to_h_u16(ccb);
}
@@ -526,13 +526,13 @@ static int isc_program_ccb(struct flash_bank *bank, uint16_t ccb)
{
uint8_t buf[2];
h_u16_to_le(buf, ccb);
- return isc_program_register(bank, CMD_XSC_DATA_CCB, buf, 16, 100);
+ return isc_program_register(bank, cmd_xsc_data_ccb, buf, 16, 100);
}
static int isc_program_singe_revision_sucr(struct flash_bank *bank)
{
uint8_t sucr[2] = {0xFC, 0xFF};
- return isc_program_register(bank, CMD_XSC_DATA_SUCR, sucr, 16, 100);
+ return isc_program_register(bank, cmd_xsc_data_sucr, sucr, 16, 100);
}
static int isc_program_single_revision_btc(struct flash_bank *bank)
@@ -543,7 +543,7 @@ static int isc_program_single_revision_btc(struct flash_bank *bank)
btc |= ((bank->num_sectors - 1) << 2);
btc &= ~(1 << 4);
h_u32_to_le(buf, btc);
- return isc_program_register(bank, CMD_XSC_DATA_BTC, buf, 32, 100);
+ return isc_program_register(bank, cmd_xsc_data_btc, buf, 32, 100);
}
static int fpga_configure(struct flash_bank *bank)
@@ -553,7 +553,7 @@ static int fpga_configure(struct flash_bank *bank)
scan.check_mask = NULL;
scan.check_value = NULL;
scan.num_bits = 16;
- scan.out_value = CMD_XSC_CONFIG;
+ scan.out_value = cmd_xsc_config;
scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
jtag_execute_queue();
@@ -663,7 +663,7 @@ static int xcf_protect_check(struct flash_bank *bank)
uint8_t wrpt[2];
isc_enter(bank);
- isc_read_register(bank, CMD_XSC_DATA_WRPT, wrpt, 16);
+ isc_read_register(bank, cmd_xsc_data_wrpt, wrpt, 16);
isc_leave(bank);
for (unsigned int i = 0; i < bank->num_sectors; i++)
@@ -684,7 +684,7 @@ static int xcf_erase_check(struct flash_bank *bank)
scan.check_mask = NULL;
scan.check_value = NULL;
scan.num_bits = 16;
- scan.out_value = CMD_XSC_BLANK_CHECK;
+ scan.out_value = cmd_xsc_blank_check;
scan.in_value = NULL;
jtag_add_ir_scan(bank->target->tap, &scan, TAP_IDLE);
jtag_execute_queue();