[Armadeus-commitlog] SF.net SVN: armadeus:[1036] trunk

[<ar...@us...>]

Revision: 1036
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1036&view=rev
Author:   artemys
Date:     2009-01-29 14:43:51 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------
[DEBUG] Now imxregs has the same name for i.MXL & i.MX27

Modified Paths:
--------------
    trunk/buildroot/package/imxregs/imxregs.mk
    trunk/target/linux/debug/imxregs/imx27regs.h
    trunk/target/linux/debug/imxregs/imxregs.c
    trunk/target/linux/debug/imxregs/imxregs.h

Modified: trunk/buildroot/package/imxregs/imxregs.mk
===================================================================
--- trunk/buildroot/package/imxregs/imxregs.mk	2009-01-29 13:32:02 UTC (rev 1035)
+++ trunk/buildroot/package/imxregs/imxregs.mk	2009-01-29 14:43:51 UTC (rev 1036)
@@ -8,7 +8,11 @@
 IMXREGS_SOURCE:=$(BUILD_DIR)/../../target/linux/debug/imxregs/
 IMXREGS_DIR:=$(BUILD_DIR)/imxregs-$(IMXREGS_VER)
 IMXREGS_CAT:=zcat
+ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
+IMXREGS_BINARY:=imx27regs
+else
 IMXREGS_BINARY:=imxregs
+endif
 IMXREGS_TARGET_BINARY:=usr/bin/imxregs
 
 $(IMXREGS_DIR)/imxregs.c:

Modified: trunk/target/linux/debug/imxregs/imx27regs.h
===================================================================
--- trunk/target/linux/debug/imxregs/imx27regs.h	2009-01-29 13:32:02 UTC (rev 1035)
+++ trunk/target/linux/debug/imxregs/imx27regs.h	2009-01-29 14:43:51 UTC (rev 1036)
@@ -23,6 +23,8 @@
 
 #include "definitions.h"
 
+#define IMX_TYPE "i.MX27"
+
 static struct reg_info regs[] =
 {
 // AIPI1

Modified: trunk/target/linux/debug/imxregs/imxregs.c
===================================================================
--- trunk/target/linux/debug/imxregs/imxregs.c	2009-01-29 13:32:02 UTC (rev 1035)
+++ trunk/target/linux/debug/imxregs/imxregs.c	2009-01-29 14:43:51 UTC (rev 1036)
@@ -238,21 +238,33 @@
    putmem(regs[found].addr, mem);   
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-// MAIN
-//
+
+void usage(char* name)
+{
+    printf("%s for %s CPU\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);
+}
+
 int main(int argc, char *argv[])
 {
     char *p;
     u32 val;
 
-    // No arguments -> dump all known registers
+    if ((0 == strcmp(argv[1],"-h")) || (0 == strcmp(argv[1],"--help"))) {
+        usage(argv[0]);
+        return 0;
+    }
+
+    /* No arguments -> dump all known registers */
     if (argc == 1) {
        dumpall();
        return 0;
     }
 
-    // Uppercase first argument (register name)
+    /* Uppercase first argument (register name) */
     if (argc >= 2) 
     {
         p = argv[1];
@@ -262,13 +274,13 @@
         }
     }
 
-    // Dump the content of the provided register
+    /* Dump the content of the provided register */
     if (argc == 2) 
     {
        return( dumpmatching(argv[1]) );
     }
 
-    // Put value to given register
+    /* Put value to given register */
     if (argc == 3) 
     {
         sscanf(argv[2],"%i",&val);
@@ -276,11 +288,8 @@
         return 0;
     }
 
-    // In all other cases, print Usage
-    printf("Usage: %s                - to dump all known registers\n"
-           "       %s <name>         - to dump named register\n"
-           "       %s <name> <value> - to set named register\n",
-           argv[0], argv[0], argv[0]);
+    /* In all other cases, print Usage */
+    usage(argv[0]);
            
     return 1;
 }

Modified: trunk/target/linux/debug/imxregs/imxregs.h
===================================================================
--- trunk/target/linux/debug/imxregs/imxregs.h	2009-01-29 13:32:02 UTC (rev 1035)
+++ trunk/target/linux/debug/imxregs/imxregs.h	2009-01-29 14:43:51 UTC (rev 1036)
@@ -23,6 +23,8 @@
 
 #include "definitions.h"
 
+#define IMX_TYPE "i.MX1/L/S"
+
 static struct reg_info regs[] = 
 {
 // Watchdog


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.