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 | 5820f42ef209cfa0d4070fa9be96c9c91123a93f (patch) | |
| tree | a505b6f813fc4f7601f77e7195e479dfddc73571 /am29f040b.c | |
| parent | 4059598a068f7694f2238a3811d85cbfa520a8d5 (diff) | |
| download | flashrom-5820f42ef209cfa0d4070fa9be96c9c91123a93f.tar.gz flashrom-5820f42ef209cfa0d4070fa9be96c9c91123a93f.tar.bz2 flashrom-5820f42ef209cfa0d4070fa9be96c9c91123a93f.zip | |
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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'am29f040b.c')
| -rw-r--r-- | am29f040b.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/am29f040b.c b/am29f040b.c index 87e9c708b..2e70fa5d5 100644 --- a/am29f040b.c +++ b/am29f040b.c @@ -22,7 +22,7 @@ #include <stdint.h> #include "flash.h" -static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, +static __inline__ int erase_sector_29f040b(chipaddr bios, unsigned long address) { chip_writeb(0xAA, bios + 0x555); @@ -40,17 +40,16 @@ static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, return 0; } -static __inline__ int write_sector_29f040b(volatile uint8_t *bios, +static __inline__ int write_sector_29f040b(chipaddr bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr dst, unsigned int page_size) { int i; for (i = 0; i < page_size; i++) { if ((i & 0xfff) == 0xfff) - printf("0x%08lx", (unsigned long)dst - - (unsigned long)bios); + printf("0x%08lx", dst - bios); chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -69,7 +68,7 @@ static __inline__ int write_sector_29f040b(volatile uint8_t *bios, int probe_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -92,7 +91,7 @@ int probe_29f040b(struct flashchip *flash) int erase_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -112,7 +111,7 @@ int write_29f040b(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 "); for (i = 0; i < total_size / page_size; i++) { |