diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2007-05-23 17:20:56 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2007-05-23 17:20:56 +0000 |
| commit | f8eea5cd1c641495bdc635e61575597a82629ef8 (patch) | |
| tree | 3fd8eed9b6033f4fc7b38ec2a42b031c6bcbd340 /util/flashrom/sst49lfxxxc.c | |
| parent | f2d1428120a9fee473b38492c6cf062ca8341e93 (diff) | |
| download | coreboot-f8eea5cd1c641495bdc635e61575597a82629ef8.tar.xz | |
big cosmetic offensive on flashrom. (trivial)
* Give decent names to virt_addr and virt_addr_2
* add some comments
* move virtual addresses to the end of the struct,
so they dont mess up the initializer.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2689 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flashrom/sst49lfxxxc.c')
| -rw-r--r-- | util/flashrom/sst49lfxxxc.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/util/flashrom/sst49lfxxxc.c b/util/flashrom/sst49lfxxxc.c index 52f865a225..efa2a6108d 100644 --- a/util/flashrom/sst49lfxxxc.c +++ b/util/flashrom/sst49lfxxxc.c @@ -132,7 +132,9 @@ static __inline__ int write_sector_49lfxxxc(volatile uint8_t *bios, int probe_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virt_addr; + volatile uint8_t *bios = flash->virtual_memory; + volatile uint8_t *registers; + uint8_t id1, id2; size_t size = flash->total_size * 1024; @@ -148,25 +150,25 @@ int probe_49lfxxxc(struct flashchip *flash) if (!(id1 == flash->manufacture_id && id2 == flash->model_id)) return 0; - bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, + registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); - if (bios == MAP_FAILED) { + if (registers == MAP_FAILED) { // it's this part but we can't map it ... perror("Error MMAP /dev/mem"); exit(1); } - flash->virt_addr_2 = bios; + flash->virtual_registers = registers; return 1; } int erase_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virt_addr; - volatile uint8_t *bios2 = flash->virt_addr_2; + volatile uint8_t *bios = flash->virtual_memory; + volatile uint8_t *registers = flash->virtual_registers; int i; unsigned int total_size = flash->total_size * 1024; - write_lockbits_49lfxxxc(bios2, total_size, 0); + write_lockbits_49lfxxxc(registers, total_size, 0); for (i = 0; i < total_size; i += flash->page_size) if (erase_sector_49lfxxxc(bios, i) != 0) return (-1); @@ -180,9 +182,9 @@ int write_49lfxxxc(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->virt_addr; + volatile uint8_t *bios = flash->virtual_memory; - write_lockbits_49lfxxxc(flash->virt_addr_2, total_size, 0); + write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0); printf("Programming Page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ |