X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Focl.c;h=17b57a87d094233e61554bf19b30bbaa77789f9e;hp=21ff8b7c3ad394abab9b3c40321848dfdf729820;hb=84df52f9ea78e2d71bde648a16b69d80404c6421;hpb=1840226d555b9863a2315bcc6218671fdfa2af32

diff --git a/src/flash/ocl.c b/src/flash/ocl.c
index 21ff8b7c3a..17b57a87d0 100644
--- a/src/flash/ocl.c
+++ b/src/flash/ocl.c
@@ -145,9 +145,9 @@ static int ocl_erase(struct flash_bank_s *bank, int first, int last)
 	if (dcc_buffer[1] != OCL_CMD_DONE)
 	{
 		if (dcc_buffer[0] == OCL_ERASE_ALL)
-			LOG_ERROR("loader response to OCL_ERASE_ALL 0x%08X", dcc_buffer[1]);
+			LOG_ERROR("loader response to OCL_ERASE_ALL 0x%08" PRIx32 "", dcc_buffer[1]);
 		else
-			LOG_ERROR("loader response to OCL_ERASE_BLOCK 0x%08X", dcc_buffer[1]);
+			LOG_ERROR("loader response to OCL_ERASE_BLOCK 0x%08" PRIx32 "", dcc_buffer[1]);
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
@@ -172,7 +172,7 @@ static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset
 	int i;
 
 	/* check preconditions */
-	if (ocl->buflen == 0 || ocl->bufalign==0)
+	if (ocl->buflen == 0 || ocl->bufalign == 0)
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	if (bank->target->state != TARGET_RUNNING)
@@ -200,7 +200,7 @@ static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset
 		chksum = OCL_CHKS_INIT;
 
 		/* copy data to DCC buffer in proper byte order and properly aligned */
-		for (i=0; i<runlen; i++)
+		for (i = 0; i<runlen; i++)
 		{
 			switch (byteofs++)
 			{
@@ -208,13 +208,13 @@ static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset
 					*dcc_bufptr &= *(buffer++) | 0xffffff00;
 					break;
 				case 1:
-					*dcc_bufptr &= ((*(buffer++))<<8) | 0xffff00ff;
+					*dcc_bufptr &= ((*(buffer++)) << 8) | 0xffff00ff;
 					break;
 				case 2:
-					*dcc_bufptr &= ((*(buffer++))<<16) | 0xff00ffff;
+					*dcc_bufptr &= ((*(buffer++)) << 16) | 0xff00ffff;
 					break;
 				case 3:
-					*dcc_bufptr &= ((*(buffer++))<<24) | 0x00ffffff;
+					*dcc_bufptr &= ((*(buffer++)) << 24) | 0x00ffffff;
 					chksum ^= *(dcc_bufptr++);
 					*dcc_bufptr = 0xffffffff;
 					byteofs = 0;
@@ -253,7 +253,7 @@ static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset
 
 		if (dcc_buffer[0] != OCL_CMD_DONE)
 		{
-			LOG_ERROR("loader response to OCL_FLASH_BLOCK 0x%08X", dcc_buffer[0]);
+			LOG_ERROR("loader response to OCL_FLASH_BLOCK 0x%08" PRIx32 "", dcc_buffer[0]);
 			free(dcc_buffer);
 			return ERROR_FLASH_OPERATION_FAILED;
 		}
@@ -295,7 +295,7 @@ static int ocl_probe(struct flash_bank_s *bank)
 
 	if (dcc_buffer[0] != OCL_CMD_DONE)
 	{
-		LOG_ERROR("loader response to OCL_PROBE 0x%08X", dcc_buffer[0]);
+		LOG_ERROR("loader response to OCL_PROBE 0x%08" PRIx32 "", dcc_buffer[0]);
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
@@ -332,7 +332,7 @@ static int ocl_probe(struct flash_bank_s *bank)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 	sectsize = bank->size / bank->num_sectors;
-	for (i=0; i<bank->num_sectors; i++)
+	for (i = 0; i<bank->num_sectors; i++)
 	{
 		bank->sectors[i].offset = i * sectsize;
 		bank->sectors[i].size = sectsize;
@@ -373,7 +373,7 @@ static int ocl_auto_probe(struct flash_bank_s *bank)
 {
 	ocl_priv_t *ocl = bank->driver_priv;
 
-	if (ocl->buflen == 0 || ocl->bufalign==0)
+	if (ocl->buflen == 0 || ocl->bufalign == 0)
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	return ERROR_OK;