X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Flpc2000.c;h=60d909f151a7fffda69186106d5f29fb7023b852;hp=09bb13f211b045c41432ce6600f8610c3a01a8ff;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=db094c2e60176b3c63ce788159b04a7024ad1010

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index 09bb13f211..60d909f151 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -424,7 +424,7 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command)
 {
 	struct lpc2000_flash_bank *lpc2000_info;
 
-	if (argc < 8)
+	if (CMD_ARGC < 8)
 	{
 		LOG_WARNING("incomplete flash_bank lpc2000 configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -469,7 +469,7 @@ FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command)
 	lpc2000_info->calc_checksum = 0;
 	lpc2000_build_sector_list(bank);
 
-	if (argc >= 9)
+	if (CMD_ARGC >= 9)
 	{
 		if (strcmp(args[8], "calc_checksum") == 0)
 			lpc2000_info->calc_checksum = 1;
@@ -573,7 +573,7 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 	{
 		if (offset >= bank->sectors[i].offset)
 			first_sector = i;
-		if (offset + CEIL(count, dst_min_alignment) * dst_min_alignment > bank->sectors[i].offset)
+		if (offset + DIV_ROUND_UP(count, dst_min_alignment) * dst_min_alignment > bank->sectors[i].offset)
 			last_sector = i;
 	}
 
@@ -744,13 +744,13 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command)
 	uint32_t result_table[4];
 	int status_code;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	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;