X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Flpc2900.c;h=dc916689d00ddff03a1627de04b63cdec9317734;hp=556a1512474ec7801ee6c17ac82f500f68f3d18f;hb=51862bb98c26e9b3f03d46ae0f8ceb434f0743d0;hpb=dd47bba6f8c50d202ce716173f8f647dd3f77f49

diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 556a151247..dc916689d0 100644
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -27,6 +27,7 @@
 #include "flash.h"
 #include "binarybuffer.h"
 #include "armv4_5.h"
+#include "algorithm.h"
 
 
 /* 1024 bytes */
@@ -543,7 +544,7 @@ COMMAND_HANDLER(lpc2900_handle_signature_command)
 	}
 
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -588,7 +589,7 @@ COMMAND_HANDLER(lpc2900_handle_read_custom_command)
 	}
 
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -630,7 +631,7 @@ COMMAND_HANDLER(lpc2900_handle_read_custom_command)
 		return ret;
 	}
 
-	uint32_t nwritten;
+	size_t nwritten;
 	ret = fileio_write( &fileio, sizeof(customer),
                         (const uint8_t *)customer, &nwritten );
 	if( ret != ERROR_OK )
@@ -659,7 +660,7 @@ COMMAND_HANDLER(lpc2900_handle_password_command)
 	}
 
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -694,7 +695,7 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
 	}
 
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -754,7 +755,7 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
 	/* Page 4 */
 	uint32_t offset = ISS_CUSTOMER_START1 % FLASH_PAGE_SIZE;
 	memset( page, 0xff, FLASH_PAGE_SIZE );
-	uint32_t size_read;
+	size_t size_read;
 	retval = image_read_section( &image, 0, 0,
 	                             ISS_CUSTOMER_SIZE1, &page[offset], &size_read);
 	if( retval != ERROR_OK )
@@ -805,7 +806,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
 
 	/* Get the bank descriptor */
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -904,7 +905,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
 
 	/* Get the bank descriptor */
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;