X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fnuc1x.c;h=3f39a05eed129a3e61dc2629d0d254580d322a15;hp=a5a14c8b6b49511d9c10809b346d64205fa79f64;hb=f618725e1a857838bc4ad4488522b3751265ff72;hpb=5871dd1bd0f409ac4d6c4ac3dacf312731a7a0a3

diff --git a/src/flash/nor/nuc1x.c b/src/flash/nor/nuc1x.c
index a5a14c8b6b..3f39a05eed 100644
--- a/src/flash/nor/nuc1x.c
+++ b/src/flash/nor/nuc1x.c
@@ -76,7 +76,7 @@
 #define LOCK 0x00
 
 /* part structs */
-static struct {
+static const struct {
 	const char *partname;
 	uint32_t partno;
 	uint16_t num_page;
@@ -328,7 +328,7 @@ static int nuc1x_erase(struct flash_bank *bank, int first, int last)
 		return retval;
 
 	for (i = first; i <= last; i++) {
-		LOG_DEBUG("erasing sector %d at addresss 0x%" PRIx32 "", i, bank->base + bank->sectors[i].offset);
+		LOG_DEBUG("erasing sector %d at address 0x%" PRIx32 "", i, bank->base + bank->sectors[i].offset);
 		retval = target_write_u32(target, NUC1X_FLASH_ISPADR, bank->base + bank->sectors[i].offset);
 		if (retval != ERROR_OK)
 			return retval;
@@ -378,7 +378,7 @@ static int nuc1x_erase(struct flash_bank *bank, int first, int last)
 }
 
 /* The write routine stub. */
-static int nuc1x_write(struct flash_bank *bank, uint8_t *buffer,
+static int nuc1x_write(struct flash_bank *bank, const uint8_t *buffer,
 		uint32_t offset, uint32_t count)
 {
 	struct target *target = bank->target;
@@ -389,7 +389,7 @@ static int nuc1x_write(struct flash_bank *bank, uint8_t *buffer,
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	LOG_INFO("Novoton NUC: FLASH Write ...");
+	LOG_INFO("Nuvoton NUC: FLASH Write ...");
 
 	int retval = nuc1x_reset2lprom(bank);
 	if (retval != ERROR_OK)
@@ -410,7 +410,7 @@ static int nuc1x_write(struct flash_bank *bank, uint8_t *buffer,
 	/* program command */
 	for (i = 0; i < count; i += 4) {
 
-		LOG_DEBUG("write longword @ %08X", offset + i);
+		LOG_DEBUG("write longword @ %08" PRIX32, (uint32_t)(offset + i));
 
 		uint8_t padding[4] = {0xff, 0xff, 0xff, 0xff};
 		memcpy(padding, buffer + i, MIN(4, count-i));
@@ -452,7 +452,7 @@ static int nuc1x_write(struct flash_bank *bank, uint8_t *buffer,
 			if (retval != ERROR_OK)
 				return retval;
 		} else {
-			LOG_DEBUG("writed OK");
+			LOG_DEBUG("Write OK");
 		}
 	}
 
@@ -495,7 +495,7 @@ static int nuc1x_probe(struct flash_bank *bank)
 	}
 	if (!(NuMicroParts[i].partno == 0x00000000)) {
 		LOG_INFO("DeviceID : 0x%08" PRIx32 "", device_id);
-		LOG_INFO("Detect %s%CN!", NuMicroParts[i].partname, ('A'+(device_id>>28)));
+		LOG_INFO("Detect %s%cN!", NuMicroParts[i].partname, (char)('A'+(device_id>>28)));
 	} else {
 		LOG_INFO("No NUC Device Detected...");
 		return ERROR_FAIL;
@@ -520,7 +520,7 @@ static int nuc1x_probe(struct flash_bank *bank)
 
 	nuc1x_info->probed = 1;
 
-	LOG_DEBUG("Novoton NUC: Probed ...");
+	LOG_DEBUG("Nuvoton NUC: Probed ...");
 
 	return ERROR_OK;
 }
@@ -552,7 +552,7 @@ static int get_nuc1x_info(struct flash_bank *bank, char *buf, int buf_size)
 	}
 	if (!(NuMicroParts[i].partno == 0x00000000)) {
 		LOG_INFO("DeviceID : 0x%08" PRIx32 "", device_id);
-		LOG_INFO("Detect %s%CN!", NuMicroParts[i].partname, ('A'+(device_id>>28)));
+		LOG_INFO("Detect %s%cN!", NuMicroParts[i].partname, (char)('A'+(device_id>>28)));
 	} else {
 		LOG_INFO("No NUC Device Detected...");
 		return ERROR_FAIL;
@@ -574,7 +574,7 @@ static int nuc1x_mass_erase(struct flash_bank *bank)
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	LOG_INFO("Novoton NUC: Chip Erase ... (may take several seconds)");
+	LOG_INFO("Nuvoton NUC: Chip Erase ... (may take several seconds)");
 
 	return retval;
 }