[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2553-g3238df0

[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  3238df0e1e749342a1e474937a2ace2d4e32a450 (commit)
       via  42a98af21f85fa80d976b8fe874322fb405a1099 (commit)
      from  969c1bb621d4c5fcb223775427e2294d27a92e2f (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 3238df0e1e749342a1e474937a2ace2d4e32a450
Merge: 42a98af 969c1bb
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Oct 20 18:40:20 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 42a98af21f85fa80d976b8fe874322fb405a1099
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Oct 20 18:17:38 2011 +0200

    [package][fpgaregs] manage fpga addressing memory space size

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

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

diff --git a/target/linux/debug/fpgaregs/fpgaregs.c b/target/linux/debug/fpgaregs/fpgaregs.c
index 21ee393..f7b95b7 100644
--- a/target/linux/debug/fpgaregs/fpgaregs.c
+++ b/target/linux/debug/fpgaregs/fpgaregs.c
@@ -34,12 +34,15 @@
 #ifdef IMX27
 # define PLATFORM "APF27"
 # define FPGA_ADDRESS 0xD6000000
+# define FPGA_SIZE	0x2000
 #elif IMX51
 # define PLATFORM "APF51"
 # define FPGA_ADDRESS 0xB8000000
+# define FPGA_SIZE	0x10000
 #else
 # define PLATFORM "APF9328"
 # define FPGA_ADDRESS 0x12000000
+# define FPGA_SIZE	0x2000
 #endif
 
 #define WORD_ACCESS (2)
@@ -84,7 +87,7 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	ptr_fpga = mmap(0, 8192, PROT_READ|PROT_WRITE, MAP_SHARED, ffpga, FPGA_ADDRESS);
+	ptr_fpga = mmap(0, FPGA_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, ffpga, FPGA_ADDRESS);
 	if (ptr_fpga == MAP_FAILED) {
 		printf("mmap failed\n");
 		return -1;
@@ -128,6 +131,7 @@ int main(int argc, char *argv[])
 			displayResult("Read", accesstype, value, address);
 		}
 	}
+	munmap(ptr_fpga, FPGA_SIZE);
 	close(ffpga);
 	return 0;
 }


hooks/post-receive
-- 
armadeus