flash: Constify write buffer

[openocd] / src / flash / nor / em357.c

diff --git a/src/flash/nor/em357.c b/src/flash/nor/em357.c
index cbb71fc0629524b76c1aea5719a505849b25187f..70a5431ac68880b2827bbc1984a4db091edd6d3e 100644 (file)
--- a/src/flash/nor/em357.c
+++ b/src/flash/nor/em357.c
@@ -21,7 +21,7 @@
  *   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
@@ -358,6 +358,9 @@ static int em357_erase(struct flash_bank *bank, int first, int last)
        if ((first == 0) && (last == (bank->num_sectors - 1)))
                return em357_mass_erase(bank);
 
+       /* Enable FPEC clock */
+       target_write_u32(target, EM357_FPEC_CLK, 0x00000001);
+
        /* unlock flash registers */
        int retval = target_write_u32(target, EM357_FLASH_KEYR, KEY1);
        if (retval != ERROR_OK)
@@ -452,7 +455,7 @@ static int em357_protect(struct flash_bank *bank, int set, int first, int last)
        return em357_write_options(bank);
 }
 
-static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int em357_write_block(struct flash_bank *bank, const uint8_t *buffer,
        uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -502,7 +505,7 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
        ;
 
        retval = target_write_buffer(target, write_algorithm->address,
-                       sizeof(em357_flash_write_code), (uint8_t *)em357_flash_write_code);
+                       sizeof(em357_flash_write_code), em357_flash_write_code);
        if (retval != ERROR_OK)
                return retval;
 
@@ -519,7 +522,6 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
        }
-       ;
 
        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
        armv7m_info.core_mode = ARM_MODE_THREAD;
@@ -581,7 +583,7 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer,
        return retval;
 }
 
-static int em357_write(struct flash_bank *bank, uint8_t *buffer,
+static int em357_write(struct flash_bank *bank, const uint8_t *buffer,
        uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -609,6 +611,8 @@ static int em357_write(struct flash_bank *bank, uint8_t *buffer,
        if (retval != ERROR_OK)
                return retval;
 
+       target_write_u32(target, EM357_FPEC_CLK, 0x00000001);
+
        /* multiple half words (2-byte) to be programmed? */
        if (words_remaining > 0) {
                /* try using a block write */
@@ -680,14 +684,40 @@ static int em357_probe(struct flash_bank *bank)
 
        em357_info->probed = 0;
 
+       switch (bank->size) {
+               case 0x10000:
+                       /* 64k -- 64 1k pages */
+                       num_pages = 64;
+                       page_size = 1024;
+                       break;
+               case 0x20000:
+                       /* 128k -- 128 1k pages */
+                       num_pages = 128;
+                       page_size = 1024;
+                       break;
+               case 0x30000:
+                       /* 192k -- 96 2k pages */
+                       num_pages = 96;
+                       page_size = 2048;
+                       break;
+               case 0x40000:
+                       /* 256k -- 128 2k pages */
+                       num_pages = 128;
+                       page_size = 2048;
+                       break;
+               default:
+                       LOG_WARNING("No size specified for em357 flash driver, assuming 192k!");
+                       num_pages = 96;
+                       page_size = 2048;
+                       break;
+       }
+
        /* Enable FPEC CLK */
        int retval = target_write_u32(target, EM357_FPEC_CLK, 0x00000001);
        if (retval != ERROR_OK)
                return retval;
 
-       page_size = 2048;
        em357_info->ppage_size = 4;
-       num_pages = 96;
 
        LOG_INFO("flash size = %dkbytes", num_pages*page_size/1024);
 
@@ -721,13 +751,6 @@ static int em357_auto_probe(struct flash_bank *bank)
        return em357_probe(bank);
 }
 
-
-static int get_em357_info(struct flash_bank *bank, char *buf, int buf_size)
-{
-       snprintf(buf, buf_size, "em357\n");
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(em357_handle_lock_command)
 {
        struct target *target = NULL;
@@ -813,6 +836,9 @@ static int em357_mass_erase(struct flash_bank *bank)
                return ERROR_TARGET_NOT_HALTED;
        }
 
+       /* Make sure the flash clock is on */
+       target_write_u32(target, EM357_FPEC_CLK, 0x00000001);
+
        /* unlock option flash registers */
        int retval = target_write_u32(target, EM357_FLASH_KEYR, KEY1);
        if (retval != ERROR_OK)
@@ -913,5 +939,4 @@ struct flash_driver em357_flash = {
        .auto_probe = em357_auto_probe,
        .erase_check = default_flash_blank_check,
        .protect_check = em357_protect_check,
-       .info = get_em357_info,
 };