From 676fec9b1d0df41ec69e87bc8e9f0c1605f5a577 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Sat, 16 May 2009 21:22:56 +0000 Subject: Use chipaddr instead of volatile uint8_t * because when we access chips in external flashers, they are not accessed via pointers at all. Benefits: This allows us to differentiate between volatile machine memory accesses and flash chip accesses. It also enforces usage of chip_{read,write}[bwl] to access flash chips, so nobody will unintentionally use pointers to access chips anymore. Some unneeded casts are removed as well. Grepping for chip operations and machine memory operations doesn't yield any false positives anymore. Compile tested on 32 bit and 64 bit Linux. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@519 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- 82802ab.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '82802ab.c') diff --git a/82802ab.c b/82802ab.c index 0d071d4..b2e8a49 100644 --- a/82802ab.c +++ b/82802ab.c @@ -45,7 +45,7 @@ void print_82802ab_status(uint8_t status) int probe_82802ab(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -79,7 +79,7 @@ int probe_82802ab(struct flashchip *flash) return 1; } -uint8_t wait_82802ab(volatile uint8_t *bios) +uint8_t wait_82802ab(chipaddr bios) { uint8_t status; uint8_t id1, id2; @@ -109,8 +109,8 @@ uint8_t wait_82802ab(volatile uint8_t *bios) int erase_82802ab_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr bios = flash->virtual_memory + offset; + chipaddr wrprotect = flash->virtual_registers + offset + 2; int j; uint8_t status; @@ -155,8 +155,8 @@ int erase_82802ab(struct flashchip *flash) return 0; } -void write_page_82802ab(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_82802ab(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size) { int i; @@ -173,7 +173,7 @@ int write_82802ab(struct flashchip *flash, uint8_t *buf) int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; i < total_size / page_size; i++) { -- cgit v1.2.1