diff options
| author | tvoid <tvoid@lesaige.com> | 2008-04-11 09:08:00 -0600 |
|---|---|---|
| committer | tvoid <tvoid@lesaige.com> | 2008-04-11 09:08:00 -0600 |
| commit | 67272251547bc999e581eb0d1fcd90b5cb14d469 (patch) | |
| tree | 2f31580521e57ab08e69d06f2f678b54d6161d87 /gsm-tvoid/src/lib/sch.c | |
| parent | 26645da7613da2c50675f2059c70811354a334a3 (diff) | |
| parent | 21aadd29384bfa45639940fc904592b8a7a5a073 (diff) | |
Merge commit 'origin/HEAD'
Conflicts:
gsm-tvoid/src/lib/gsm.i
gsm-tvoid/src/lib/gsm_burst.cc
gsm-tvoid/src/lib/gsm_burst.h
gsm-tvoid/src/lib/gsm_burst_cf.cc
gsm-tvoid/src/lib/gsm_burst_ff.cc
gsm-tvoid/src/lib/gsm_burst_ff.h
gsm-tvoid/src/python/gsm_scan.py
Diffstat (limited to 'gsm-tvoid/src/lib/sch.c')
| -rw-r--r-- | gsm-tvoid/src/lib/sch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gsm-tvoid/src/lib/sch.c b/gsm-tvoid/src/lib/sch.c index c01d7bb..d311371 100644 --- a/gsm-tvoid/src/lib/sch.c +++ b/gsm-tvoid/src/lib/sch.c @@ -243,10 +243,10 @@ int decode_sch(const unsigned char *buf, int *fn_o, int *bsic_o) { unsigned char data[CONV_SIZE], decoded_data[PARITY_OUTPUT_SIZE]; // extract encoded data from synchronization burst - /* buf + 3, 39 bit */ - /* buf + 3 + 39 + 64 = 106, 39 */ - memcpy(data, buf + SB_EDATA_OS_1, SB_EDATA_LEN_1); - memcpy(data + SB_EDATA_LEN_1, buf + SB_EDATA_OS_2, SB_EDATA_LEN_2); + /* buf, 39 bit */ + /* buf + 39 + 64 = 103, 39 */ + memcpy(data, buf, SB_EDATA_LEN_1); + memcpy(data + SB_EDATA_LEN_1, buf + SB_EDATA_LEN_1 + N_SYNC_BITS, SB_EDATA_LEN_2); // Viterbi decode if(errors = conv_decode(data, decoded_data)) { |