Pavel Chromy, the patch fixes an issue with PRESTO & FTD2XX under Linux.

[openocd] / src / flash / lpc2000.c

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index 2252ca42802bbcad94cdc0a500c72371077fad04..5d9781accf47cdf8f0c74c6c1dd470e629e331b7 100644 (file)
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -72,6 +72,7 @@ flash_driver_t lpc2000_flash =
        .protect = lpc2000_protect,
        .write = lpc2000_write,
        .probe = lpc2000_probe,
+       .auto_probe = lpc2000_probe,
        .erase_check = lpc2000_erase_check,
        .protect_check = lpc2000_protect_check,
        .info = lpc2000_info
@@ -90,7 +91,10 @@ int lpc2000_register_commands(struct command_context_s *cmd_ctx)
 int lpc2000_build_sector_list(struct flash_bank_s *bank)
 {
        lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
-
+       
+       /* default to a 4096 write buffer */
+       lpc2000_info->cmd51_max_buffer = 4096;
+       
        if (lpc2000_info->variant == 1)
        {
                int i = 0;
@@ -155,7 +159,12 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
                /* variant 2 has a uniform layout, only number of sectors differs */
                switch (bank->size)
                {
+                       case 4 * 1024:
+                               lpc2000_info->cmd51_max_buffer = 1024;
+                               num_sectors = 1;
+                               break;
                        case 8 * 1024:
+                               lpc2000_info->cmd51_max_buffer = 1024;
                                num_sectors = 2;
                                break;
                        case 16 * 1024:
@@ -185,7 +194,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
                
                bank->num_sectors = num_sectors;
                bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
-
+               
                for (i = 0; i < num_sectors; i++)
                {
                        if ((i >= 0) && (i < 8))
@@ -411,12 +420,7 @@ int lpc2000_erase(struct flash_bank_s *bank, int first, int last)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
-       
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
-       {
-               return ERROR_FLASH_SECTOR_INVALID;
-       }
-       
+
        param_table[0] = first;
        param_table[1] = last;
        param_table[2] = lpc2000_info->cclk;
@@ -481,9 +485,9 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        /* allocate a working area */
-       if (target_alloc_working_area(target, 4096, &download_area) != ERROR_OK)
+       if (target_alloc_working_area(target, lpc2000_info->cmd51_max_buffer, &download_area) != ERROR_OK)
        {
                ERROR("no working area specified, can't write LPC2000 internal flash");
                return ERROR_FLASH_OPERATION_FAILED;
@@ -532,8 +536,8 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        while (bytes_remaining > 0)
        {
                u32 thisrun_bytes;
-               if (bytes_remaining >= 4096)
-                       thisrun_bytes = 4096;
+               if (bytes_remaining >= lpc2000_info->cmd51_max_buffer)
+                       thisrun_bytes = lpc2000_info->cmd51_max_buffer;
                else if (bytes_remaining >= 1024)
                        thisrun_bytes = 1024;
                else if ((bytes_remaining >= 512) || (!lpc2000_info->cmd51_can_256b))
@@ -651,12 +655,10 @@ int lpc2000_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd,
        u32 param_table[5];
        u32 result_table[2];
        int status_code;
-       lpc2000_flash_bank_t *lpc2000_info;
 
        if (argc < 1)
        {
-               command_print(cmd_ctx, "usage: lpc2000 part_id <num>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
        
        bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
@@ -666,7 +668,6 @@ int lpc2000_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd,
                return ERROR_OK;
        }
 
-       lpc2000_info = bank->driver_priv;
        if (bank->target->state != TARGET_HALTED)
        {
                return ERROR_TARGET_NOT_HALTED;