Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[pandora-u-boot.git] / common / cmd_irq.c

diff --git a/common/cmd_irq.c b/common/cmd_irq.c
index a21aede..1e82883 100644 (file)
--- a/common/cmd_irq.c
+++ b/common/cmd_irq.c
@@ -24,20 +24,18 @@
 #include <config.h>
 #include <command.h>
 
-int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc,
+                        char * const argv[])
 {
 
-       if (argc != 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 2)
+               return CMD_RET_USAGE;
 
        /* on */
-       if (strncmp(argv[1], "on", 2) == 0) {
+       if (strncmp(argv[1], "on", 2) == 0)
                enable_interrupts();
-       } else {
+       else
                disable_interrupts();
-       }
 
        return 0;
 }
@@ -45,6 +43,14 @@ int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        interrupts, 5, 0, do_interrupts,
        "enable or disable interrupts",
-       "[on, off]\n"
-       "    - enable or disable interrupts\n"
+       "[on, off]"
+);
+
+/* Implemented in $(CPU)/interrupts.c */
+int do_irqinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+
+U_BOOT_CMD(
+       irqinfo,    1,    1,     do_irqinfo,
+       "print information about IRQs",
+       ""
 );