[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-231-g70724e4

[Julien B a. A. <ar...@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  70724e4ccb039f3af5a8f496e601eedf4102de34 (commit)
      from  3cf36c4872277442202817e379aacfec76faa680 (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 70724e4ccb039f3af5a8f496e601eedf4102de34
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Apr 28 16:02:04 2013 +0200

    [DEBUG] Add a version number to imxregs

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

Summary of changes:
 buildroot/package/armadeus/imxregs/imxregs.mk |    2 +-
 target/linux/debug/imxregs/imxregs.c          |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index 51aa11f..bb6c98a 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IMXREGS_VERSION = 1.3
+IMXREGS_VERSION = 2013.05
 IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
 ifeq ($(generic-package), )
 IMXREGS_SITE_METHOD = copy
diff --git a/target/linux/debug/imxregs/imxregs.c b/target/linux/debug/imxregs/imxregs.c
index 84c5885..f08eba4 100644
--- a/target/linux/debug/imxregs/imxregs.c
+++ b/target/linux/debug/imxregs/imxregs.c
@@ -41,6 +41,8 @@
 #include "imxregs.h"
 #endif
 
+#define VERSION "2013.05"
+
 /*#define DEBUG TRUE*/
 #ifdef DEBUG
 #define debug(fmt, arg...) printf(fmt, ##arg)
@@ -48,10 +50,10 @@
 #define debug(fmt, arg...) ({ if (0) printf(fmt, ##arg); 0; })
 #endif
 
-// fd for /dev/mem
+/* fd for /dev/mem */
 static int fd = -1;
 
-// Get value of the register at the given address
+/* Get value of the register at the given address */
 static int getmem(u32 addr)
 {
 	void *map, *regaddr;
@@ -144,14 +146,14 @@ static void dumpentry(int i)
 		shiftdata = (data >> regs[i].shift) & regs[i].mask;
 		printf("%-25s  ", regs[i].name);
 		switch (regs[i].type) {
-			// Hexa printing
+			/* Hexa printing */
 		case 'x':
 			printf("%8x", shiftdata);
 			break;
 		case '<':
 			printf("%8u", 1 << shiftdata);
 			break;
-			// Decimal printing
+			/* Decimal printing */
 		default:
 			printf("%8u", shiftdata);
 			break;
@@ -229,11 +231,11 @@ static void setreg(char *name, u32 val)
 
 void usage(char *name)
 {
-	printf("%s for %s CPU\n"
+	printf("%s for %s CPU (version %s)\n"
 	       "Usage: %s                - to dump all known registers\n"
 	       "       %s <name>         - to dump named register\n"
 	       "       %s <name> <value> - to set named register\n",
-	       name, IMX_TYPE, name, name, name);
+	       name, IMX_TYPE, VERSION, name, name, name);
 }
 
 int main(int argc, char *argv[])


hooks/post-receive
-- 
armadeus