From d406d48293c998567d628d950c66da1ca8ded39c Mon Sep 17 00:00:00 2001
From: Piotr Krysik <perper@o2.pl>
Date: Sat, 13 Jun 2009 17:28:03 +0200
Subject: cch decoding now works! but I have to remove it in the future :)

---
 src/lib/decoder/gsmstack.c | 24 ++++++++++++------------
 src/lib/decoder/gsmstack.h |  2 +-
 src/lib/decoder/sch.h      |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/lib/decoder')

diff --git a/src/lib/decoder/gsmstack.c b/src/lib/decoder/gsmstack.c
index cf94939..ceda6c5 100644
--- a/src/lib/decoder/gsmstack.c
+++ b/src/lib/decoder/gsmstack.c
@@ -104,9 +104,9 @@ GS_new(GS_CTX *ctx)
  * 142 bit
  */
 int
-GS_process(GS_CTX *ctx, int ts, int type, const unsigned char *src)
+GS_process(GS_CTX *ctx, int ts, int type, const unsigned char *src, int fn)
 {
-	int fn;
+// 	int fn;
 	int bsic;
 	int ret;
 	unsigned char *data;
@@ -132,9 +132,9 @@ GS_process(GS_CTX *ctx, int ts, int type, const unsigned char *src)
 	}
 #endif
 
-	if (ts == 0) {
+/*	if (ts == 0) {
 		if (type == SCH) {
-			ret = decode_sch(src, &fn, &bsic);
+//			ret = decode_sch(src, &fn, &bsic);
 			if (ret != 0)
 				return 0;
 			if ((ctx->bsic > 0) && (bsic != ctx->bsic))
@@ -143,17 +143,17 @@ GS_process(GS_CTX *ctx, int ts, int type, const unsigned char *src)
 			ctx->fn = fn;
 			ctx->bsic = bsic;
 			/* Reset message concatenator */
-			ts_ctx->burst_count = 0;
-			return 0;
-		}
+//			ts_ctx->burst_count = 0;
+//			return 0;
+//		}
 
 		/* If we did not get Frame Number yet then return */
-		if (ctx->fn < 0)
-			return 0;
-
-		ctx->fn++;
-	}
+//		if (ctx->fn < 0)
+//			return 0;
 
+//		ctx->fn++;
+//	}
+        ctx->fn = fn;
 	if (type == NORMAL) {
 		/* Interested in these frame numbers (cch)
  		 * 2-5, 12-15, 22-25, 23-35, 42-45
diff --git a/src/lib/decoder/gsmstack.h b/src/lib/decoder/gsmstack.h
index fb88334..7295b08 100644
--- a/src/lib/decoder/gsmstack.h
+++ b/src/lib/decoder/gsmstack.h
@@ -34,7 +34,7 @@ typedef struct
 } GS_CTX;
 
 int GS_new(GS_CTX *ctx);
-int GS_process(GS_CTX *ctx, int ts, int type, const unsigned char *src);
+int GS_process(GS_CTX *ctx, int ts, int type, const unsigned char *src, int fn);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/decoder/sch.h b/src/lib/decoder/sch.h
index 199d739..4d47eb5 100644
--- a/src/lib/decoder/sch.h
+++ b/src/lib/decoder/sch.h
@@ -1,6 +1,6 @@
 
-#ifndef __GSMSTACK_H__
-#define __GSMSTACK_H__ 1
+#ifndef __SCH_H__
+#define __SCH_H__ 1
 
 #ifdef __cplusplus
 extern "C"
-- 
cgit v1.2.3