Index: /trunk/rtcm3torinex/lib/rtcm3torinex.c
===================================================================
--- /trunk/rtcm3torinex/lib/rtcm3torinex.c	(revision 4368)
+++ /trunk/rtcm3torinex/lib/rtcm3torinex.c	(revision 4369)
@@ -2133,4 +2133,5 @@
     CHECKFLAGS(D6,D6)
     CHECKFLAGS(S6,S6)
+    /* Skip C1N and SAIF for RINEX2! */
 
     hdata.data.named.typesofobs = buffer;
Index: /trunk/rtcm3torinex/lib/rtcm3torinex.h
===================================================================
--- /trunk/rtcm3torinex/lib/rtcm3torinex.h	(revision 4368)
+++ /trunk/rtcm3torinex/lib/rtcm3torinex.h	(revision 4369)
@@ -129,8 +129,8 @@
 #define GNSSENTRY_SSAIFDATA  ((8<<2)+GNSSENTRY_SNR)
 
-#define GNSSENTRY_C1NDATA    ((8<<2)+GNSSENTRY_CODE)
-#define GNSSENTRY_L1NDATA    ((8<<2)+GNSSENTRY_PHASE)
-#define GNSSENTRY_D1NDATA    ((8<<2)+GNSSENTRY_DOPPLER)
-#define GNSSENTRY_S1NDATA    ((8<<2)+GNSSENTRY_SNR)
+#define GNSSENTRY_C1NDATA    ((9<<2)+GNSSENTRY_CODE)
+#define GNSSENTRY_L1NDATA    ((9<<2)+GNSSENTRY_PHASE)
+#define GNSSENTRY_D1NDATA    ((9<<2)+GNSSENTRY_DOPPLER)
+#define GNSSENTRY_S1NDATA    ((9<<2)+GNSSENTRY_SNR)
 
 #define GNSSENTRY_NUMBER     40 /* number of types!!! */