X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnand_ecc.c;h=c154d6979898841730bcff583068b8ffaff789b4;hb=ee4723c494fb9cd8deefdbf5387f0ba31ea57c65;hp=91dd8c6b8f44f3c6eef299bb7d255856b92266c8;hpb=9646f21ad8288f8a4fa6d260e949e599f3978939;p=openocd.git

diff --git a/src/flash/nand_ecc.c b/src/flash/nand_ecc.c
index 91dd8c6b8f..c154d69798 100644
--- a/src/flash/nand_ecc.c
+++ b/src/flash/nand_ecc.c
@@ -41,16 +41,12 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include <inttypes.h>
-
 #include "nand.h"
 
 /*
  * Pre-calculated 256-way 1 byte column parity
  */
-static const u8 nand_ecc_precalc_table[] = {
+static const uint8_t nand_ecc_precalc_table[] = {
 	0x00, 0x55, 0x56, 0x03, 0x59, 0x0c, 0x0f, 0x5a, 0x5a, 0x0f, 0x0c, 0x59, 0x03, 0x56, 0x55, 0x00,
 	0x65, 0x30, 0x33, 0x66, 0x3c, 0x69, 0x6a, 0x3f, 0x3f, 0x6a, 0x69, 0x3c, 0x66, 0x33, 0x30, 0x65,
 	0x66, 0x33, 0x30, 0x65, 0x3f, 0x6a, 0x69, 0x3c, 0x3c, 0x69, 0x6a, 0x3f, 0x65, 0x30, 0x33, 0x66,
@@ -72,24 +68,24 @@ static const u8 nand_ecc_precalc_table[] = {
 /*
  * nand_calculate_ecc - Calculate 3-byte ECC for 256-byte block
  */
-int nand_calculate_ecc(struct nand_device_s *device, const u8 *dat, u8 *ecc_code)
+int nand_calculate_ecc(struct nand_device_s *device, const uint8_t *dat, uint8_t *ecc_code)
 {
-	u8 idx, reg1, reg2, reg3, tmp1, tmp2;
+	uint8_t idx, reg1, reg2, reg3, tmp1, tmp2;
 	int i;
 
 	/* Initialize variables */
 	reg1 = reg2 = reg3 = 0;
 
 	/* Build up column parity */
-	for(i = 0; i < 256; i++) {
+	for (i = 0; i < 256; i++) {
 		/* Get CP0 - CP5 from table */
 		idx = nand_ecc_precalc_table[*dat++];
 		reg1 ^= (idx & 0x3f);
 
 		/* All bit XOR = 1 ? */
 		if (idx & 0x40) {
-			reg3 ^= (u8) i;
-			reg2 ^= ~((u8) i);
+			reg3 ^= (uint8_t) i;
+			reg2 ^= ~((uint8_t) i);
 		}
 	}