From ef5779d1ddee6b83dfe04ff343e4b7d290fd24d7 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 29 Jan 2002 20:18:02 +0000 Subject: Fixes - switch to volatile everywhere - use myusec_delay instead of usleep Corresponding to coreboot v1 svn r492. --- jedec.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'jedec.h') diff --git a/jedec.h b/jedec.h index de9c3d65c..18c5153c0 100644 --- a/jedec.h +++ b/jedec.h @@ -2,7 +2,7 @@ extern int probe_jedec (struct flashchip * flash); extern int erase_jedec (struct flashchip * flash); extern int write_jedec (struct flashchip * flash, char * buf); -extern __inline__ void toggle_ready_jedec (char * dst) +extern __inline__ void toggle_ready_jedec (volatile char * dst) { unsigned int i = 0; char tmp1, tmp2; @@ -18,7 +18,7 @@ extern __inline__ void toggle_ready_jedec (char * dst) } } -extern __inline__ void data_polling_jedec (char * dst, char data) +extern __inline__ void data_polling_jedec (volatile char * dst, char data) { unsigned int i = 0; char tmp; @@ -33,23 +33,23 @@ extern __inline__ void data_polling_jedec (char * dst, char data) } } -extern __inline__ void protect_jedec (char * bios) +extern __inline__ void protect_jedec (volatile char * bios) { - *(char *) (bios + 0x5555) = 0xAA; - *(char *) (bios + 0x2AAA) = 0x55; - *(char *) (bios + 0x5555) = 0xA0; + *(volatile char *) (bios + 0x5555) = 0xAA; + *(volatile char *) (bios + 0x2AAA) = 0x55; + *(volatile char *) (bios + 0x5555) = 0xA0; usleep(200); } -extern __inline__ void write_page_jedec (char * bios, char * src, char * dst, +extern __inline__ void write_page_jedec (volatile char * bios, char * src, volatile char * dst, int page_size) { int i; - *(char *) (bios + 0x5555) = 0xAA; - *(char *) (bios + 0x2AAA) = 0x55; - *(char *) (bios + 0x5555) = 0xA0; + *(volatile char *) (bios + 0x5555) = 0xAA; + *(volatile char *) (bios + 0x2AAA) = 0x55; + *(volatile char *) (bios + 0x5555) = 0xA0; for (i = 0; i < page_size; i++) { /* transfer data from source to destination */ -- cgit v1.2.3