Switch from GPLv2 to GPLv2+

[fw/altos] / ao-tools / ao-mega / ao-mega.c

diff --git a/ao-tools/ao-mega/ao-mega.c b/ao-tools/ao-mega/ao-mega.c
index 523229e6787bc0f40f1730957c4aa8d4f7a3a90d..9a12609b1f414d0208211b2b6a1babd4506378af 100644 (file)
--- a/ao-tools/ao-mega/ao-mega.c
+++ b/ao-tools/ao-mega/ao-mega.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -85,7 +86,7 @@ main (int argc, char **argv)
 
                        if (cc_mega_parse(line, &log)) {
                                if (log.is_config) {
-                                       printf ("kind %d\n", log.u.config_int.kind);
+                                       printf ("config %2d %s", log.u.config_int.kind, line);
                                } else {
                                        printf ("tick %5d ", log.tick);
                                        switch (log.type) {
@@ -126,8 +127,7 @@ main (int argc, char **argv)
                                                        printf (" s%d %6d",
                                                                j, log.u.volt.sense[j]);
                                                }
-                                               printf ("pyro %04x\n", log.u.volt.pyro);
-                                               printf ("\n");
+                                               printf (" pyro %04x\n", log.u.volt.pyro);
                                                break;
                                        default:
                                                printf ("type %c\n", log.type, log.tick);