diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-05-16 21:22:56 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-05-16 21:22:56 +0000 |
| commit | 2237dda98204032ae12004f41a99ef9286a28166 (patch) | |
| tree | a505b6f813fc4f7601f77e7195e479dfddc73571 /en29f002a.c | |
| parent | b79140252ae001fb1459010661b2ea8db912fc4c (diff) | |
| download | flashrom-2237dda98204032ae12004f41a99ef9286a28166.zip flashrom-2237dda98204032ae12004f41a99ef9286a28166.tar.gz | |
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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'en29f002a.c')
| -rw-r--r-- | en29f002a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/en29f002a.c b/en29f002a.c index 7a8c7f7..461ffeb 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); |
