From 7b2969be533f389604430e43c0732031ebdedee2 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 15 Apr 2009 10:52:49 +0000 Subject: Some coding style and consistency fixes Corresponding to flashrom svn r429 and coreboot v2 svn r4117. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann --- m29f002.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'm29f002.c') diff --git a/m29f002.c b/m29f002.c index a0fdf55..040cd2a 100644 --- a/m29f002.c +++ b/m29f002.c @@ -1,5 +1,5 @@ /* - * This file is part of flashrom. + * This file is part of the flashrom project. * * Copyright (C) 2009 Peter Stuge * @@ -20,7 +20,8 @@ #include "flash.h" -int erase_m29f002(struct flashchip *flash) { +int erase_m29f002(struct flashchip *flash) +{ volatile uint8_t *bios = flash->virtual_memory; chip_writeb(0xaa, bios + 0x555); chip_writeb(0x55, bios + 0xaaa); @@ -33,7 +34,9 @@ int erase_m29f002(struct flashchip *flash) { return 0; } -static void rewrite_block(volatile uint8_t *bios, uint8_t *src, volatile uint8_t *dst, int size) { +static void rewrite_block(volatile uint8_t *bios, uint8_t *src, + volatile uint8_t *dst, int size) +{ /* erase */ chip_writeb(0xaa, bios + 0x555); chip_writeb(0x55, bios + 0xaaa); @@ -56,13 +59,16 @@ static void rewrite_block(volatile uint8_t *bios, uint8_t *src, volatile uint8_t } } -static void do_block(volatile uint8_t *bios, uint8_t *src, int i, unsigned long start, int size) { +static void do_block(volatile uint8_t *bios, uint8_t *src, int i, + unsigned long start, int size) +{ printf("%d at address: 0x%08lx", i, start); rewrite_block(bios, src + start, bios + start, size); printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } -int write_m29f002t(struct flashchip *flash, uint8_t *buf) { +int write_m29f002t(struct flashchip *flash, uint8_t *buf) +{ int i, page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; @@ -73,17 +79,18 @@ int write_m29f002t(struct flashchip *flash, uint8_t *buf) { printf("Programming block: "); for (i = 0; i < 3; i++) - do_block(bios, buf, i, i*page_size, page_size); - do_block(bios, buf, i++, 0x30000, 32*1024); - do_block(bios, buf, i++, 0x38000, 8*1024); - do_block(bios, buf, i++, 0x3a000, 8*1024); - do_block(bios, buf, i, 0x3c000, 16*1024); + do_block(bios, buf, i, i * page_size, page_size); + do_block(bios, buf, i++, 0x30000, 32 * 1024); + do_block(bios, buf, i++, 0x38000, 8 * 1024); + do_block(bios, buf, i++, 0x3a000, 8 * 1024); + do_block(bios, buf, i, 0x3c000, 16 * 1024); printf("\n"); return 0; } -int write_m29f002b(struct flashchip *flash, uint8_t *buf) { +int write_m29f002b(struct flashchip *flash, uint8_t *buf) +{ int i = 0, page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; @@ -93,12 +100,12 @@ int write_m29f002b(struct flashchip *flash, uint8_t *buf) { */ printf("Programming block: "); - do_block(bios, buf, i++, 0x00000, 16*1024); - do_block(bios, buf, i++, 0x04000, 8*1024); - do_block(bios, buf, i++, 0x06000, 8*1024); - do_block(bios, buf, i++, 0x08000, 32*1024); + do_block(bios, buf, i++, 0x00000, 16 * 1024); + do_block(bios, buf, i++, 0x04000, 8 * 1024); + do_block(bios, buf, i++, 0x06000, 8 * 1024); + do_block(bios, buf, i++, 0x08000, 32 * 1024); for (; i < 7; i++) - do_block(bios, buf, i, (i-3)*page_size, page_size); + do_block(bios, buf, i, (i - 3) * page_size, page_size); printf("\n"); return 0; -- cgit v1.1