aboutsummaryrefslogtreecommitdiffstats
path: root/programmer.h
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-07-17 23:46:44 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-07-17 23:46:44 +0000
commit305e0b999a7d452a845709d5558c17a31afe178c (patch)
tree3b65c3cd627ff55d683f26bf0819913a3e63c5d8 /programmer.h
parent4a03865cd9b192e6e65b5dbc5a928af87322385d (diff)
downloadflashrom-305e0b999a7d452a845709d5558c17a31afe178c.tar.gz
flashrom-305e0b999a7d452a845709d5558c17a31afe178c.tar.bz2
flashrom-305e0b999a7d452a845709d5558c17a31afe178c.zip
Uintptr_t-ify map_flash_region functions
Unsigned long is not the right type for manipulating pointer values. Since C99 there are suitable unsigned and signed types available, namely uintptr_t and intptr_t respectively. Use them in functions assigned to programmers' map_flash_region fields and their callers where applicable. This patch also changes the display width of all associated address values in physmap.c to 16/8 hex characters depending on the actual size by introducing a macro PRIxPTR_WIDTH and exploiting printf's * field width specifier. Corresponding to flashrom svn r1701. Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'programmer.h')
-rw-r--r--programmer.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/programmer.h b/programmer.h
index 2ea7b481..db914cbd 100644
--- a/programmer.h
+++ b/programmer.h
@@ -117,7 +117,7 @@ struct programmer_entry {
int (*init) (void);
- void *(*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len);
+ void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len);
void (*unmap_flash_region) (void *virt_addr, size_t len);
void (*delay) (int usecs);
@@ -275,8 +275,8 @@ int processor_flash_enable(void);
#endif
/* physmap.c */
-void *physmap(const char *descr, unsigned long phys_addr, size_t len);
-void *physmap_try_ro(const char *descr, unsigned long phys_addr, size_t len);
+void *physmap(const char *descr, uintptr_t phys_addr, size_t len);
+void *physmap_try_ro(const char *descr, uintptr_t phys_addr, size_t len);
void physunmap(void *virt_addr, size_t len);
#if CONFIG_INTERNAL == 1
int setup_cpu_msr(int cpu);
@@ -359,7 +359,7 @@ void rmmio_vall(void *addr);
/* dummyflasher.c */
#if CONFIG_DUMMY == 1
int dummy_init(void);
-void *dummy_map(const char *descr, unsigned long phys_addr, size_t len);
+void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len);
void dummy_unmap(void *virt_addr, size_t len);
#endif
@@ -606,7 +606,7 @@ int register_opaque_programmer(const struct opaque_programmer *pgm);
/* programmer.c */
int noop_shutdown(void);
-void *fallback_map(const char *descr, unsigned long phys_addr, size_t len);
+void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len);
void fallback_unmap(void *virt_addr, size_t len);
void noop_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr);