Merge working Evermore state-machine from Petr Slansky.

Also merge in hooks that connect RTCM parsing to the packet getter.

1 files changed, 3 insertions, 4 deletions

diff --git a/rtcmdecode.c b/rtcmdecode.c
index 294b5a44..46a89423 100644
--- a/rtcmdecode.c
+++ b/rtcmdecode.c
@@ -2,13 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-
-#include "gpsd.h"
-#include "rtcm.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "gpsd.h"
+
 static int verbose = 5;
 
 void gpsd_report(int errlevel, const char *fmt, ... )
@@ -26,6 +24,7 @@ void gpsd_report(int errlevel, const char *fmt, ... )
 	(void)fputs(buf, stderr);
     }
 }
+
 void rtcm_print_msg(struct rtcm_msghdr *msghdr)
 /* dump the contents of a parsed RTCM104 message */
 {