flasrom update from Stefan, resovle issue 21

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2111 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 18 insertions, 18 deletions

diff --git a/util/flashrom/m29f400bt.h b/util/flashrom/m29f400bt.h
index efe0953701..30a7ee800d 100644
--- a/util/flashrom/m29f400bt.h
+++ b/util/flashrom/m29f400bt.h
@@ -5,15 +5,15 @@
 
 extern int probe_m29f400bt(struct flashchip *flash);
 extern int erase_m29f400bt(struct flashchip *flash);
-extern int block_erase_m29f400bt(volatile char *bios, volatile char *dst);
-extern int write_m29f400bt(struct flashchip *flash, unsigned char *buf);
+extern int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst);
+extern int write_m29f400bt(struct flashchip *flash, uint8_t *buf);
 extern int write_linuxbios_m29f400bt(struct flashchip *flash,
-				     unsigned char *buf);
+				     uint8_t *buf);
 
-extern __inline__ void toggle_ready_m29f400bt(volatile char *dst)
+extern __inline__ void toggle_ready_m29f400bt(volatile uint8_t *dst)
 {
 	unsigned int i = 0;
-	char tmp1, tmp2;
+	uint8_t tmp1, tmp2;
 
 	tmp1 = *dst & 0x40;
 
@@ -26,11 +26,11 @@ extern __inline__ void toggle_ready_m29f400bt(volatile char *dst)
 	}
 }
 
-extern __inline__ void data_polling_m29f400bt(volatile char *dst,
-					      unsigned char data)
+extern __inline__ void data_polling_m29f400bt(volatile uint8_t *dst,
+					      uint8_t data)
 {
 	unsigned int i = 0;
-	char tmp;
+	uint8_t tmp;
 
 	data &= 0x80;
 
@@ -42,25 +42,25 @@ extern __inline__ void data_polling_m29f400bt(volatile char *dst,
 	}
 }
 
-extern __inline__ void protect_m29f400bt(volatile char *bios)
+extern __inline__ void protect_m29f400bt(volatile uint8_t *bios)
 {
-	*(volatile char *) (bios + 0xAAA) = 0xAA;
-	*(volatile char *) (bios + 0x555) = 0x55;
-	*(volatile char *) (bios + 0xAAA) = 0xA0;
+	*(volatile uint8_t *) (bios + 0xAAA) = 0xAA;
+	*(volatile uint8_t *) (bios + 0x555) = 0x55;
+	*(volatile uint8_t *) (bios + 0xAAA) = 0xA0;
 
 	usleep(200);
 }
 
-extern __inline__ void write_page_m29f400bt(volatile char *bios, char *src,
-					    volatile char *dst,
+extern __inline__ void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src,
+					    volatile uint8_t *dst,
 					    int page_size)
 {
 	int i;
 
 	for (i = 0; i < page_size; i++) {
-		*(volatile char *) (bios + 0xAAA) = 0xAA;
-		*(volatile char *) (bios + 0x555) = 0x55;
-		*(volatile char *) (bios + 0xAAA) = 0xA0;
+		*(volatile uint8_t *) (bios + 0xAAA) = 0xAA;
+		*(volatile uint8_t *) (bios + 0x555) = 0x55;
+		*(volatile uint8_t *) (bios + 0xAAA) = 0xA0;
 
 		/* transfer data from source to destination */
 		*dst = *src;
@@ -69,7 +69,7 @@ extern __inline__ void write_page_m29f400bt(volatile char *bios, char *src,
 		toggle_ready_m29f400bt(dst);
 		printf
 		    ("Value in the flash at address %p = %#x, want %#x\n",
-		     (char *) (dst - bios), *dst, *src);
+		     (uint8_t *) (dst - bios), *dst, *src);
 		dst++;
 		src++;
 	}