X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Flpc2000.c;h=ea8c5b6919b30b759ab8061474ac623d1e216919;hb=2e160c6bad640297e4e8473b07ecff587c633e27;hp=5d9781accf47cdf8f0c74c6c1dd470e629e331b7;hpb=86ca2270f40d650a849e778518e7aa9c2c713341;p=openocd

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index 5d9781ac..ea8c5b69 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -146,7 +146,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
 		}
 		else
 		{
-			ERROR("BUG: unknown bank->size encountered");
+			LOG_ERROR("BUG: unknown bank->size encountered");
 			exit(-1);
 		}
 	}
@@ -187,7 +187,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
 				num_sectors = 27;
 				break;
 			default:
-				ERROR("BUG: unknown bank->size encountered");
+				LOG_ERROR("BUG: unknown bank->size encountered");
 				exit(-1);
 				break;
 		}
@@ -225,7 +225,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
 	}
 	else
 	{
-		ERROR("BUG: unknown lpc2000_info->variant encountered");
+		LOG_ERROR("BUG: unknown lpc2000_info->variant encountered");
 		exit(-1);
 	}
 	
@@ -241,6 +241,7 @@ int lpc2000_build_sector_list(struct flash_bank_s *bank)
  */
 int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u32 result_table[2])
 {
+	int retval;
 	lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
 	target_t *target = bank->target;
 	mem_param_t mem_params[2];
@@ -256,14 +257,17 @@ int lpc2000_iap_call(flash_bank_t *bank, int code, u32 param_table[5], u32 resul
 		/* make sure we have a working area */
 		if (target_alloc_working_area(target, 172, &lpc2000_info->iap_working_area) != ERROR_OK)
 		{
-			ERROR("no working area specified, can't write LPC2000 internal flash");
+			LOG_ERROR("no working area specified, can't write LPC2000 internal flash");
 			return ERROR_FLASH_OPERATION_FAILED;
 		}
 		
 		/* write IAP code to working area */
 		target_buffer_set_u32(target, jump_gate, ARMV4_5_BX(12));
 		target_buffer_set_u32(target, jump_gate + 4, ARMV4_5_B(0xfffffe, 0));
-		target->type->write_memory(target, lpc2000_info->iap_working_area->address, 4, 2, jump_gate);
+		if((retval = target->type->write_memory(target, lpc2000_info->iap_working_area->address, 4, 2, jump_gate)) != ERROR_OK)
+		{
+			return retval;
+		}
 	}
 	
 	armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
@@ -351,7 +355,7 @@ int lpc2000_iap_blank_check(struct flash_bank_s *bank, int first, int last)
 				return ERROR_FLASH_BUSY;
 				break;
 			default:
-				ERROR("BUG: unknown LPC2000 status code");
+				LOG_ERROR("BUG: unknown LPC2000 status code");
 				exit(-1);
 		}
 	}
@@ -367,7 +371,7 @@ int lpc2000_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, cha
 	
 	if (argc < 8)
 	{
-		WARNING("incomplete flash_bank lpc2000 configuration");
+		LOG_WARNING("incomplete flash_bank lpc2000 configuration");
 		return ERROR_FLASH_BANK_INVALID;
 	}
 	
@@ -390,7 +394,7 @@ int lpc2000_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, cha
 	}
 	else
 	{
-		ERROR("unknown LPC2000 variant");
+		LOG_ERROR("unknown LPC2000 variant");
 		free(lpc2000_info);
 		return ERROR_FLASH_BANK_INVALID;
 	}
@@ -418,6 +422,7 @@ int lpc2000_erase(struct flash_bank_s *bank, int first, int last)
 	
 	if (bank->target->state != TARGET_HALTED)
 	{
+		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
@@ -437,7 +442,7 @@ int lpc2000_erase(struct flash_bank_s *bank, int first, int last)
 			return ERROR_FLASH_SECTOR_INVALID;
 			break;
 		default:
-			WARNING("lpc2000 prepare sectors returned %i", status_code);
+			LOG_WARNING("lpc2000 prepare sectors returned %i", status_code);
 			return ERROR_FLASH_OPERATION_FAILED;
 	}
 	
@@ -453,7 +458,7 @@ int lpc2000_erase(struct flash_bank_s *bank, int first, int last)
 			return ERROR_FLASH_SECTOR_INVALID;
 			break;
 		default:
-			WARNING("lpc2000 erase sectors returned %i", status_code);
+			LOG_WARNING("lpc2000 erase sectors returned %i", status_code);
 			return ERROR_FLASH_OPERATION_FAILED;
 	}
 	
@@ -480,22 +485,17 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 	int status_code;
 	int i;
 	working_area_t *download_area;
+	int retval = ERROR_OK;
 		 
 	if (bank->target->state != TARGET_HALTED)
 	{
+		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
-
-	/* allocate a working area */
-	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;
-	}
 	
 	if (offset + count > bank->size)
 		return ERROR_FLASH_DST_OUT_OF_BANK;
-	
+		
 	if (lpc2000_info->cmd51_can_256b)
 		dst_min_alignment = 256;
 	else
@@ -503,7 +503,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 	
 	if (offset % dst_min_alignment)
 	{
-		WARNING("offset 0x%x breaks required alignment 0x%x", offset, dst_min_alignment);
+		LOG_WARNING("offset 0x%x breaks required alignment 0x%x", offset, dst_min_alignment);
 		return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
 	}
 	
@@ -515,7 +515,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 			last_sector = i;
 	}
 	
-	DEBUG("first_sector: %i, last_sector: %i", first_sector, last_sector);
+	LOG_DEBUG("first_sector: %i, last_sector: %i", first_sector, last_sector);
 
 	/* check if exception vectors should be flashed */
 	if ((offset == 0) && (count >= 0x20) && lpc2000_info->calc_checksum)
@@ -524,15 +524,22 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 		int i = 0;
 		for (i = 0; i < 8; i++)
 		{
-			DEBUG("0x%2.2x: 0x%8.8x", i * 4, buf_get_u32(buffer + (i * 4), 0, 32));
+			LOG_DEBUG("0x%2.2x: 0x%8.8x", i * 4, buf_get_u32(buffer + (i * 4), 0, 32));
 			if (i != 5)
 				checksum += buf_get_u32(buffer + (i * 4), 0, 32);
 		}
 		checksum = 0 - checksum;
-		DEBUG("checksum: 0x%8.8x", checksum);
+		LOG_DEBUG("checksum: 0x%8.8x", checksum);
 		buf_set_u32(buffer + 0x14, 0, 32, checksum);
 	}
 	
+	/* allocate a working area */
+	if (target_alloc_working_area(target, lpc2000_info->cmd51_max_buffer, &download_area) != ERROR_OK)
+	{
+		LOG_ERROR("no working area specified, can't write LPC2000 internal flash");
+		return ERROR_FLASH_OPERATION_FAILED;
+	}
+	
 	while (bytes_remaining > 0)
 	{
 		u32 thisrun_bytes;
@@ -552,23 +559,29 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 		switch (status_code)
 		{
 			case ERROR_FLASH_OPERATION_FAILED:
-				return ERROR_FLASH_OPERATION_FAILED;
+				retval = ERROR_FLASH_OPERATION_FAILED;
+				break;
 			case LPC2000_CMD_SUCCESS:
 				break;
 			case LPC2000_INVALID_SECTOR:
-				return ERROR_FLASH_SECTOR_INVALID;
+				retval = ERROR_FLASH_SECTOR_INVALID;
 				break;
 			default:
-				WARNING("lpc2000 prepare sectors returned %i", status_code);
-				return ERROR_FLASH_OPERATION_FAILED;
+				LOG_WARNING("lpc2000 prepare sectors returned %i", status_code);
+				retval = ERROR_FLASH_OPERATION_FAILED;
+				break;
 		}
+
+		/* Exit if error occured */
+		if (retval != ERROR_OK)
+			break;
 		
 		if (bytes_remaining >= thisrun_bytes)
 		{
-			if (target_write_buffer(bank->target, download_area->address, thisrun_bytes, buffer + bytes_written) != ERROR_OK)
+			if ((retval = target_write_buffer(bank->target, download_area->address, thisrun_bytes, buffer + bytes_written)) != ERROR_OK)
 			{
-				target_free_working_area(target, download_area);
-				return ERROR_FLASH_OPERATION_FAILED;
+				retval = ERROR_FLASH_OPERATION_FAILED;
+				break;
 			}
 		}
 		else
@@ -582,7 +595,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 			free(last_buffer);
 		}
 		
-		DEBUG("writing 0x%x bytes to address 0x%x", thisrun_bytes, bank->base + offset + bytes_written);
+		LOG_DEBUG("writing 0x%x bytes to address 0x%x", thisrun_bytes, bank->base + offset + bytes_written);
 		
 		/* Write data */
 		param_table[0] = bank->base + offset + bytes_written;
@@ -593,17 +606,23 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 		switch (status_code)
 		{
 			case ERROR_FLASH_OPERATION_FAILED:
-				return ERROR_FLASH_OPERATION_FAILED;
+				retval = ERROR_FLASH_OPERATION_FAILED;
+				break;
 			case LPC2000_CMD_SUCCESS:
 				break;
 			case LPC2000_INVALID_SECTOR:
-				return ERROR_FLASH_SECTOR_INVALID;
+				retval = ERROR_FLASH_SECTOR_INVALID;
 				break;
 			default:
-				WARNING("lpc2000 returned %i", status_code);
-				return ERROR_FLASH_OPERATION_FAILED;
+				LOG_WARNING("lpc2000 returned %i", status_code);
+				retval = ERROR_FLASH_OPERATION_FAILED;
+				break;
 		}
 		
+		/* Exit if error occured */
+		if (retval != ERROR_OK)
+			break;
+		
 		if (bytes_remaining > thisrun_bytes)
 			bytes_remaining -= thisrun_bytes;
 		else
@@ -613,7 +632,7 @@ int lpc2000_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 	
 	target_free_working_area(target, download_area);
 	
-	return ERROR_OK;
+	return retval;
 }
 
 int lpc2000_probe(struct flash_bank_s *bank)
@@ -628,6 +647,7 @@ int lpc2000_erase_check(struct flash_bank_s *bank)
 {
 	if (bank->target->state != TARGET_HALTED)
 	{
+		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 	
@@ -670,6 +690,7 @@ int lpc2000_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd,
 
 	if (bank->target->state != TARGET_HALTED)
 	{
+		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}