summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-05-14 21:41:10 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-05-14 21:41:10 +0000
commit3b7e75a23e0d9f812e7e7792734846720dbfd648 (patch)
tree423ccc8f7ca6cba97d39c1649e7da245a202caf8
parenta086932cf928c6a084dd4d71a67cd8db742de5ec (diff)
downloadast2050-flashrom-3b7e75a23e0d9f812e7e7792734846720dbfd648.zip
ast2050-flashrom-3b7e75a23e0d9f812e7e7792734846720dbfd648.tar.gz
Fix compilation of nic3com on 64bit
Corresponding to flashrom svn r512. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
-rw-r--r--flash.h1
-rw-r--r--internal.c2
-rw-r--r--nic3com.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/flash.h b/flash.h
index 27b6328..e25f31e 100644
--- a/flash.h
+++ b/flash.h
@@ -585,6 +585,7 @@ void *physmap(const char *descr, unsigned long phys_addr, size_t len);
void physunmap(void *virt_addr, size_t len);
/* internal.c */
+void get_io_perms(void);
int internal_init(void);
int internal_shutdown(void);
void internal_chip_writeb(uint8_t val, volatile void *addr);
diff --git a/internal.c b/internal.c
index 2f9ba17..bbbf58b 100644
--- a/internal.c
+++ b/internal.c
@@ -102,7 +102,7 @@ int internal_init(void)
{
int ret = 0;
- get_io_perms(void);
+ get_io_perms();
/* Initialize PCI access for flash enables */
pacc = pci_alloc(); /* Get the pci_access structure */
diff --git a/nic3com.c b/nic3com.c
index a60f594..a982267 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -158,7 +158,7 @@ void nic3com_unmap(void *virt_addr, size_t len)
void nic3com_chip_writeb(uint8_t val, volatile void *addr)
{
- OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
+ OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR);
OUTB(val, io_base_addr + BIOS_ROM_DATA);
}
@@ -174,7 +174,7 @@ uint8_t nic3com_chip_readb(const volatile void *addr)
{
uint8_t val;
- OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
+ OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR);
val = INB(io_base_addr + BIOS_ROM_DATA);
return val;
OpenPOWER on IntegriCloud