flash/nor: Make info function optional
[openocd.git] / src / flash / nor / lpc2900.c
index 99d6d1dc1b6bff614355aaf5a56351e3c0fedc59..9663e51ae0c914cd000eee7017b0f1271348ac11 100644 (file)
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-
 #include "imp.h"
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
 #include <target/arm.h>
 #include <target/image.h>
 
-
 /* 1024 bytes */
 #define KiB                 1024
 
 /* Some flash constants */
-#define FLASH_PAGE_SIZE     512     /* bytes */
-#define FLASH_ERASE_TIME    100000  /* microseconds */
-#define FLASH_PROGRAM_TIME  1000    /* microseconds */
+#define FLASH_PAGE_SIZE     512                /* bytes */
+#define FLASH_ERASE_TIME    100000     /* microseconds */
+#define FLASH_PROGRAM_TIME  1000       /* microseconds */
 
 /* Chip ID / Feature Registers */
-#define CHIPID          0xE0000000  /* Chip ID */
-#define FEAT0           0xE0000100  /* Chip feature 0 */
-#define FEAT1           0xE0000104  /* Chip feature 1 */
-#define FEAT2           0xE0000108  /* Chip feature 2 (contains flash size indicator) */
-#define FEAT3           0xE000010C  /* Chip feature 3 */
+#define CHIPID          0xE0000000     /* Chip ID */
+#define FEAT0           0xE0000100     /* Chip feature 0 */
+#define FEAT1           0xE0000104     /* Chip feature 1 */
+#define FEAT2           0xE0000108     /* Chip feature 2 (contains flash size indicator) */
+#define FEAT3           0xE000010C     /* Chip feature 3 */
 
-#define EXPECTED_CHIPID 0x209CE02B  /* Chip ID of all LPC2900 devices */
+#define EXPECTED_CHIPID 0x209CE02B     /* Chip ID of all LPC2900 devices */
 
 /* Flash/EEPROM Control Registers */
-#define FCTR            0x20200000  /* Flash control */
-#define FPTR            0x20200008  /* Flash program-time */
-#define FTCTR           0x2020000C  /* Flash test control */
-#define FBWST           0x20200010  /* Flash bridge wait-state */
-#define FCRA            0x2020001C  /* Flash clock divider */
-#define FMSSTART        0x20200020  /* Flash Built-In Selft Test start address */
-#define FMSSTOP         0x20200024  /* Flash Built-In Selft Test stop address */
-#define FMS16           0x20200028  /* Flash 16-bit signature */
-#define FMSW0           0x2020002C  /* Flash 128-bit signature Word 0 */
-#define FMSW1           0x20200030  /* Flash 128-bit signature Word 1 */
-#define FMSW2           0x20200034  /* Flash 128-bit signature Word 2 */
-#define FMSW3           0x20200038  /* Flash 128-bit signature Word 3 */
-
-#define EECMD           0x20200080  /* EEPROM command */
-#define EEADDR          0x20200084  /* EEPROM address */
-#define EEWDATA         0x20200088  /* EEPROM write data */
-#define EERDATA         0x2020008C  /* EEPROM read data */
-#define EEWSTATE        0x20200090  /* EEPROM wait state */
-#define EECLKDIV        0x20200094  /* EEPROM clock divider */
-#define EEPWRDWN        0x20200098  /* EEPROM power-down/start */
-#define EEMSSTART       0x2020009C  /* EEPROM BIST start address */
-#define EEMSSTOP        0x202000A0  /* EEPROM BIST stop address */
-#define EEMSSIG         0x202000A4  /* EEPROM 24-bit BIST signature */
-
-#define INT_CLR_ENABLE  0x20200FD8  /* Flash/EEPROM interrupt clear enable */
-#define INT_SET_ENABLE  0x20200FDC  /* Flash/EEPROM interrupt set enable */
-#define INT_STATUS      0x20200FE0  /* Flash/EEPROM interrupt status */
-#define INT_ENABLE      0x20200FE4  /* Flash/EEPROM interrupt enable */
-#define INT_CLR_STATUS  0x20200FE8  /* Flash/EEPROM interrupt clear status */
-#define INT_SET_STATUS  0x20200FEC  /* Flash/EEPROM interrupt set status */
+#define FCTR            0x20200000     /* Flash control */
+#define FPTR            0x20200008     /* Flash program-time */
+#define FTCTR           0x2020000C     /* Flash test control */
+#define FBWST           0x20200010     /* Flash bridge wait-state */
+#define FCRA            0x2020001C     /* Flash clock divider */
+#define FMSSTART        0x20200020     /* Flash Built-In Selft Test start address */
+#define FMSSTOP         0x20200024     /* Flash Built-In Selft Test stop address */
+#define FMS16           0x20200028     /* Flash 16-bit signature */
+#define FMSW0           0x2020002C     /* Flash 128-bit signature Word 0 */
+#define FMSW1           0x20200030     /* Flash 128-bit signature Word 1 */
+#define FMSW2           0x20200034     /* Flash 128-bit signature Word 2 */
+#define FMSW3           0x20200038     /* Flash 128-bit signature Word 3 */
+
+#define EECMD           0x20200080     /* EEPROM command */
+#define EEADDR          0x20200084     /* EEPROM address */
+#define EEWDATA         0x20200088     /* EEPROM write data */
+#define EERDATA         0x2020008C     /* EEPROM read data */
+#define EEWSTATE        0x20200090     /* EEPROM wait state */
+#define EECLKDIV        0x20200094     /* EEPROM clock divider */
+#define EEPWRDWN        0x20200098     /* EEPROM power-down/start */
+#define EEMSSTART       0x2020009C     /* EEPROM BIST start address */
+#define EEMSSTOP        0x202000A0     /* EEPROM BIST stop address */
+#define EEMSSIG         0x202000A4     /* EEPROM 24-bit BIST signature */
+
+#define INT_CLR_ENABLE  0x20200FD8     /* Flash/EEPROM interrupt clear enable */
+#define INT_SET_ENABLE  0x20200FDC     /* Flash/EEPROM interrupt set enable */
+#define INT_STATUS      0x20200FE0     /* Flash/EEPROM interrupt status */
+#define INT_ENABLE      0x20200FE4     /* Flash/EEPROM interrupt enable */
+#define INT_CLR_STATUS  0x20200FE8     /* Flash/EEPROM interrupt clear status */
+#define INT_SET_STATUS  0x20200FEC     /* Flash/EEPROM interrupt set status */
 
 /* Interrupt sources */
 #define INTSRC_END_OF_PROG    (1 << 28)
@@ -87,7 +85,6 @@
 #define INTSRC_END_OF_BURN    (1 << 1)
 #define INTSRC_END_OF_ERASE   (1 << 0)
 
-
 /* FCTR bits */
 #define FCTR_FS_LOADREQ       (1 << 15)
 #define FCTR_FS_CACHECLR      (1 << 14)
 #define ISS_CUSTOMER_NWORDS2  (ISS_CUSTOMER_SIZE2 / 4)
 #define ISS_CUSTOMER_SIZE     (ISS_CUSTOMER_SIZE1 + ISS_CUSTOMER_SIZE2)
 
-
-
 /**
  * Private data for \c lpc2900 flash driver.
  */
-struct lpc2900_flash_bank
-{
+struct lpc2900_flash_bank {
        /**
         * This flag is set when the device has been successfully probed.
         */
@@ -149,7 +143,7 @@ struct lpc2900_flash_bank
         * This string is set by the probe function to the type number of the
         * device. It takes the form "LPC29xx".
         */
-       char * target_name;
+       char *target_name;
 
        /**
         * System clock frequency.
@@ -175,21 +169,18 @@ struct lpc2900_flash_bank
 
 };
 
-
 static uint32_t lpc2900_wait_status(struct flash_bank *bank, uint32_t mask, int timeout);
 static void lpc2900_setup(struct flash_bank *bank);
 static uint32_t lpc2900_is_ready(struct flash_bank *bank);
 static uint32_t lpc2900_read_security_status(struct flash_bank *bank);
 static uint32_t lpc2900_run_bist128(struct flash_bank *bank,
-                                    uint32_t addr_from, uint32_t addr_to,
-                                    uint32_t (*signature)[4] );
+               uint32_t addr_from, uint32_t addr_to,
+               uint32_t (*signature)[4]);
 static uint32_t lpc2900_address2sector(struct flash_bank *bank, uint32_t offset);
-static uint32_t lpc2900_calc_tr( uint32_t clock, uint32_t time );
-
+static uint32_t lpc2900_calc_tr(uint32_t clock_var, uint32_t time_var);
 
 /***********************  Helper functions  **************************/
 
-
 /**
  * Wait for an event in mask to occur in INT_STATUS.
  *
@@ -199,24 +190,20 @@ static uint32_t lpc2900_calc_tr( uint32_t clock, uint32_t time );
  * @param[in] mask Mask to be used for INT_STATUS
  * @param[in] timeout Timeout in ms
  */
-static uint32_t lpc2900_wait_status( struct flash_bank *bank,
-                                     uint32_t mask,
-                                     int timeout )
+static uint32_t lpc2900_wait_status(struct flash_bank *bank,
+       uint32_t mask,
+       int timeout)
 {
        uint32_t int_status;
        struct target *target = bank->target;
 
-
-       do
-       {
+       do {
                alive_sleep(1);
                timeout--;
                target_read_u32(target, INT_STATUS, &int_status);
-       }
-       while( ((int_status & mask) == 0) && (timeout != 0) );
+       } while (((int_status & mask) == 0) && (timeout != 0));
 
-       if (timeout == 0)
-       {
+       if (timeout == 0) {
                LOG_DEBUG("Timeout!");
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -224,8 +211,6 @@ static uint32_t lpc2900_wait_status( struct flash_bank *bank,
        return ERROR_OK;
 }
 
-
-
 /**
  * Set up the flash for erase/program operations.
  *
@@ -233,22 +218,18 @@ static uint32_t lpc2900_wait_status( struct flash_bank *bank,
  *
  * @param bank Pointer to the flash bank descriptor
  */
-static void lpc2900_setup( struct flash_bank *bank )
+static void lpc2900_setup(struct flash_bank *bank)
 {
        uint32_t fcra;
        struct lpc2900_flash_bank *lpc2900_info = bank->driver_priv;
 
-
        /* Power up the flash block */
-       target_write_u32( bank->target, FCTR, FCTR_FS_WEB | FCTR_FS_CS );
-
+       target_write_u32(bank->target, FCTR, FCTR_FS_WEB | FCTR_FS_CS);
 
        fcra = (lpc2900_info->clk_sys_fmc / (3 * 66000)) - 1;
-       target_write_u32( bank->target, FCRA, fcra );
+       target_write_u32(bank->target, FCRA, fcra);
 }
 
-
-
 /**
  * Check if device is ready.
  *
@@ -256,37 +237,31 @@ static void lpc2900_setup( struct flash_bank *bank )
  * Must have been successfully probed.
  * Must be halted.
  */
-static uint32_t lpc2900_is_ready( struct flash_bank *bank )
+static uint32_t lpc2900_is_ready(struct flash_bank *bank)
 {
        struct lpc2900_flash_bank *lpc2900_info = bank->driver_priv;
 
-       if( !lpc2900_info->is_probed )
-       {
+       if (!lpc2900_info->is_probed)
                return ERROR_FLASH_BANK_NOT_PROBED;
-       }
 
-       if( bank->target->state != TARGET_HALTED )
-       {
-               LOG_ERROR( "Target not halted" );
+       if (bank->target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        return ERROR_OK;
 }
 
-
 /**
  * Read the status of sector security from the index sector.
  *
  * @param bank Pointer to the flash bank descriptor
  */
-static uint32_t lpc2900_read_security_status( struct flash_bank *bank )
+static uint32_t lpc2900_read_security_status(struct flash_bank *bank)
 {
-       uint32_t status;
-       if( (status = lpc2900_is_ready( bank )) != ERROR_OK )
-       {
+       uint32_t status = lpc2900_is_ready(bank);
+       if (status != ERROR_OK)
                return status;
-       }
 
        struct target *target = bank->target;
 
@@ -294,9 +269,9 @@ static uint32_t lpc2900_read_security_status( struct flash_bank *bank )
        target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB | FCTR_FS_ISS);
 
        /* Read the relevant block of memory from the ISS sector */
-       uint32_t iss_secured_field[ 0x230/16 ][ 4 ];
+       uint32_t iss_secured_field[0x230/16][4];
        target_read_memory(target, bank->base + 0xC00, 4, 0x230/4,
-                                  (uint8_t *)iss_secured_field);
+               (uint8_t *)iss_secured_field);
 
        /* Disable ISS access */
        target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
@@ -312,47 +287,33 @@ static uint32_t lpc2900_read_security_status( struct flash_bank *bank )
         */
        int sector;
        int index_t;
-       for( sector = 0; sector < bank->num_sectors; sector++ )
-       {
+       for (sector = 0; sector < bank->num_sectors; sector++) {
                /* Convert logical sector number to physical sector number */
-               if( sector <= 4 )
-               {
+               if (sector <= 4)
                        index_t = sector + 11;
-               }
-               else if( sector <= 7 )
-               {
+               else if (sector <= 7)
                        index_t = sector + 27;
-               }
                else
-               {
                        index_t = sector - 8;
-               }
 
                bank->sectors[sector].is_protected = -1;
 
-               if (
-                   (iss_secured_field[index_t][0] == 0x00000000) &&
-                   (iss_secured_field[index_t][1] == 0x00000000) &&
-                   (iss_secured_field[index_t][2] == 0x00000000) &&
-                   (iss_secured_field[index_t][3] == 0x00000000) )
-               {
+               if ((iss_secured_field[index_t][0] == 0x00000000) &&
+                       (iss_secured_field[index_t][1] == 0x00000000) &&
+                       (iss_secured_field[index_t][2] == 0x00000000) &&
+                       (iss_secured_field[index_t][3] == 0x00000000))
                        bank->sectors[sector].is_protected = 1;
-               }
 
-               if (
-                   (iss_secured_field[index_t][0] == 0xFFFFFFFF) &&
-                   (iss_secured_field[index_t][1] == 0xFFFFFFFF) &&
-                   (iss_secured_field[index_t][2] == 0xFFFFFFFF) &&
-                   (iss_secured_field[index_t][3] == 0xFFFFFFFF) )
-               {
+               if ((iss_secured_field[index_t][0] == 0xFFFFFFFF) &&
+                       (iss_secured_field[index_t][1] == 0xFFFFFFFF) &&
+                       (iss_secured_field[index_t][2] == 0xFFFFFFFF) &&
+                       (iss_secured_field[index_t][3] == 0xFFFFFFFF))
                        bank->sectors[sector].is_protected = 0;
-               }
        }
 
        return ERROR_OK;
 }
 
-
 /**
  * Use BIST to calculate a 128-bit hash value over a range of flash.
  *
@@ -362,33 +323,30 @@ static uint32_t lpc2900_read_security_status( struct flash_bank *bank )
  * @param signature
  */
 static uint32_t lpc2900_run_bist128(struct flash_bank *bank,
-                                    uint32_t addr_from,
-                                    uint32_t addr_to,
-                                    uint32_t (*signature)[4] )
+       uint32_t addr_from,
+       uint32_t addr_to,
+       uint32_t (*signature)[4])
 {
        struct target *target = bank->target;
 
        /* Clear END_OF_MISR interrupt status */
-       target_write_u32( target, INT_CLR_STATUS, INTSRC_END_OF_MISR );
+       target_write_u32(target, INT_CLR_STATUS, INTSRC_END_OF_MISR);
 
        /* Start address */
-       target_write_u32( target, FMSSTART, addr_from >> 4);
+       target_write_u32(target, FMSSTART, addr_from >> 4);
        /* End address, and issue start command */
-       target_write_u32( target, FMSSTOP, (addr_to >> 4) | FMSSTOP_MISR_START );
+       target_write_u32(target, FMSSTOP, (addr_to >> 4) | FMSSTOP_MISR_START);
 
        /* Poll for end of operation. Calculate a reasonable timeout. */
-       if( lpc2900_wait_status( bank, INTSRC_END_OF_MISR, 1000 ) != ERROR_OK )
-       {
+       if (lpc2900_wait_status(bank, INTSRC_END_OF_MISR, 1000) != ERROR_OK)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* Return the signature */
-       target_read_memory( target, FMSW0, 4, 4, (uint8_t *)signature );
+       target_read_memory(target, FMSW0, 4, 4, (uint8_t *)signature);
 
        return ERROR_OK;
 }
 
-
 /**
  * Return sector number for given address.
  *
@@ -398,30 +356,23 @@ static uint32_t lpc2900_run_bist128(struct flash_bank *bank,
  * @param bank Pointer to the flash bank descriptor
  * @param offset Offset address relative to bank start
  */
-static uint32_t lpc2900_address2sector( struct flash_bank *bank,
-                                        uint32_t offset )
+static uint32_t lpc2900_address2sector(struct flash_bank *bank,
+       uint32_t offset)
 {
        uint32_t address = bank->base + offset;
 
-
        /* Run through all sectors of this bank */
        int sector;
-       for( sector = 0; sector < bank->num_sectors; sector++ )
-       {
+       for (sector = 0; sector < bank->num_sectors; sector++) {
                /* Return immediately if address is within the current sector */
-               if( address < (bank->sectors[sector].offset + bank->sectors[sector].size) )
-               {
+               if (address < (bank->sectors[sector].offset + bank->sectors[sector].size))
                        return sector;
-               }
        }
 
        /* We should never come here. If we do, return an arbitrary sector number. */
        return 0;
 }
 
-
-
-
 /**
  * Write one page to the index sector.
  *
@@ -429,22 +380,20 @@ static uint32_t lpc2900_address2sector( struct flash_bank *bank,
  * @param pagenum Page number (0...7)
  * @param page Page array (FLASH_PAGE_SIZE bytes)
  */
-static int lpc2900_write_index_page( struct flash_bank *bank,
-                                     int pagenum,
-                                     uint8_t (*page)[FLASH_PAGE_SIZE] )
+static int lpc2900_write_index_page(struct flash_bank *bank,
+       int pagenum,
+       uint8_t (*page)[FLASH_PAGE_SIZE])
 {
        /* Only pages 4...7 are user writable */
-       if ((pagenum < 4) || (pagenum > 7))
-       {
+       if ((pagenum < 4) || (pagenum > 7)) {
                LOG_ERROR("Refuse to burn index sector page %d", pagenum);
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
        /* Get target, and check if it's halted */
        struct target *target = bank->target;
-       if( target->state != TARGET_HALTED )
-       {
-               LOG_ERROR( "Target not halted" );
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -452,67 +401,63 @@ static int lpc2900_write_index_page( struct flash_bank *bank,
        struct lpc2900_flash_bank *lpc2900_info = bank->driver_priv;
 
        /* Enable flash block and set the correct CRA clock of 66 kHz */
-       lpc2900_setup( bank );
+       lpc2900_setup(bank);
 
        /* Un-protect the index sector */
-       target_write_u32( target, bank->base, 0 );
-       target_write_u32( target, FCTR,
-                         FCTR_FS_LOADREQ | FCTR_FS_WPB | FCTR_FS_ISS |
-                         FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS );
+       target_write_u32(target, bank->base, 0);
+       target_write_u32(target, FCTR,
+               FCTR_FS_LOADREQ | FCTR_FS_WPB | FCTR_FS_ISS |
+               FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS);
 
        /* Set latch load mode */
-       target_write_u32( target, FCTR,
-                         FCTR_FS_ISS | FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS );
+       target_write_u32(target, FCTR,
+               FCTR_FS_ISS | FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS);
 
        /* Write whole page to flash data latches */
-       if( target_write_memory( target,
-                                bank->base + pagenum * FLASH_PAGE_SIZE,
-                                4, FLASH_PAGE_SIZE / 4, (uint8_t *)page) != ERROR_OK )
-       {
+       if (target_write_memory(target,
+                       bank->base + pagenum * FLASH_PAGE_SIZE,
+                       4, FLASH_PAGE_SIZE / 4, (uint8_t *)page) != ERROR_OK) {
                LOG_ERROR("Index sector write failed @ page %d", pagenum);
-               target_write_u32( target, FCTR, FCTR_FS_CS | FCTR_FS_WEB );
+               target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
        /* Clear END_OF_BURN interrupt status */
-       target_write_u32( target, INT_CLR_STATUS, INTSRC_END_OF_BURN );
+       target_write_u32(target, INT_CLR_STATUS, INTSRC_END_OF_BURN);
 
        /* Set the program/erase time to FLASH_PROGRAM_TIME */
        target_write_u32(target, FPTR,
-                        FPTR_EN_T | lpc2900_calc_tr( lpc2900_info->clk_sys_fmc,
-                                                     FLASH_PROGRAM_TIME ));
+               FPTR_EN_T | lpc2900_calc_tr(lpc2900_info->clk_sys_fmc,
+                       FLASH_PROGRAM_TIME));
 
        /* Trigger flash write */
-       target_write_u32( target, FCTR,
-                         FCTR_FS_PROGREQ | FCTR_FS_ISS |
-                         FCTR_FS_WPB | FCTR_FS_WRE | FCTR_FS_CS );
+       target_write_u32(target, FCTR,
+               FCTR_FS_PROGREQ | FCTR_FS_ISS |
+               FCTR_FS_WPB | FCTR_FS_WRE | FCTR_FS_CS);
 
        /* Wait for the end of the write operation. If it's not over after one
         * second, something went dreadfully wrong... :-(
         */
-       if (lpc2900_wait_status(bank, INTSRC_END_OF_BURN, 1000) != ERROR_OK)
-       {
+       if (lpc2900_wait_status(bank, INTSRC_END_OF_BURN, 1000) != ERROR_OK) {
                LOG_ERROR("Index sector write failed @ page %d", pagenum);
                target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
-       target_write_u32( target, FCTR, FCTR_FS_CS | FCTR_FS_WEB );
+       target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
        return ERROR_OK;
 }
 
-
-
 /**
  * Calculate FPTR.TR register value for desired program/erase time.
  *
  * @param clock System clock in Hz
  * @param time Program/erase time in Âµs
  */
-static uint32_t lpc2900_calc_tr( uint32_t clock_var, uint32_t time_var )
+static uint32_t lpc2900_calc_tr(uint32_t clock_var, uint32_t time_var)
 {
        /*           ((time[µs]/1e6) * f[Hz]) + 511
         * FPTR.TR = -------------------------------
@@ -524,7 +469,6 @@ static uint32_t lpc2900_calc_tr( uint32_t clock_var, uint32_t time_var )
        return tr_val;
 }
 
-
 /***********************  Private flash commands  **************************/
 
 
@@ -539,45 +483,33 @@ COMMAND_HANDLER(lpc2900_handle_signature_command)
        uint32_t status;
        uint32_t signature[4];
 
-
-       if( CMD_ARGC < 1 )
-       {
-               LOG_WARNING( "Too few arguments. Call: lpc2900 signature <bank#>" );
-               return ERROR_FLASH_BANK_INVALID;
-       }
+       if (CMD_ARGC < 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
-       if( bank->target->state != TARGET_HALTED )
-       {
-               LOG_ERROR( "Target not halted" );
+       if (bank->target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        /* Run BIST over whole flash range */
-       if( (status = lpc2900_run_bist128( bank,
-                                          bank->base,
-                                          bank->base + (bank->size - 1),
-                                          &signature)
-                                        ) != ERROR_OK )
-       {
+       status = lpc2900_run_bist128(bank, bank->base, bank->base + (bank->size - 1), &signature);
+       if (status != ERROR_OK)
                return status;
-       }
 
-       command_print( CMD_CTX, "signature: 0x%8.8" PRIx32
-                                         ":0x%8.8" PRIx32
-                                         ":0x%8.8" PRIx32
-                                         ":0x%8.8" PRIx32,
-                     signature[3], signature[2], signature[1], signature[0] );
+       command_print(CMD_CTX, "signature: 0x%8.8" PRIx32
+               ":0x%8.8" PRIx32
+               ":0x%8.8" PRIx32
+               ":0x%8.8" PRIx32,
+               signature[3], signature[2], signature[1], signature[0]);
 
        return ERROR_OK;
 }
 
-
-
 /**
  * Store customer info in file.
  *
@@ -586,10 +518,8 @@ COMMAND_HANDLER(lpc2900_handle_signature_command)
  */
 COMMAND_HANDLER(lpc2900_handle_read_custom_command)
 {
-       if( CMD_ARGC < 2 )
-       {
+       if (CMD_ARGC < 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
@@ -601,66 +531,58 @@ COMMAND_HANDLER(lpc2900_handle_read_custom_command)
 
        /* Get target, and check if it's halted */
        struct target *target = bank->target;
-       if( target->state != TARGET_HALTED )
-       {
-               LOG_ERROR( "Target not halted" );
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        /* Storage for customer info. Read in two parts */
-       uint32_t customer[ ISS_CUSTOMER_NWORDS1 + ISS_CUSTOMER_NWORDS2 ];
+       uint32_t customer[ISS_CUSTOMER_NWORDS1 + ISS_CUSTOMER_NWORDS2];
 
        /* Enable access to index sector */
-       target_write_u32( target, FCTR, FCTR_FS_CS | FCTR_FS_WEB | FCTR_FS_ISS );
+       target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB | FCTR_FS_ISS);
 
        /* Read two parts */
-       target_read_memory( target, bank->base+ISS_CUSTOMER_START1, 4,
-                                   ISS_CUSTOMER_NWORDS1,
-                                   (uint8_t *)&customer[0] );
-       target_read_memory( target, bank->base+ISS_CUSTOMER_START2, 4,
-                                   ISS_CUSTOMER_NWORDS2,
-                                   (uint8_t *)&customer[ISS_CUSTOMER_NWORDS1] );
+       target_read_memory(target, bank->base+ISS_CUSTOMER_START1, 4,
+               ISS_CUSTOMER_NWORDS1,
+               (uint8_t *)&customer[0]);
+       target_read_memory(target, bank->base+ISS_CUSTOMER_START2, 4,
+               ISS_CUSTOMER_NWORDS2,
+               (uint8_t *)&customer[ISS_CUSTOMER_NWORDS1]);
 
        /* Deactivate access to index sector */
-       target_write_u32( target, FCTR, FCTR_FS_CS | FCTR_FS_WEB );
+       target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
        /* Try and open the file */
        struct fileio fileio;
        const char *filename = CMD_ARGV[1];
-       int ret = fileio_open( &fileio, filename, FILEIO_WRITE, FILEIO_BINARY );
-       if( ret != ERROR_OK )
-       {
-               LOG_WARNING( "Could not open file %s", filename );
+       int ret = fileio_open(&fileio, filename, FILEIO_WRITE, FILEIO_BINARY);
+       if (ret != ERROR_OK) {
+               LOG_WARNING("Could not open file %s", filename);
                return ret;
        }
 
        size_t nwritten;
-       ret = fileio_write( &fileio, sizeof(customer),
-                        (const uint8_t *)customer, &nwritten );
-       if( ret != ERROR_OK )
-       {
-               LOG_ERROR( "Write operation to file %s failed", filename );
-               fileio_close( &fileio );
+       ret = fileio_write(&fileio, sizeof(customer),
+                       (const uint8_t *)customer, &nwritten);
+       if (ret != ERROR_OK) {
+               LOG_ERROR("Write operation to file %s failed", filename);
+               fileio_close(&fileio);
                return ret;
        }
 
-       fileio_close( &fileio );
+       fileio_close(&fileio);
 
        return ERROR_OK;
 }
 
-
-
-
 /**
  * Enter password to enable potentially dangerous options.
  */
 COMMAND_HANDLER(lpc2900_handle_password_command)
 {
        if (CMD_ARGC < 2)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
@@ -671,31 +593,26 @@ COMMAND_HANDLER(lpc2900_handle_password_command)
 
 #define ISS_PASSWORD "I_know_what_I_am_doing"
 
-       lpc2900_info->risky = !strcmp( CMD_ARGV[1], ISS_PASSWORD );
+       lpc2900_info->risky = !strcmp(CMD_ARGV[1], ISS_PASSWORD);
 
-       if( !lpc2900_info->risky )
-       {
+       if (!lpc2900_info->risky) {
                command_print(CMD_CTX, "Wrong password (use '%s')", ISS_PASSWORD);
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
        command_print(CMD_CTX,
-                  "Potentially dangerous operation allowed in next command!");
+               "Potentially dangerous operation allowed in next command!");
 
        return ERROR_OK;
 }
 
-
-
 /**
  * Write customer info from file to the index sector.
  */
 COMMAND_HANDLER(lpc2900_handle_write_custom_command)
 {
        if (CMD_ARGC < 2)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
@@ -705,17 +622,15 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
        struct lpc2900_flash_bank *lpc2900_info = bank->driver_priv;
 
        /* Check if command execution is allowed. */
-       if( !lpc2900_info->risky )
-       {
-               command_print( CMD_CTX, "Command execution not allowed!" );
+       if (!lpc2900_info->risky) {
+               command_print(CMD_CTX, "Command execution not allowed!");
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
        lpc2900_info->risky = 0;
 
        /* Get target, and check if it's halted */
        struct target *target = bank->target;
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -730,23 +645,19 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
        const char *type = (CMD_ARGC >= 3) ? CMD_ARGV[2] : NULL;
        retval = image_open(&image, filename, type);
        if (retval != ERROR_OK)
-       {
                return retval;
-       }
 
        /* Do a sanity check: The image must be exactly the size of the customer
           programmable area. Any other size is rejected. */
-       if( image.num_sections != 1 )
-       {
+       if (image.num_sections != 1) {
                LOG_ERROR("Only one section allowed in image file.");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       if( (image.sections[0].base_address != 0) ||
-        (image.sections[0].size != ISS_CUSTOMER_SIZE) )
-       {
+       if ((image.sections[0].base_address != 0) ||
+                       (image.sections[0].size != ISS_CUSTOMER_SIZE)) {
                LOG_ERROR("Incorrect image file size. Expected %d, "
                        "got %" PRIu32,
-                   ISS_CUSTOMER_SIZE, image.sections[0].size);
+                       ISS_CUSTOMER_SIZE, image.sections[0].size);
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -757,35 +668,33 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
 
        /* Page 4 */
        uint32_t offset = ISS_CUSTOMER_START1 % FLASH_PAGE_SIZE;
-       memset( page, 0xff, FLASH_PAGE_SIZE );
+       memset(page, 0xff, FLASH_PAGE_SIZE);
        size_t size_read;
-       retval = image_read_section( &image, 0, 0,
-                                    ISS_CUSTOMER_SIZE1, &page[offset], &size_read);
-       if( retval != ERROR_OK )
-       {
+       retval = image_read_section(&image, 0, 0,
+                       ISS_CUSTOMER_SIZE1, &page[offset], &size_read);
+       if (retval != ERROR_OK) {
                LOG_ERROR("couldn't read from file '%s'", filename);
                image_close(&image);
                return retval;
        }
-       if( (retval = lpc2900_write_index_page( bank, 4, &page )) != ERROR_OK )
-       {
+       retval = lpc2900_write_index_page(bank, 4, &page);
+       if (retval != ERROR_OK) {
                image_close(&image);
                return retval;
        }
 
        /* Page 5 */
        offset = ISS_CUSTOMER_START2 % FLASH_PAGE_SIZE;
-       memset( page, 0xff, FLASH_PAGE_SIZE );
-       retval = image_read_section( &image, 0, ISS_CUSTOMER_SIZE1,
-                                    ISS_CUSTOMER_SIZE2, &page[offset], &size_read);
-       if( retval != ERROR_OK )
-       {
+       memset(page, 0xff, FLASH_PAGE_SIZE);
+       retval = image_read_section(&image, 0, ISS_CUSTOMER_SIZE1,
+                       ISS_CUSTOMER_SIZE2, &page[offset], &size_read);
+       if (retval != ERROR_OK) {
                LOG_ERROR("couldn't read from file '%s'", filename);
                image_close(&image);
                return retval;
        }
-       if( (retval = lpc2900_write_index_page( bank, 5, &page )) != ERROR_OK )
-       {
+       retval = lpc2900_write_index_page(bank, 5, &page);
+       if (retval != ERROR_OK) {
                image_close(&image);
                return retval;
        }
@@ -795,17 +704,13 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
        return ERROR_OK;
 }
 
-
-
 /**
  * Activate 'sector security' for a range of sectors.
  */
 COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
 {
        if (CMD_ARGC < 3)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        /* Get the bank descriptor */
        struct flash_bank *bank;
@@ -816,10 +721,9 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
        struct lpc2900_flash_bank *lpc2900_info = bank->driver_priv;
 
        /* Check if command execution is allowed. */
-       if( !lpc2900_info->risky )
-       {
-               command_print( CMD_CTX, "Command execution not allowed! "
-               "(use 'password' command first)");
+       if (!lpc2900_info->risky) {
+               command_print(CMD_CTX, "Command execution not allowed! "
+                       "(use 'password' command first)");
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
        lpc2900_info->risky = 0;
@@ -828,11 +732,10 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
        int first, last;
        COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
        COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
-       if( (first >= bank->num_sectors) ||
-           (last >= bank->num_sectors) ||
-           (first > last) )
-       {
-               command_print( CMD_CTX, "Illegal sector range" );
+       if ((first >= bank->num_sectors) ||
+                       (last >= bank->num_sectors) ||
+                       (first > last)) {
+               command_print(CMD_CTX, "Illegal sector range");
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
@@ -840,71 +743,56 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
        int sector;
 
        /* Sectors in page 6 */
-       if( (first <= 4) || (last >= 8) )
-       {
-               memset( &page, 0xff, FLASH_PAGE_SIZE );
-               for( sector = first; sector <= last; sector++ )
-               {
-                       if( sector <= 4 )
-                       {
-                               memset( &page[0xB0 + 16*sector], 0, 16 );
-                       }
-                       else if( sector >= 8 )
-                       {
-                               memset( &page[0x00 + 16*(sector - 8)], 0, 16 );
-                       }
+       if ((first <= 4) || (last >= 8)) {
+               memset(&page, 0xff, FLASH_PAGE_SIZE);
+               for (sector = first; sector <= last; sector++) {
+                       if (sector <= 4)
+                               memset(&page[0xB0 + 16*sector], 0, 16);
+                       else if (sector >= 8)
+                               memset(&page[0x00 + 16*(sector - 8)], 0, 16);
                }
 
-               if( (retval = lpc2900_write_index_page( bank, 6, &page )) != ERROR_OK )
-               {
+               retval = lpc2900_write_index_page(bank, 6, &page);
+               if (retval != ERROR_OK) {
                        LOG_ERROR("failed to update index sector page 6");
                        return retval;
                }
        }
 
        /* Sectors in page 7 */
-       if( (first <= 7) && (last >= 5) )
-       {
-               memset( &page, 0xff, FLASH_PAGE_SIZE );
-               for( sector = first; sector <= last; sector++ )
-               {
-                       if( (sector >= 5) && (sector <= 7) )
-                       {
-                               memset( &page[0x00 + 16*(sector - 5)], 0, 16 );
-                       }
+       if ((first <= 7) && (last >= 5)) {
+               memset(&page, 0xff, FLASH_PAGE_SIZE);
+               for (sector = first; sector <= last; sector++) {
+                       if ((sector >= 5) && (sector <= 7))
+                               memset(&page[0x00 + 16*(sector - 5)], 0, 16);
                }
 
-               if( (retval = lpc2900_write_index_page( bank, 7, &page )) != ERROR_OK )
-               {
+               retval = lpc2900_write_index_page(bank, 7, &page);
+               if (retval != ERROR_OK) {
                        LOG_ERROR("failed to update index sector page 7");
                        return retval;
                }
        }
 
-       command_print( CMD_CTX,
-               "Sectors security will become effective after next power cycle");
+       command_print(CMD_CTX,
+               "Sectors security will become effective after next power cycle");
 
        /* Update the sector security status */
-       if ( lpc2900_read_security_status(bank) != ERROR_OK )
-       {
-               LOG_ERROR( "Cannot determine sector security status" );
+       if (lpc2900_read_security_status(bank) != ERROR_OK) {
+               LOG_ERROR("Cannot determine sector security status");
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
        return ERROR_OK;
 }
 
-
-
 /**
  * Activate JTAG protection.
  */
 COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
 {
        if (CMD_ARGC < 1)
-       {
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        /* Get the bank descriptor */
        struct flash_bank *bank;
@@ -915,17 +803,16 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
        struct lpc2900_flash_bank *lpc2900_info = bank->driver_priv;
 
        /* Check if command execution is allowed. */
-       if( !lpc2900_info->risky )
-       {
-               command_print( CMD_CTX, "Command execution not allowed! "
-                                       "(use 'password' command first)");
+       if (!lpc2900_info->risky) {
+               command_print(CMD_CTX, "Command execution not allowed! "
+                       "(use 'password' command first)");
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
        lpc2900_info->risky = 0;
 
        /* Prepare page */
        uint8_t page[FLASH_PAGE_SIZE];
-       memset( &page, 0xff, FLASH_PAGE_SIZE );
+       memset(&page, 0xff, FLASH_PAGE_SIZE);
 
 
        /* Insert "soft" protection word */
@@ -935,9 +822,8 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
        page[0x30 +  3] = 0x7F;
 
        /* Write to page 5 */
-       if( (retval = lpc2900_write_index_page( bank, 5, &page ))
-                       != ERROR_OK )
-       {
+       retval = lpc2900_write_index_page(bank, 5, &page);
+       if (retval != ERROR_OK) {
                LOG_ERROR("failed to update index sector page 5");
                return retval;
        }
@@ -947,16 +833,14 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
        return ERROR_OK;
 }
 
-
-
 /***********************  Flash interface functions  **************************/
 
 static const struct command_registration lpc2900_exec_command_handlers[] = {
        {
                .name = "signature",
+               .usage = "<bank>",
                .handler = lpc2900_handle_signature_command,
                .mode = COMMAND_EXEC,
-               .usage = "bank_id",
                .help = "Calculate and display signature of flash bank.",
        },
        {
@@ -1000,26 +884,25 @@ static const struct command_registration lpc2900_exec_command_handlers[] = {
        },
        COMMAND_REGISTRATION_DONE
 };
+
 static const struct command_registration lpc2900_command_handlers[] = {
        {
                .name = "lpc2900",
                .mode = COMMAND_ANY,
                .help = "LPC2900 flash command group",
+               .usage = "",
                .chain = lpc2900_exec_command_handlers,
        },
        COMMAND_REGISTRATION_DONE
 };
 
-/// Evaluate flash bank command.
+/** Evaluate flash bank command. */
 FLASH_BANK_COMMAND_HANDLER(lpc2900_flash_bank_command)
 {
        struct lpc2900_flash_bank *lpc2900_info;
 
        if (CMD_ARGC < 6)
-       {
-               LOG_WARNING("incomplete flash_bank LPC2900 configuration");
-               return ERROR_FLASH_BANK_INVALID;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        lpc2900_info = malloc(sizeof(struct lpc2900_flash_bank));
        bank->driver_priv = lpc2900_info;
@@ -1035,19 +918,17 @@ FLASH_BANK_COMMAND_HANDLER(lpc2900_flash_bank_command)
        uint32_t clock_limit;
        /* Check program time limit */
        clock_limit = 512000000l / FLASH_PROGRAM_TIME;
-       if (lpc2900_info->clk_sys_fmc < clock_limit)
-       {
+       if (lpc2900_info->clk_sys_fmc < clock_limit) {
                LOG_WARNING("flash clock must be at least %" PRIu32 " kHz",
-                    (clock_limit / 1000));
+                       (clock_limit / 1000));
                return ERROR_FLASH_BANK_INVALID;
        }
 
        /* Check erase time limit */
        clock_limit = (uint32_t)((32767.0 * 512.0 * 1e6) / FLASH_ERASE_TIME);
-       if (lpc2900_info->clk_sys_fmc > clock_limit)
-       {
-               LOG_WARNING("flash clock must be a maximum of %" PRIu32" kHz",
-                    (clock_limit / 1000));
+       if (lpc2900_info->clk_sys_fmc > clock_limit) {
+               LOG_WARNING("flash clock must be a maximum of %" PRIu32 " kHz",
+                       (clock_limit / 1000));
                return ERROR_FLASH_BANK_INVALID;
        }
 
@@ -1058,7 +939,6 @@ FLASH_BANK_COMMAND_HANDLER(lpc2900_flash_bank_command)
        return ERROR_OK;
 }
 
-
 /**
  * Erase sector(s).
  *
@@ -1077,19 +957,16 @@ static int lpc2900_erase(struct flash_bank *bank, int first, int last)
 
        status = lpc2900_is_ready(bank);
        if (status != ERROR_OK)
-       {
                return status;
-       }
 
        /* Sanity check on sector range */
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
-       {
+       if ((first < 0) || (last < first) || (last >= bank->num_sectors)) {
                LOG_INFO("Bad sector range");
                return ERROR_FLASH_SECTOR_INVALID;
        }
 
        /* Update the info about secured sectors */
-       lpc2900_read_security_status( bank );
+       lpc2900_read_security_status(bank);
 
        /* The selected sector range might include secured sectors. An attempt
         * to erase such a sector will cause the erase to fail also for unsecured
@@ -1098,22 +975,17 @@ static int lpc2900_erase(struct flash_bank *bank, int first, int last)
         * a special way.
         */
        last_unsecured_sector = -1;
-       for (sector = first; sector <= last; sector++)
-       {
-               if ( !bank->sectors[sector].is_protected )
-               {
+       for (sector = first; sector <= last; sector++) {
+               if (!bank->sectors[sector].is_protected)
                        last_unsecured_sector = sector;
-               }
        }
 
        /* Exit now, in case of the rare constellation where all sectors in range
         * are secured. This is regarded a success, since erasing/programming of
         * secured sectors shall be handled transparently.
         */
-       if ( last_unsecured_sector == -1 )
-       {
+       if (last_unsecured_sector == -1)
                return ERROR_OK;
-       }
 
        /* Enable flash block and set the correct CRA clock of 66 kHz */
        lpc2900_setup(bank);
@@ -1123,36 +995,31 @@ static int lpc2900_erase(struct flash_bank *bank, int first, int last)
 
        /* Set the program/erase timer to FLASH_ERASE_TIME */
        target_write_u32(target, FPTR,
-                        FPTR_EN_T | lpc2900_calc_tr( lpc2900_info->clk_sys_fmc,
-                                                     FLASH_ERASE_TIME ));
+               FPTR_EN_T | lpc2900_calc_tr(lpc2900_info->clk_sys_fmc,
+                       FLASH_ERASE_TIME));
 
        /* Sectors are marked for erasure, then erased all together */
-       for (sector = first; sector <= last_unsecured_sector; sector++)
-       {
+       for (sector = first; sector <= last_unsecured_sector; sector++) {
                /* Only mark sectors that aren't secured. Any attempt to erase a group
                 * of sectors will fail if any single one of them is secured!
                 */
-               if ( !bank->sectors[sector].is_protected )
-               {
+               if (!bank->sectors[sector].is_protected) {
                        /* Unprotect the sector */
                        target_write_u32(target, bank->sectors[sector].offset, 0);
                        target_write_u32(target, FCTR,
-                                        FCTR_FS_LOADREQ | FCTR_FS_WPB |
-                                        FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS);
+                               FCTR_FS_LOADREQ | FCTR_FS_WPB |
+                               FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS);
 
                        /* Mark the sector for erasure. The last sector in the list
                           triggers the erasure. */
                        target_write_u32(target, bank->sectors[sector].offset, 0);
-                       if ( sector == last_unsecured_sector )
-                       {
+                       if (sector == last_unsecured_sector) {
                                target_write_u32(target, FCTR,
-                                                FCTR_FS_PROGREQ | FCTR_FS_WPB | FCTR_FS_CS);
-                       }
-                       else
-                       {
+                                       FCTR_FS_PROGREQ | FCTR_FS_WPB | FCTR_FS_CS);
+                       } else {
                                target_write_u32(target, FCTR,
-                                                FCTR_FS_LOADREQ | FCTR_FS_WPB |
-                                                FCTR_FS_WEB | FCTR_FS_CS);
+                                       FCTR_FS_LOADREQ | FCTR_FS_WPB |
+                                       FCTR_FS_WEB | FCTR_FS_CS);
                        }
                }
        }
@@ -1160,10 +1027,8 @@ static int lpc2900_erase(struct flash_bank *bank, int first, int last)
        /* Wait for the end of the erase operation. If it's not over after two seconds,
         * something went dreadfully wrong... :-(
         */
-       if( lpc2900_wait_status(bank, INTSRC_END_OF_ERASE, 2000) != ERROR_OK )
-       {
+       if (lpc2900_wait_status(bank, INTSRC_END_OF_ERASE, 2000) != ERROR_OK)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* Normal flash operating mode */
        target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
@@ -1171,22 +1036,19 @@ static int lpc2900_erase(struct flash_bank *bank, int first, int last)
        return ERROR_OK;
 }
 
-
-
 static int lpc2900_protect(struct flash_bank *bank, int set, int first, int last)
 {
        /* This command is not supported.
-     * "Protection" in LPC2900 terms is handled transparently. Sectors will
-     * automatically be unprotected as needed.
-     * Instead we use the concept of sector security. A secured sector is shown
-     * as "protected" in OpenOCD. Sector security is a permanent feature, and
-     * cannot be disabled once activated.
-     */
+       * "Protection" in LPC2900 terms is handled transparently. Sectors will
+       * automatically be unprotected as needed.
+       * Instead we use the concept of sector security. A secured sector is shown
+       * as "protected" in OpenOCD. Sector security is a permanent feature, and
+       * cannot be disabled once activated.
+       */
 
        return ERROR_OK;
 }
 
-
 /**
  * Write data to flash.
  *
@@ -1196,7 +1058,7 @@ static int lpc2900_protect(struct flash_bank *bank, int set, int first, int last
  * @param count Number of bytes to be programmed
  */
 static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
-                         uint32_t offset, uint32_t count)
+       uint32_t offset, uint32_t count)
 {
        uint8_t page[FLASH_PAGE_SIZE];
        uint32_t status;
@@ -1208,117 +1070,107 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
 
        static const uint32_t write_target_code[] = {
                /* Set auto latch mode: FCTR=CS|WRE|WEB */
-               0xe3a0a007,   /* loop       mov r10, #0x007 */
-               0xe583a000,   /*            str r10,[r3,#0] */
+               0xe3a0a007,     /* loop       mov r10, #0x007 */
+               0xe583a000,     /*            str r10,[r3,#0] */
 
                /* Load complete page into latches */
-               0xe3a06020,   /*            mov r6,#(512/16) */
-               0xe8b00f00,   /* next       ldmia r0!,{r8-r11} */
-               0xe8a10f00,   /*            stmia r1!,{r8-r11} */
-               0xe2566001,   /*            subs r6,#1 */
-               0x1afffffb,   /*            bne next */
+               0xe3a06020,     /*            mov r6,#(512/16) */
+               0xe8b00f00,     /* next       ldmia r0!,{r8-r11} */
+               0xe8a10f00,     /*            stmia r1!,{r8-r11} */
+               0xe2566001,     /*            subs r6,#1 */
+               0x1afffffb,     /*            bne next */
 
                /* Clear END_OF_BURN interrupt status */
-               0xe3a0a002,   /*            mov r10,#(1 << 1) */
-               0xe583afe8,   /*            str r10,[r3,#0xfe8] */
+               0xe3a0a002,     /*            mov r10,#(1 << 1) */
+               0xe583afe8,     /*            str r10,[r3,#0xfe8] */
 
                /* Set the erase time to FLASH_PROGRAM_TIME */
-               0xe5834008,   /*            str r4,[r3,#8] */
+               0xe5834008,     /*            str r4,[r3,#8] */
 
                /* Trigger flash write
-                       FCTR = CS | WRE | WPB | PROGREQ */
-               0xe3a0a083,   /*            mov r10,#0x83 */
-               0xe38aaa01,   /*            orr r10,#0x1000 */
-               0xe583a000,   /*            str r10,[r3,#0] */
+                * FCTR = CS | WRE | WPB | PROGREQ */
+               0xe3a0a083,     /*            mov r10,#0x83 */
+               0xe38aaa01,     /*            orr r10,#0x1000 */
+               0xe583a000,     /*            str r10,[r3,#0] */
 
                /* Wait for end of burn */
-               0xe593afe0,   /* wait       ldr r10,[r3,#0xfe0] */
-               0xe21aa002,   /*            ands r10,#(1 << 1) */
-               0x0afffffc,   /*            beq wait */
+               0xe593afe0,     /* wait       ldr r10,[r3,#0xfe0] */
+               0xe21aa002,     /*            ands r10,#(1 << 1) */
+               0x0afffffc,     /*            beq wait */
 
                /* End? */
-               0xe2522001,   /*            subs r2,#1 */
-               0x1affffed,   /*            bne loop */
+               0xe2522001,     /*            subs r2,#1 */
+               0x1affffed,     /*            bne loop */
 
-               0xeafffffe    /* done       b done */
+               0xeafffffe      /* done       b done */
        };
 
 
        status = lpc2900_is_ready(bank);
        if (status != ERROR_OK)
-       {
                return status;
-       }
 
        /* Enable flash block and set the correct CRA clock of 66 kHz */
        lpc2900_setup(bank);
 
        /* Update the info about secured sectors */
-       lpc2900_read_security_status( bank );
+       lpc2900_read_security_status(bank);
 
        /* Unprotect all involved sectors */
-       for (sector = 0; sector < bank->num_sectors; sector++)
-       {
-               /* Start address in or before this sector? */
-               /* End address in or behind this sector? */
-               if ( ((bank->base + offset) <
-                         (bank->sectors[sector].offset + bank->sectors[sector].size)) &&
-                    ((bank->base + (offset + count - 1)) >= bank->sectors[sector].offset) )
-               {
+       for (sector = 0; sector < bank->num_sectors; sector++) {
+               /* Start address in or before this sector?
+                * End address in or behind this sector? */
+               if (((bank->base + offset) <
+                               (bank->sectors[sector].offset + bank->sectors[sector].size)) &&
+                               ((bank->base + (offset + count - 1)) >= bank->sectors[sector].offset)) {
                        /* This sector is involved and needs to be unprotected.
-                               * Don't do it for secured sectors.
-                               */
-                       if ( !bank->sectors[sector].is_protected )
-                       {
+                        * Don't do it for secured sectors.
+                        */
+                       if (!bank->sectors[sector].is_protected) {
                                target_write_u32(target, bank->sectors[sector].offset, 0);
                                target_write_u32(target, FCTR,
-                                                FCTR_FS_LOADREQ | FCTR_FS_WPB |
-                                                FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS);
+                                       FCTR_FS_LOADREQ | FCTR_FS_WPB |
+                                       FCTR_FS_WEB | FCTR_FS_WRE | FCTR_FS_CS);
                        }
                }
        }
 
        /* Set the program/erase time to FLASH_PROGRAM_TIME */
-       uint32_t prog_time = FPTR_EN_T | lpc2900_calc_tr( lpc2900_info->clk_sys_fmc,
-                                                         FLASH_PROGRAM_TIME );
+       uint32_t prog_time = FPTR_EN_T | lpc2900_calc_tr(lpc2900_info->clk_sys_fmc, FLASH_PROGRAM_TIME);
 
        /* If there is a working area of reasonable size, use it to program via
-          a target algorithm. If not, fall back to host programming. */
+        * a target algorithm. If not, fall back to host programming. */
 
        /* We need some room for target code. */
        uint32_t target_code_size = sizeof(write_target_code);
 
        /* Try working area allocation. Start with a large buffer, and try with
-          reduced size if that fails. */
+        * reduced size if that fails. */
        struct working_area *warea;
        uint32_t buffer_size = lpc2900_info->max_ram_block - 1 * KiB;
-       while( (retval = target_alloc_working_area_try(target,
-                                                  buffer_size + target_code_size,
-                                                  &warea)) != ERROR_OK )
-       {
+       while ((retval = target_alloc_working_area_try(target,
+                                buffer_size + target_code_size,
+                                &warea)) != ERROR_OK) {
                /* Try a smaller buffer now, and stop if it's too small. */
                buffer_size -= 1 * KiB;
-               if (buffer_size < 2 * KiB)
-               {
-                       LOG_INFO( "no (large enough) working area"
-                                 ", falling back to host mode" );
+               if (buffer_size < 2 * KiB) {
+                       LOG_INFO("no (large enough) working area, falling back to host mode");
                        warea = NULL;
                        break;
                }
-       };
+       }
+       ;
 
-       if( warea )
-       {
+       if (warea) {
                struct reg_param reg_params[5];
-               struct arm_algorithm armv4_5_info;
+               struct arm_algorithm arm_algo;
 
                /* We can use target mode. Download the algorithm. */
-               retval = target_write_buffer( target,
-                                             (warea->address)+buffer_size,
-                                             target_code_size,
-                                             (uint8_t *)write_target_code);
-               if (retval != ERROR_OK)
-               {
+               retval = target_write_buffer(target,
+                               (warea->address)+buffer_size,
+                               target_code_size,
+                               (uint8_t *)write_target_code);
+               if (retval != ERROR_OK) {
                        LOG_ERROR("Unable to write block write code to target");
                        target_free_all_working_areas(target);
                        return ERROR_FLASH_OPERATION_FAILED;
@@ -1331,58 +1183,50 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
                init_reg_param(&reg_params[4], "r4", 32, PARAM_OUT);
 
                /* Write to flash in large blocks */
-               while ( count != 0 )
-               {
+               while (count != 0) {
                        uint32_t this_npages;
                        uint8_t *this_buffer;
-                       int start_sector = lpc2900_address2sector( bank, offset );
+                       int start_sector = lpc2900_address2sector(bank, offset);
 
                        /* First page / last page / rest */
-                       if( offset % FLASH_PAGE_SIZE )
-                       {
+                       if (offset % FLASH_PAGE_SIZE) {
                                /* Block doesn't start on page boundary.
-                                  Burn first partial page separately. */
-                               memset( &page, 0xff, sizeof(page) );
-                               memcpy( &page[offset % FLASH_PAGE_SIZE],
-                                       buffer,
-                                       FLASH_PAGE_SIZE - (offset % FLASH_PAGE_SIZE) );
+                                * Burn first partial page separately. */
+                               memset(&page, 0xff, sizeof(page));
+                               memcpy(&page[offset % FLASH_PAGE_SIZE],
+                                       buffer,
+                                       FLASH_PAGE_SIZE - (offset % FLASH_PAGE_SIZE));
                                this_npages = 1;
                                this_buffer = &page[0];
                                count = count + (offset % FLASH_PAGE_SIZE);
                                offset = offset - (offset % FLASH_PAGE_SIZE);
-                       }
-                       else if( count < FLASH_PAGE_SIZE )
-                       {
+                       } else if (count < FLASH_PAGE_SIZE) {
                                /* Download last incomplete page separately. */
-                               memset( &page, 0xff, sizeof(page) );
-                               memcpy( &page, buffer, count );
+                               memset(&page, 0xff, sizeof(page));
+                               memcpy(&page, buffer, count);
                                this_npages = 1;
                                this_buffer = &page[0];
                                count = FLASH_PAGE_SIZE;
-                       }
-                       else
-                       {
+                       } else {
                                /* Download as many full pages as possible */
                                this_npages = (count < buffer_size) ?
-                                              count / FLASH_PAGE_SIZE :
-                                              buffer_size / FLASH_PAGE_SIZE;
+                                       count / FLASH_PAGE_SIZE :
+                                       buffer_size / FLASH_PAGE_SIZE;
                                this_buffer = buffer;
 
                                /* Make sure we stop at the next secured sector */
                                sector = start_sector + 1;
-                               while( sector < bank->num_sectors )
-                               {
+                               while (sector < bank->num_sectors) {
                                        /* Secured? */
-                                       if( bank->sectors[sector].is_protected )
-                                       {
+                                       if (bank->sectors[sector].is_protected) {
                                                /* Is that next sector within the current block? */
-                                               if( (bank->sectors[sector].offset - bank->base) <
-                                                       (offset + (this_npages * FLASH_PAGE_SIZE)) )
-                                               {
+                                               if ((bank->sectors[sector].offset - bank->base) <
+                                                               (offset + (this_npages * FLASH_PAGE_SIZE))) {
                                                        /* Yes! Split the block */
                                                        this_npages =
-                                                         (bank->sectors[sector].offset - bank->base - offset)
-                                                             / FLASH_PAGE_SIZE;
+                                                               (bank->sectors[sector].offset -
+                                                                bank->base - offset)
+                                                               / FLASH_PAGE_SIZE;
                                                        break;
                                                }
                                        }
@@ -1392,20 +1236,17 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
                        }
 
                        /* Skip the current sector if it is secured */
-                       if (bank->sectors[start_sector].is_protected)
-                       {
+                       if (bank->sectors[start_sector].is_protected) {
                                LOG_DEBUG("Skip secured sector %d",
-                                               start_sector);
+                                       start_sector);
 
                                /* Stop if this is the last sector */
                                if (start_sector == bank->num_sectors - 1)
-                               {
                                        break;
-                               }
 
                                /* Skip */
                                uint32_t nskip = bank->sectors[start_sector].size -
-                                                (offset % bank->sectors[start_sector].size);
+                                       (offset % bank->sectors[start_sector].size);
                                offset += nskip;
                                buffer += nskip;
                                count = (count >= nskip) ? (count - nskip) : 0;
@@ -1413,11 +1254,9 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
                        }
 
                        /* Execute buffer download */
-                       if ((retval = target_write_buffer(target,
-                                                         warea->address,
-                                                         this_npages * FLASH_PAGE_SIZE,
-                                                         this_buffer)) != ERROR_OK)
-                       {
+                       retval = target_write_buffer(target, warea->address,
+                                       this_npages * FLASH_PAGE_SIZE, this_buffer);
+                       if (retval != ERROR_OK) {
                                LOG_ERROR("Unable to write data to target");
                                target_free_all_working_areas(target);
                                return ERROR_FLASH_OPERATION_FAILED;
@@ -1431,18 +1270,17 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
                        buf_set_u32(reg_params[4].value, 0, 32, FPTR_EN_T | prog_time);
 
                        /* Execute algorithm, assume breakpoint for last instruction */
-                       armv4_5_info.common_magic = ARM_COMMON_MAGIC;
-                       armv4_5_info.core_mode = ARM_MODE_SVC;
-                       armv4_5_info.core_state = ARM_STATE_ARM;
+                       arm_algo.common_magic = ARM_COMMON_MAGIC;
+                       arm_algo.core_mode = ARM_MODE_SVC;
+                       arm_algo.core_state = ARM_STATE_ARM;
 
                        retval = target_run_algorithm(target, 0, NULL, 5, reg_params,
-                               (warea->address) + buffer_size,
-                               (warea->address) + buffer_size + target_code_size - 4,
-                               10000, /* 10s should be enough for max. 16 KiB of data */
-                               &armv4_5_info);
+                                       (warea->address) + buffer_size,
+                                       (warea->address) + buffer_size + target_code_size - 4,
+                                       10000,  /* 10s should be enough for max. 16 KiB of data */
+                                       &arm_algo);
 
-                       if (retval != ERROR_OK)
-                       {
+                       if (retval != ERROR_OK) {
                                LOG_ERROR("Execution of flash algorithm failed.");
                                target_free_all_working_areas(target);
                                retval = ERROR_FLASH_OPERATION_FAILED;
@@ -1461,38 +1299,32 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
                destroy_reg_param(&reg_params[3]);
                destroy_reg_param(&reg_params[4]);
                target_free_all_working_areas(target);
-       }
-       else
-       {
+       } else {
                /* Write to flash memory page-wise */
-               while ( count != 0 )
-               {
+               while (count != 0) {
                        /* How many bytes do we copy this time? */
                        num_bytes = (count >= FLASH_PAGE_SIZE) ?
-                                   FLASH_PAGE_SIZE - (offset % FLASH_PAGE_SIZE) :
-                                   count;
+                               FLASH_PAGE_SIZE - (offset % FLASH_PAGE_SIZE) :
+                               count;
 
                        /* Don't do anything with it if the page is in a secured sector. */
-                       if ( !bank->sectors[lpc2900_address2sector(bank, offset)].is_protected )
-                       {
+                       if (!bank->sectors[lpc2900_address2sector(bank, offset)].is_protected) {
                                /* Set latch load mode */
                                target_write_u32(target, FCTR,
-                                                FCTR_FS_CS | FCTR_FS_WRE | FCTR_FS_WEB);
+                                       FCTR_FS_CS | FCTR_FS_WRE | FCTR_FS_WEB);
 
                                /* Always clear the buffer (a little overhead, but who cares) */
                                memset(page, 0xFF, FLASH_PAGE_SIZE);
 
                                /* Copy them to the buffer */
-                               memcpy( &page[offset % FLASH_PAGE_SIZE],
-                                       &buffer[offset % FLASH_PAGE_SIZE],
-                                       num_bytes );
+                               memcpy(&page[offset % FLASH_PAGE_SIZE],
+                                       &buffer[offset % FLASH_PAGE_SIZE],
+                                       num_bytes);
 
                                /* Write whole page to flash data latches */
-                               if (target_write_memory(
-                                                target,
-                                                bank->base + (offset - (offset % FLASH_PAGE_SIZE)),
-                                                4, FLASH_PAGE_SIZE / 4, page) != ERROR_OK)
-                               {
+                               if (target_write_memory(target,
+                                               bank->base + (offset - (offset % FLASH_PAGE_SIZE)),
+                                               4, FLASH_PAGE_SIZE / 4, page) != ERROR_OK) {
                                        LOG_ERROR("Write failed @ 0x%8.8" PRIx32, offset);
                                        target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
@@ -1507,13 +1339,12 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
 
                                /* Trigger flash write */
                                target_write_u32(target, FCTR,
-                                   FCTR_FS_CS | FCTR_FS_WRE | FCTR_FS_WPB | FCTR_FS_PROGREQ);
+                                       FCTR_FS_CS | FCTR_FS_WRE | FCTR_FS_WPB | FCTR_FS_PROGREQ);
 
                                /* Wait for the end of the write operation. If it's not over
                                 * after one second, something went dreadfully wrong... :-(
                                 */
-                               if (lpc2900_wait_status(bank, INTSRC_END_OF_BURN, 1000) != ERROR_OK)
-                               {
+                               if (lpc2900_wait_status(bank, INTSRC_END_OF_BURN, 1000) != ERROR_OK) {
                                        LOG_ERROR("Write failed @ 0x%8.8" PRIx32, offset);
                                        target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
@@ -1536,7 +1367,6 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer,
        return retval;
 }
 
-
 /**
  * Try and identify the device.
  *
@@ -1552,25 +1382,21 @@ static int lpc2900_probe(struct flash_bank *bank)
        uint32_t offset;
 
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
        /* We want to do this only once. */
        if (lpc2900_info->is_probed)
-       {
                return ERROR_OK;
-       }
 
        /* Probing starts with reading the CHIPID register. We will continue only
         * if this identifies as an LPC2900 device.
         */
        target_read_u32(target, CHIPID, &lpc2900_info->chipid);
 
-       if (lpc2900_info->chipid != EXPECTED_CHIPID)
-       {
+       if (lpc2900_info->chipid != EXPECTED_CHIPID) {
                LOG_WARNING("Device is not an LPC29xx");
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -1593,13 +1419,10 @@ static int lpc2900_probe(struct flash_bank *bank)
 
        /* Determine maximum contiguous RAM block */
        lpc2900_info->max_ram_block = 16 * KiB;
-       if( (feat1 & 0x30) == 0x30 )
-       {
+       if ((feat1 & 0x30) == 0x30) {
                lpc2900_info->max_ram_block = 32 * KiB;
-               if( (feat1 & 0x0C) == 0x0C )
-               {
+               if ((feat1 & 0x0C) == 0x0C)
                        lpc2900_info->max_ram_block = 48 * KiB;
-               }
        }
 
        /* Determine package code and ITCM size */
@@ -1608,85 +1431,57 @@ static int lpc2900_probe(struct flash_bank *bank)
 
        /* Determine the exact type number. */
        uint32_t found = 1;
-       if ( (package_code == 4) && (itcm_code == 5) )
-       {
+       if ((package_code == 4) && (itcm_code == 5)) {
                /* Old LPC2917 or LPC2919 (non-/01 devices) */
                lpc2900_info->target_name = (bank->size == 768*KiB) ? "LPC2919" : "LPC2917";
-       }
-       else
-       {
-               if ( package_code == 2 )
-               {
+       } else {
+               if (package_code == 2) {
                        /* 100-pin package */
-                       if ( bank->size == 128*KiB )
-                       {
+                       if (bank->size == 128*KiB)
                                lpc2900_info->target_name = "LPC2921";
-                       }
-                       else if ( bank->size == 256*KiB )
-                       {
+                       else if (bank->size == 256*KiB)
                                lpc2900_info->target_name = "LPC2923";
-                       }
-                       else if ( bank->size == 512*KiB )
-                       {
+                       else if (bank->size == 512*KiB)
                                lpc2900_info->target_name = "LPC2925";
-                       }
                        else
-                       {
                                found = 0;
-                       }
-               }
-               else if ( package_code == 4 )
-               {
+               } else if (package_code == 4) {
                        /* 144-pin package */
-                       if ( (bank->size == 512*KiB) && (feat3 == 0xFFFFFCF0) )
-                       {
+                       if ((bank->size == 256*KiB) && (feat3 == 0xFFFFFFE9))
+                               lpc2900_info->target_name = "LPC2926";
+                       else if ((bank->size == 512*KiB) && (feat3 == 0xFFFFFCF0))
                                lpc2900_info->target_name = "LPC2917/01";
-                       }
-                       else if ( (bank->size == 512*KiB) && (feat3 == 0xFFFFFFF1) )
-                       {
+                       else if ((bank->size == 512*KiB) && (feat3 == 0xFFFFFFF1))
                                lpc2900_info->target_name = "LPC2927";
-                       }
-                       else if ( (bank->size == 768*KiB) && (feat3 == 0xFFFFFCF8) )
-                       {
+                       else if ((bank->size == 768*KiB) && (feat3 == 0xFFFFFCF8))
                                lpc2900_info->target_name = "LPC2919/01";
-                       }
-                       else if ( (bank->size == 768*KiB) && (feat3 == 0xFFFFFFF9) )
-                       {
+                       else if ((bank->size == 768*KiB) && (feat3 == 0xFFFFFFF9))
                                lpc2900_info->target_name = "LPC2929";
-                       }
                        else
-                       {
                                found = 0;
-                       }
-               }
-               else if ( package_code == 5 )
-               {
+               } else if (package_code == 5) {
                        /* 208-pin package */
                        lpc2900_info->target_name = (bank->size == 0) ? "LPC2930" : "LPC2939";
-               }
-               else
-               {
+               } else
                        found = 0;
-               }
        }
 
-       if ( !found )
-       {
-               LOG_WARNING("Unknown LPC29xx derivative");
+       if (!found) {
+               LOG_WARNING("Unknown LPC29xx derivative (FEATx="
+                       "%08" PRIx32 ":%08" PRIx32 ":%08" PRIx32 ":%08" PRIx32 ")",
+                       feat0, feat1, feat2, feat3);
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
        /* Show detected device */
-       LOG_INFO("Flash bank %d"
-                ": Device %s, %" PRIu32
-                " KiB in %d sectors",
-                bank->bank_number,
-                lpc2900_info->target_name, bank->size / KiB,
-                bank->num_sectors);
+       LOG_INFO("Flash bank %d: Device %s, %" PRIu32
+               " KiB in %d sectors",
+               bank->bank_number,
+               lpc2900_info->target_name, bank->size / KiB,
+               bank->num_sectors);
 
        /* Flashless devices cannot be handled */
-       if ( bank->num_sectors == 0 )
-       {
+       if (bank->num_sectors == 0) {
                LOG_WARNING("Flashless device cannot be handled");
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -1699,22 +1494,16 @@ static int lpc2900_probe(struct flash_bank *bank)
        bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
 
        offset = 0;
-       for (i = 0; i < bank->num_sectors; i++)
-       {
+       for (i = 0; i < bank->num_sectors; i++) {
                bank->sectors[i].offset = offset;
                bank->sectors[i].is_erased = -1;
                bank->sectors[i].is_protected = -1;
 
-               if ( i <= 7 )
-               {
+               if (i <= 7)
                        bank->sectors[i].size = 8 * KiB;
-               }
-               else if ( i <= 18 )
-               {
+               else if (i <= 18)
                        bank->sectors[i].size = 64 * KiB;
-               }
-               else
-               {
+               else {
                        /* We shouldn't come here. But there might be a new part out there
                         * that has more than 19 sectors. Politely ask for a fix then.
                         */
@@ -1728,8 +1517,7 @@ static int lpc2900_probe(struct flash_bank *bank)
        lpc2900_info->is_probed = true;
 
        /* Read sector security status */
-       if ( lpc2900_read_security_status(bank) != ERROR_OK )
-       {
+       if (lpc2900_read_security_status(bank) != ERROR_OK) {
                LOG_ERROR("Cannot determine sector security status");
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -1737,7 +1525,6 @@ static int lpc2900_probe(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-
 /**
  * Run a blank check for each sector.
  *
@@ -1750,8 +1537,7 @@ static int lpc2900_probe(struct flash_bank *bank)
 static int lpc2900_erase_check(struct flash_bank *bank)
 {
        uint32_t status = lpc2900_is_ready(bank);
-       if (status != ERROR_OK)
-       {
+       if (status != ERROR_OK) {
                LOG_INFO("Processor not halted/not probed");
                return status;
        }
@@ -1760,43 +1546,35 @@ static int lpc2900_erase_check(struct flash_bank *bank)
         * sector. Compare against the expected signature of an empty sector.
         */
        int sector;
-       for ( sector = 0; sector < bank->num_sectors; sector++ )
-       {
+       for (sector = 0; sector < bank->num_sectors; sector++) {
                uint32_t signature[4];
-               if ( (status = lpc2900_run_bist128( bank,
-                                                   bank->sectors[sector].offset,
-                                                   bank->sectors[sector].offset +
-                                                      (bank->sectors[sector].size - 1),
-                                                   &signature)) != ERROR_OK )
-               {
+               status = lpc2900_run_bist128(bank, bank->sectors[sector].offset,
+                               bank->sectors[sector].offset + (bank->sectors[sector].size - 1), &signature);
+               if (status != ERROR_OK)
                        return status;
-               }
 
                /* The expected signatures for an empty sector are different
                 * for 8 KiB and 64 KiB sectors.
                 */
-               if ( bank->sectors[sector].size == 8*KiB )
-               {
+               if (bank->sectors[sector].size == 8*KiB) {
                        bank->sectors[sector].is_erased =
-                           (signature[3] == 0x01ABAAAA) &&
-                           (signature[2] == 0xAAAAAAAA) &&
-                           (signature[1] == 0xAAAAAAAA) &&
-                           (signature[0] == 0xAAA00AAA);
+                               (signature[3] == 0x01ABAAAA) &&
+                               (signature[2] == 0xAAAAAAAA) &&
+                               (signature[1] == 0xAAAAAAAA) &&
+                               (signature[0] == 0xAAA00AAA);
                }
-               if ( bank->sectors[sector].size == 64*KiB )
-               {
+               if (bank->sectors[sector].size == 64*KiB) {
                        bank->sectors[sector].is_erased =
-                           (signature[3] == 0x11801222) &&
-                           (signature[2] == 0xB88844FF) &&
-                           (signature[1] == 0x11A22008) &&
-                           (signature[0] == 0x2B1BFE44);
+                               (signature[3] == 0x11801222) &&
+                               (signature[2] == 0xB88844FF) &&
+                               (signature[1] == 0x11A22008) &&
+                               (signature[0] == 0x2B1BFE44);
                }
        }
 
        return ERROR_OK;
 }
 
-
 /**
  * Get protection (sector security) status.
  *
@@ -1810,34 +1588,16 @@ static int lpc2900_protect_check(struct flash_bank *bank)
        return lpc2900_read_security_status(bank);
 }
 
-
-/**
- * Print info about the driver (not the device).
- *
- * @param bank Pointer to the flash bank descriptor
- * @param buf Buffer to take the string
- * @param buf_size Maximum number of characters that the buffer can take
- */
-static int lpc2900_info(struct flash_bank *bank, char *buf, int buf_size)
-{
-       snprintf(buf, buf_size, "lpc2900 flash driver");
-
-       return ERROR_OK;
-}
-
-
-struct flash_driver lpc2900_flash =
-{
-       .name               = "lpc2900",
-       .commands           = lpc2900_command_handlers,
+struct flash_driver lpc2900_flash = {
+       .name = "lpc2900",
+       .commands = lpc2900_command_handlers,
        .flash_bank_command = lpc2900_flash_bank_command,
-       .erase              = lpc2900_erase,
-       .protect            = lpc2900_protect,
-       .write              = lpc2900_write,
-       .read               = default_flash_read,
-       .probe              = lpc2900_probe,
-       .auto_probe         = lpc2900_probe,
-       .erase_check        = lpc2900_erase_check,
-       .protect_check      = lpc2900_protect_check,
-       .info               = lpc2900_info
+       .erase = lpc2900_erase,
+       .protect = lpc2900_protect,
+       .write = lpc2900_write,
+       .read = default_flash_read,
+       .probe = lpc2900_probe,
+       .auto_probe = lpc2900_probe,
+       .erase_check = lpc2900_erase_check,
+       .protect_check = lpc2900_protect_check,
 };

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)