X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Flpc288x.c;h=513e2fcf353b039e9a6dd5018ec2b461f327029d;hb=86a7d813a165fda2816b8152342219b6c4ae2fc4;hp=152432e00551207e895b3c9557445c62a9828c95;hpb=278ca633da5c7c2d1979129d7db912b1f4784d98;p=openocd.git

diff --git a/src/flash/lpc288x.c b/src/flash/lpc288x.c
index 152432e005..513e2fcf35 100644
--- a/src/flash/lpc288x.c
+++ b/src/flash/lpc288x.c
@@ -88,15 +88,15 @@ static int lpc288x_register_commands(struct command_context_s *cmd_ctx);
 static int lpc288x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int lpc288x_erase(struct flash_bank_s *bank, int first, int last);
 static int lpc288x_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+static int lpc288x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 static int lpc288x_probe(struct flash_bank_s *bank);
 static int lpc288x_erase_check(struct flash_bank_s *bank);
 static int lpc288x_protect_check(struct flash_bank_s *bank);
 static int lpc288x_info(struct flash_bank_s *bank, char *buf, int buf_size);
-static u32 lpc288x_wait_status_busy(flash_bank_t *bank, int timeout);
+static uint32_t lpc288x_wait_status_busy(flash_bank_t *bank, int timeout);
 static void lpc288x_load_timer(int erase, struct target_s *target);
 static void lpc288x_set_flash_clk(struct flash_bank_s *bank);
-static u32 lpc288x_system_ready(struct flash_bank_s *bank);
+static uint32_t lpc288x_system_ready(struct flash_bank_s *bank);
 
 flash_driver_t lpc288x_flash =
 {
@@ -118,18 +118,18 @@ static int lpc288x_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-static u32 lpc288x_wait_status_busy(flash_bank_t *bank, int timeout)
+static uint32_t lpc288x_wait_status_busy(flash_bank_t *bank, int timeout)
 {
-	u32 status;
+	uint32_t status;
 	target_t *target = bank->target;
 	do
 	{
 		alive_sleep(1);
 		timeout--;
 		target_read_u32(target, F_STAT, &status);
-	}while (((status & FS_DONE) == 0) && timeout);
+	} while (((status & FS_DONE) == 0) && timeout);
 
-	if(timeout == 0)
+	if (timeout == 0)
 	{
 		LOG_DEBUG("Timedout!");
 		return ERROR_FLASH_OPERATION_FAILED;
@@ -142,10 +142,10 @@ static int lpc288x_read_part_info(struct flash_bank_s *bank)
 {
 	lpc288x_flash_bank_t *lpc288x_info = bank->driver_priv;
 	target_t *target = bank->target;
-	u32 cidr;
+	uint32_t cidr;
 
 	int i = 0;
-	u32 offset;
+	uint32_t offset;
 
 	if (lpc288x_info->cidr == 0x0102100A)
 		return ERROR_OK; /* already probed, multiple probes may cause memory leak, not allowed */
@@ -155,7 +155,7 @@ static int lpc288x_read_part_info(struct flash_bank_s *bank)
 
 	if (cidr != 0x0102100A)
 	{
-		LOG_WARNING("Cannot identify target as an LPC288X (%08X)",cidr);
+		LOG_WARNING("Cannot identify target as an LPC288X (%08" PRIx32 ")",cidr);
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
@@ -214,14 +214,14 @@ static int lpc288x_flash_bank_command(struct command_context_s *cmd_ctx, char *c
 	return ERROR_OK;
 }
 
-/* The frequency is the AHB clock frequency divided by (CLK_DIV ×3) + 1.
- * This must be programmed such that the Flash Programming clock frequency is 66 kHz ± 20%.
+/* The frequency is the AHB clock frequency divided by (CLK_DIV ×3) + 1.
+ * This must be programmed such that the Flash Programming clock frequency is 66 kHz ± 20%.
  * AHB = 12 MHz ?
  * 12000000/66000 = 182
  * CLK_DIV = 60 ? */
 static void lpc288x_set_flash_clk(struct flash_bank_s *bank)
 {
-	u32 clk_time;
+	uint32_t clk_time;
 	lpc288x_flash_bank_t *lpc288x_info = bank->driver_priv;
 	clk_time = (lpc288x_info->cclk / 66000) / 3;
 	target_write_u32(bank->target, F_CTRL, FC_CS | FC_WEN);
@@ -246,7 +246,7 @@ static void lpc288x_load_timer(int erase, struct target_s *target)
 	}
 }
 
-static u32 lpc288x_system_ready(struct flash_bank_s *bank)
+static uint32_t lpc288x_system_ready(struct flash_bank_s *bank)
 {
 	lpc288x_flash_bank_t *lpc288x_info = bank->driver_priv;
 	if (lpc288x_info->cidr == 0)
@@ -264,7 +264,7 @@ static u32 lpc288x_system_ready(struct flash_bank_s *bank)
 
 static int lpc288x_erase_check(struct flash_bank_s *bank)
 {
-	u32 status = lpc288x_system_ready(bank);	/* probed? halted? */
+	uint32_t status = lpc288x_system_ready(bank);	/* probed? halted? */
 	if (status != ERROR_OK)
 	{
 		LOG_INFO("Processor not halted/not probed");
@@ -276,7 +276,7 @@ static int lpc288x_erase_check(struct flash_bank_s *bank)
 
 static int lpc288x_erase(struct flash_bank_s *bank, int first, int last)
 {
-	u32 status;
+	uint32_t status;
 	int sector;
 	target_t *target = bank->target;
 
@@ -315,13 +315,13 @@ static int lpc288x_erase(struct flash_bank_s *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int lpc288x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	u8 page_buffer[FLASH_PAGE_SIZE];
-	u32 status, source_offset,dest_offset;
+	uint8_t page_buffer[FLASH_PAGE_SIZE];
+	uint32_t status, source_offset,dest_offset;
 	target_t *target = bank->target;
-	u32 bytes_remaining = count;
-	u32 first_sector, last_sector, sector, page;
+	uint32_t bytes_remaining = count;
+	uint32_t first_sector, last_sector, sector, page;
 	int i;
 
 	/* probed? halted? */
@@ -345,7 +345,7 @@ static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 			/* all writes must start on a sector boundary... */
 			if (offset % bank->sectors[i].size)
 			{
-				LOG_INFO("offset 0x%x breaks required alignment 0x%x", offset, bank->sectors[i].size);
+				LOG_INFO("offset 0x%" PRIx32 " breaks required alignment 0x%" PRIx32 "", offset, bank->sectors[i].size);
 				return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
 			}
 		}
@@ -360,7 +360,7 @@ static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 	/* Range check... */
 	if (first_sector == 0xffffffff || last_sector == 0xffffffff)
 	{
-		LOG_INFO("Range check failed %x %x", offset, count);
+		LOG_INFO("Range check failed %" PRIx32 " %" PRIx32 "", offset, count);
 		return ERROR_FLASH_DST_OUT_OF_BANK;
 	}
 
@@ -408,7 +408,7 @@ static int lpc288x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 #if 1
 			if (target_write_memory(target, offset + dest_offset, 4, 128, page_buffer) != ERROR_OK)
 			{
-				LOG_ERROR("Write failed s %x p %x", sector, page);
+				LOG_ERROR("Write failed s %" PRIx32 " p %" PRIx32 "", sector, page);
 				return ERROR_FLASH_OPERATION_FAILED;
 			}
 #else
@@ -463,7 +463,7 @@ static int lpc288x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 static int lpc288x_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
 	int lockregion, status;
-	u32 value;
+	uint32_t value;
 	target_t *target = bank->target;
 
 	/* probed? halted? */