str9x: -Wshadow warning fixes

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

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index fc2b1cfc9ae54cc8148ee7a120ea49aacfd18ece..866be509e34fe6704dfd5c1fa2274e10e358f731 100644 (file)
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -33,7 +33,15 @@
 #include <target/armv7m.h>
 
 
-/* flash programming support for NXP LPC17xx and LPC2xxx devices
+/**
+ * @file
+ * flash programming support for NXP LPC17xx and LPC2xxx devices.
+ *
+ * @todo Provide a way to update CCLK after declaring the flash bank.
+ * The value which is correct after chip reset will rarely still work
+ * right after the clocks switch to use the PLL (e.g. 4MHz --> 100 MHz).
+ */
+/*
  * currently supported devices:
  * variant 1 (lpc2000_v1):
  * - 2104 | 5 | 6
@@ -267,7 +275,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, int code, uint32_t param_ta
                                target_buffer_set_u32(target, jump_gate,
                                                ARMV4_5_T_BX(12));
                                target_buffer_set_u32(target, jump_gate + 4,
-                                               ARMV4_5_T_B(0xfffffe));
+                                               ARMV5_T_BKPT(0));
                                break;
                        case lpc2000_v1:
                        case lpc2000_v2:
@@ -586,7 +594,6 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
        if ((offset == 0) && (count >= 0x20) && lpc2000_info->calc_checksum)
        {
                uint32_t checksum = 0;
-               int i;
                for (i = 0; i < 8; i++)
                {
                        LOG_DEBUG("Vector 0x%2.2x: 0x%8.8" PRIx32, i * 4, buf_get_u32(buffer + (i * 4), 0, 32));
@@ -732,7 +739,7 @@ static int lpc2000_protect_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int lpc2000_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_lpc2000_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 
@@ -806,9 +813,10 @@ struct flash_driver lpc2000_flash = {
        .erase = lpc2000_erase,
        .protect = lpc2000_protect,
        .write = lpc2000_write,
+       .read = default_flash_read,
        .probe = lpc2000_probe,
        .auto_probe = lpc2000_probe,
        .erase_check = lpc2000_erase_check,
        .protect_check = lpc2000_protect_check,
-       .info = lpc2000_info,
+       .info = get_lpc2000_info,
 };