[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2558-g065139f

[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  065139f6816f46d9e6a10d8a213d16fc479d79bb (commit)
       via  0b3f4a96fb55abbf2d10623030cfd8500382bd03 (commit)
      from  69720594364daab6be7d80551cd4bcec240d48cb (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 065139f6816f46d9e6a10d8a213d16fc479d79bb
Merge: 0b3f4a9 6972059
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Oct 21 10:48:28 2011 +0200

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

commit 0b3f4a96fb55abbf2d10623030cfd8500382bd03
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Oct 21 10:47:50 2011 +0200

    [package][fpgaregs] better name for fpga map size

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

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


hooks/post-receive
-- 
armadeus