summaryrefslogtreecommitdiff
path: root/board/matrix_vision/mergerbox
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-07-30 13:33:49 +0000
committerWolfgang Denk <wd@denx.de>2011-08-01 15:19:40 +0200
commite6a857da746d5d7d450e59c0f86664c6b279b1c2 (patch)
treed95cae5bc677061c4313f7405545e837d67b02ee /board/matrix_vision/mergerbox
parentf6c019c45440c61734a6ea02d27895820fbba31e (diff)
fpga: constify to fix build warning
Fix compiler warning: cmd_fpga.c:318: warning: passing argument 3 of 'fit_image_get_data' from incompatible pointer type Adding the needed 'const' here entails a whole bunch of additonal changes all over the FPGA code. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de> Cc: Murray Jensen <Murray.Jensen@csiro.au> Acked-by: Andre Schwarz<andre.schwarz@matrix-vision.de>
Diffstat (limited to 'board/matrix_vision/mergerbox')
-rw-r--r--board/matrix_vision/mergerbox/fpga.c2
-rw-r--r--board/matrix_vision/mergerbox/fpga.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/matrix_vision/mergerbox/fpga.c b/board/matrix_vision/mergerbox/fpga.c
index 673bc2c95f..021e9c4b18 100644
--- a/board/matrix_vision/mergerbox/fpga.c
+++ b/board/matrix_vision/mergerbox/fpga.c
@@ -161,7 +161,7 @@ static inline int _write_fpga(u8 val, int dump)
return 0;
}
-int fpga_wr_fn(void *buf, size_t len, int flush, int cookie)
+int fpga_wr_fn(const void *buf, size_t len, int flush, int cookie)
{
unsigned char *data = (unsigned char *) buf;
int i;
diff --git a/board/matrix_vision/mergerbox/fpga.h b/board/matrix_vision/mergerbox/fpga.h
index fccff9fbca..89f879a552 100644
--- a/board/matrix_vision/mergerbox/fpga.h
+++ b/board/matrix_vision/mergerbox/fpga.h
@@ -26,5 +26,5 @@ extern int fpga_status_fn(int cookie);
extern int fpga_config_fn(int assert, int flush, int cookie);
extern int fpga_done_fn(int cookie);
extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
-extern int fpga_wr_fn(void *buf, size_t len, int flush, int cookie);
+extern int fpga_wr_fn(const void *buf, size_t len, int flush, int cookie);
extern int fpga_null_fn(int cookie);