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>

1 files changed, 4 insertions, 4 deletions

diff --git a/nic3com.c b/nic3com.c
index 84e506d..f5d0aa1 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -87,17 +87,17 @@ void nic3com_unmap(void *virt_addr, size_t len)
 {
 }
 
-void nic3com_chip_writeb(uint8_t val, volatile void *addr)
+void nic3com_chip_writeb(uint8_t val, chipaddr addr)
 {
-	OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR);
+	OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
 	OUTB(val, io_base_addr + BIOS_ROM_DATA);
 }
 
-uint8_t nic3com_chip_readb(const volatile void *addr)
+uint8_t nic3com_chip_readb(const chipaddr addr)
 {
 	uint8_t val;
 
-	OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR);
+	OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
 	val = INB(io_base_addr + BIOS_ROM_DATA);
 
 	return val;