[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-38-g5c838a7

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  5c838a79591a3bbb1f9e59878de2d9f3fd350964 (commit)
       via  6dfeb748407a43d3eb1c86f04f7eb1f90f2d30ae (commit)
       via  0e17f378afb50f2721eef89b76f52ebcdd2ef2ee (commit)
       via  832ebe554261007a846cd723319e4bb08f3bd5a3 (commit)
      from  e9b329e1784bb245e8cc1f170576c4a324899732 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5c838a79591a3bbb1f9e59878de2d9f3fd350964
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 15 08:20:16 2014 +0100

    [DEBUG]fpgaregs: compile without warnings with g++

commit 6dfeb748407a43d3eb1c86f04f7eb1f90f2d30ae
Merge: 0e17f37 e9b329e
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 15 08:12:14 2014 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit 0e17f378afb50f2721eef89b76f52ebcdd2ef2ee
Merge: 832ebe5 4559456
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Nov 28 18:10:27 2013 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit 832ebe554261007a846cd723319e4bb08f3bd5a3
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Nov 28 18:10:10 2013 +0100

    [linux][pod_gpio] set output value in pod_gpio_direction_out()

-----------------------------------------------------------------------

Summary of changes:
 target/linux/debug/fpgaregs/fpgaregs.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/linux/debug/fpgaregs/fpgaregs.c b/target/linux/debug/fpgaregs/fpgaregs.c
index 2e139ce..9b72918 100644
--- a/target/linux/debug/fpgaregs/fpgaregs.c
+++ b/target/linux/debug/fpgaregs/fpgaregs.c
@@ -49,7 +49,7 @@
 #define LONG_ACCESS (4)
 
 
-void displayResult(char* text, unsigned int accesstype, unsigned int value, unsigned int address)
+void displayResult(const char* text, unsigned int accesstype, unsigned int value, unsigned int address)
 {
 	if (accesstype == WORD_ACCESS)
 		printf("%s 0x%04x at 0x%08x\n", text, (unsigned short)value, address);
@@ -116,17 +116,17 @@ int main(int argc, char *argv[])
 		if (argc == 4) {
 			value = strtoul(argv[3], (char **)NULL, 16);
 			if (accesstype == WORD_ACCESS)
-				*(unsigned short*)(ptr_fpga+(address)) = (unsigned short)value;
+				*((unsigned short*)ptr_fpga + address) = (unsigned short)value;
 			else
-				*(unsigned int*)(ptr_fpga+(address)) = (unsigned int)value;
+				*((unsigned int*)ptr_fpga + address) = (unsigned int)value;
 
 			displayResult("Write", accesstype, value, address);
 		/* read at given address */
 		} else if (argc == 3) {
 			if (accesstype == WORD_ACCESS)
-				value = *(unsigned short*)(ptr_fpga+(address));
+				value = *((unsigned short*)ptr_fpga + address);
 			else
-				value = *(unsigned int*)(ptr_fpga+(address));
+				value = *((unsigned int*)ptr_fpga + address);
 
 			displayResult("Read", accesstype, value, address);
 		}


hooks/post-receive
-- 
armadeus