From 5820f42ef209cfa0d4070fa9be96c9c91123a93f Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 16 May 2009 21:22:56 +0000 Subject: Introduce a type "chipaddr" to abstract the offsets within flash regions 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. Corresponding to flashrom svn r519. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann --- en29f002a.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'en29f002a.c') diff --git a/en29f002a.c b/en29f002a.c index 7a8c7f71..461ffeb0 100644 --- a/en29f002a.c +++ b/en29f002a.c @@ -32,7 +32,7 @@ int probe_en29f512(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -65,7 +65,7 @@ int probe_en29f512(struct flashchip *flash) /* This does not seem to function properly for EN29F002NT. */ int probe_en29f002a(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -95,10 +95,10 @@ int write_en29f002a(struct flashchip *flash, uint8_t *buf) { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr bios = flash->virtual_memory; + chipaddr dst = bios; - // *bios = 0xF0; + //chip_writeb(0xF0, bios); myusec_delay(10); erase_chip_jedec(flash); -- cgit v1.2.3