summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/Assert.h2
-rw-r--r--src/lib/gsm_constants.h28
-rw-r--r--src/lib/gsm_receiver_cf.h4
3 files changed, 15 insertions, 19 deletions
diff --git a/src/lib/Assert.h b/src/lib/Assert.h
index acfb3f7..dd222b0 100644
--- a/src/lib/Assert.h
+++ b/src/lib/Assert.h
@@ -26,7 +26,7 @@
#include "stdio.h"
#include <iostream>
-#define NDEBUG
+// #define NDEBUG
/**@name Macros for standard messages. */
//@{
diff --git a/src/lib/gsm_constants.h b/src/lib/gsm_constants.h
index cf9f059..6eecbb1 100644
--- a/src/lib/gsm_constants.h
+++ b/src/lib/gsm_constants.h
@@ -44,11 +44,9 @@ const unsigned FCCH_FRAMES[] = {0, 10, 20, 30, 40};
const unsigned SCH_FRAMES[] = {1, 11, 21, 31, 41};
const unsigned BCCH_FRAMES[] = {2, 3, 4, 5}; //!!the receiver shouldn't care about logical
+ //!!channels so this will be removed from this header
const unsigned TRAFFIC_CHANNEL_F[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
-//!!channels so this will be removed from this header
-const unsigned TEST[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50};
-// Sync : .+...++.+..+++.++++++.++++++....++.+..+.+.+++.+.+...+..++++..+..
-// Diff Encoded Sync: .++..+.+++.+..++.....++.....+...+.+++.+++++..+++++..++.+...+.++.
+const unsigned TEST51[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50};
#define TSC0 0
#define TSC1 1
@@ -62,6 +60,16 @@ const unsigned TEST[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 1
#define TRAIN_SEQ_NUM 9
+#define TIMESLOT0 0
+#define TIMESLOT1 1
+#define TIMESLOT2 2
+#define TIMESLOT3 3
+#define TIMESLOT4 4
+#define TIMESLOT5 5
+#define TIMESLOT6 6
+#define TIMESLOT7 7
+
+
static const unsigned char train_seq[TRAIN_SEQ_NUM][N_TRAIN_BITS] = {
{0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1},
{0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1},
@@ -130,17 +138,5 @@ static const unsigned char fc_compact_fb[] = {
1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0
};
-//Diff encoded train_seq
-//TSC0: +.++.+++..+...++..++.+++..
-//TSC1: +.+++.++..++...+..++.+++..
-//TSC2: +++...+..++..+++.++...+..+
-//TSC3: +++..+...++.+++..++..+...+
-//TSC4: +..+.++++..+.++....+.++++.
-//TSC5: +++.+..++++.+....++.+..+++
-//TSC6: .+++.+....++.+..++++.+....
-//TSC7: ...++...+..++.+++..++...+.
-//TSC8: ..........................
-//TSC9: ++..+..+++..+..+++..+..+++
-
#endif /* INCLUDED_GSM_CONSTANTS_H */
diff --git a/src/lib/gsm_receiver_cf.h b/src/lib/gsm_receiver_cf.h
index b937f76..ef9a8bb 100644
--- a/src/lib/gsm_receiver_cf.h
+++ b/src/lib/gsm_receiver_cf.h
@@ -61,7 +61,7 @@ class gsm_receiver_cf : public gr_block
/** Countes samples consumed by the receiver
*
- * It is used in beetween find_fcch_burst and find_sch_burst calls.
+ * It is used in beetween find_fcch_burst and reach_sch_burst calls.
* My intention was to synchronize this counter with some internal sample
* counter of the USRP. Simple access to such USRP's counter isn't possible
* so this variable isn't used in the "synchronized" state of the receiver yet.
@@ -135,7 +135,7 @@ class gsm_receiver_cf : public gr_block
* @param nitems number of samples in the gsm_receiver's buffer
* @return true if SCH burst is near, false otherwise
*/
- bool find_sch_burst(const int nitems);
+ bool reach_sch_burst(const int nitems);
/** Extracts channel impulse response from a SCH burst and computes first sample number of this burst
*
personal git repositories of Harald Welte. Your mileage may vary