X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Flpc288x.c;h=89f79e3213a665623a8693757238fa5525faa9a6;hb=9d745a0690f6f5c24d914ebfa3c1d6b824a19a5e;hp=2ecb5b2d425bcfee736f9dc1fa9214e16c563c12;hpb=9f0cba528a163645c8ecace413731c23310f2c26;p=openocd.git

diff --git a/src/flash/nor/lpc288x.c b/src/flash/nor/lpc288x.c
index 2ecb5b2d42..89f79e3213 100644
--- a/src/flash/nor/lpc288x.c
+++ b/src/flash/nor/lpc288x.c
@@ -15,7 +15,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.           *
  ***************************************************************************/
 
 /***************************************************************************
@@ -277,7 +277,7 @@ static int lpc288x_erase(struct flash_bank *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int lpc288x_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int lpc288x_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	uint8_t page_buffer[FLASH_PAGE_SIZE];
 	uint32_t status, source_offset, dest_offset;
@@ -350,22 +350,13 @@ static int lpc288x_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 			target_write_u32(target, F_CTRL, FC_CS | FC_SET_DATA | FC_WEN | FC_FUNC);
 
 			target_write_u32(target, F_CTRL, FC_CS | FC_WEN | FC_FUNC);
-			/*would be better to use the clean target_write_buffer() interface but
-			 * it seems not to be a LOT slower....
-			 * bulk_write_memory() is no quicker :(*/
-#if 1
-			if (target_write_memory(target, offset + dest_offset, 4, 128,
-					page_buffer) != ERROR_OK) {
-				LOG_ERROR("Write failed s %" PRIx32 " p %" PRIx32 "", sector, page);
-				return ERROR_FLASH_OPERATION_FAILED;
-			}
-#else
+
 			if (target_write_buffer(target, offset + dest_offset, FLASH_PAGE_SIZE,
 					page_buffer) != ERROR_OK) {
 				LOG_INFO("Write to flash buffer failed");
 				return ERROR_FLASH_OPERATION_FAILED;
 			}
-#endif
+
 			dest_offset += FLASH_PAGE_SIZE;
 			source_offset += count;
 			bytes_remaining -= count;
@@ -400,12 +391,6 @@ static int lpc288x_probe(struct flash_bank *bank)
 	return ERROR_OK;
 }
 
-static int lpc288x_info(struct flash_bank *bank, char *buf, int buf_size)
-{
-	snprintf(buf, buf_size, "lpc288x flash driver");
-	return ERROR_OK;
-}
-
 static int lpc288x_protect(struct flash_bank *bank, int set, int first, int last)
 {
 	int lockregion, status;
@@ -450,5 +435,4 @@ struct flash_driver lpc288x_flash = {
 	.auto_probe = lpc288x_probe,
 	.erase_check = lpc288x_erase_check,
 	.protect_check = lpc288x_protect_check,
-	.info = lpc288x_info,
 };