summaryrefslogtreecommitdiffstats
path: root/sst49lfxxxc.c
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2007-05-23 17:20:56 +0000
committerStefan Reinauer <stefan.reinauer@coreboot.org>2007-05-23 17:20:56 +0000
commitce532975cbe35d88f767c6305d272c8b6f16ccf7 (patch)
treef42ab029b4335a7d9e396bf85e0fc9f0f3d36aa1 /sst49lfxxxc.c
parentbc1f1a01e4505bd1a2de45b7a23038a53a184c0d (diff)
downloadast2050-flashrom-ce532975cbe35d88f767c6305d272c8b6f16ccf7.zip
ast2050-flashrom-ce532975cbe35d88f767c6305d272c8b6f16ccf7.tar.gz
Big cosmetic offensive on flashrom
* 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. Corresponding to flashrom svn r111 and coreboot v2 svn r2689. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de>
Diffstat (limited to 'sst49lfxxxc.c')
-rw-r--r--sst49lfxxxc.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/sst49lfxxxc.c b/sst49lfxxxc.c
index 52f865a..efa2a61 100644
--- a/sst49lfxxxc.c
+++ b/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 */
OpenPOWER on IntegriCloud