From 61a8bd27fb5ff27db98e96b462957994e7cca946 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 5 Mar 2009 19:24:22 +0000 Subject: Use helper functions to access flash chips Right now we perform direct pointer manipulation without any abstraction to read from and write to memory mapped flash chips. That makes it impossible to drive any flasher which does not mmap the whole chip. Using helper functions readb() and writeb() allows a driver for external flash programmers like Paraflasher to replace readb and writeb with calls to its own chip access routines. This patch has the additional advantage of removing lots of unnecessary casts to volatile uint8_t * and now-superfluous parentheses which caused poor readability. I used the semantic patcher Coccinelle to create this patch. The semantic patch follows: @@ expression a; typedef uint8_t; volatile uint8_t *b; @@ - *(b) = (a); + writeb(a, b); @@ volatile uint8_t *b; @@ - *(b) + readb(b) @@ type T; T b; @@ ( readb | writeb ) (..., - (T) - (b) + b ) In contrast to a sed script, the semantic patch performs type checking before converting anything. Tested-by: Joe Julian Corresponding to flashrom svn r418 and coreboot v2 svn r3971. Signed-off-by: Carl-Daniel Hailfinger Acked-by: FENG Yu Ning --- en29f002a.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'en29f002a.c') diff --git a/en29f002a.c b/en29f002a.c index c70b37b..41dac7f 100644 --- a/en29f002a.c +++ b/en29f002a.c @@ -35,19 +35,19 @@ int probe_en29f512(struct flashchip *flash) volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; - *(volatile uint8_t *)(bios + 0x555) = 0xAA; - *(volatile uint8_t *)(bios + 0x2AA) = 0x55; - *(volatile uint8_t *)(bios + 0x555) = 0x90; + writeb(0xAA, bios + 0x555); + writeb(0x55, bios + 0x2AA); + writeb(0x90, bios + 0x555); myusec_delay(10); - id1 = *(volatile uint8_t *)(bios + 0x100); - id2 = *(volatile uint8_t *)(bios + 0x101); + id1 = readb(bios + 0x100); + id2 = readb(bios + 0x101); /* exit by writing F0 anywhere? or the code below */ - *(volatile uint8_t *)(bios + 0x555) = 0xAA; - *(volatile uint8_t *)(bios + 0x2AA) = 0x55; - *(volatile uint8_t *)(bios + 0x555) = 0xF0; + writeb(0xAA, bios + 0x555); + writeb(0x55, bios + 0x2AA); + writeb(0xF0, bios + 0x555); printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); @@ -68,19 +68,19 @@ int probe_en29f002a(struct flashchip *flash) volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; - *(volatile uint8_t *)(bios + 0x555) = 0xAA; - *(volatile uint8_t *)(bios + 0xAAA) = 0x55; - *(volatile uint8_t *)(bios + 0x555) = 0x90; + writeb(0xAA, bios + 0x555); + writeb(0x55, bios + 0xAAA); + writeb(0x90, bios + 0x555); myusec_delay(10); - id1 = *(volatile uint8_t *)(bios + 0x100); - id2 = *(volatile uint8_t *)(bios + 0x101); + id1 = readb(bios + 0x100); + id2 = readb(bios + 0x101); /* exit by writing F0 anywhere? or the code below */ - *(volatile uint8_t *)(bios + 0x555) = 0xAA; - *(volatile uint8_t *)(bios + 0xAAA) = 0x55; - *(volatile uint8_t *)(bios + 0x555) = 0xF0; + writeb(0xAA, bios + 0x555); + writeb(0x55, bios + 0xAAA); + writeb(0xF0, bios + 0x555); printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); @@ -107,10 +107,10 @@ int write_en29f002a(struct flashchip *flash, uint8_t *buf) /* write to the sector */ if ((i & 0xfff) == 0) printf("address: 0x%08lx", (unsigned long)i); - *(bios + 0x5555) = 0xAA; - *(bios + 0x2AAA) = 0x55; - *(bios + 0x5555) = 0xA0; - *dst++ = *buf++; + writeb(0xAA, bios + 0x5555); + writeb(0x55, bios + 0x2AAA); + writeb(0xA0, bios + 0x5555); + writeb(*buf++, dst++); /* wait for Toggle bit ready */ toggle_ready_jedec(dst); -- cgit v1.1