cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

[VAMOS] common/scheduler: unify symbol names for training sequences 

Change-Id: Ice464e5b02b11b0f13df247fe6a01420a29bf1c5
Related: SYS#4895, OS#4941
This commit is contained in:
Vadim Yanitskiy 2021-05-19 03:47:47 +02:00 committed by fixeria
parent bdef33d527
commit ef5c364bba
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osmo-bts/scheduler_backend.h
View File

@ -35,9 +35,9 @@ struct trx_chan_desc {
extern const struct trx_chan_desc trx_chan_desc[_TRX_CHAN_MAX];
extern const ubit_t _sched_dummy_burst[];
extern const ubit_t _sched_tsc[8][26];
extern const ubit_t _sched_egprs_tsc[8][78];
extern const ubit_t _sched_sch_train[64];
extern const ubit_t _sched_train_seq_gmsk_nb[8][26];
extern const ubit_t _sched_train_seq_8psk_nb[8][78];
extern const ubit_t _sched_train_seq_gmsk_sb[64];
struct msgb *_sched_dequeue_prim(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br);

6
src/common/scheduler.c
View File

@ -63,7 +63,7 @@ const ubit_t _sched_dummy_burst[GSM_BURST_LEN] = {
};
/*! \brief Training Sequences (TS 05.02 Chapter 5.2.3) */
const ubit_t _sched_tsc[8][26] = {
const ubit_t _sched_train_seq_gmsk_nb[8][26] = {
{ 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,1,1,0,1,1,1, },
{ 0,1,0,0,0,0,1,1,1,0,1,1,1,0,1,0,0,1,0,0,0,0,1,1,1,0, },
@ -74,7 +74,7 @@ const ubit_t _sched_tsc[8][26] = {
{ 1,1,1,0,1,1,1,1,0,0,0,1,0,0,1,0,1,1,1,0,1,1,1,1,0,0, },
};
const ubit_t _sched_egprs_tsc[8][78] = {
const ubit_t _sched_train_seq_8psk_nb[8][78] = {
{ 1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,0,0,1,1,1,1,0,0,1,0,0,
1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,
1,1,0,0,1,1,1,1,1,1,1,0,0,1,1,1,1,0,0,1,0,0,1,0,0,1, },
@ -102,7 +102,7 @@ const ubit_t _sched_egprs_tsc[8][78] = {
};
/*! \brief SCH training sequence (TS 05.02 Chapter 5.2.5) */
const ubit_t _sched_sch_train[64] = {
const ubit_t _sched_train_seq_gmsk_sb[64] = {
1,0,1,1,1,0,0,1,0,1,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,1,1,1,1,
0,0,1,0,1,1,0,1,0,1,0,0,0,1,0,1,0,1,1,1,0,1,1,0,0,0,0,1,1,0,1,1,
};

2
src/osmo-bts-trx/sched_lchan_fcch_sch.c
View File

@ -80,7 +80,7 @@ int tx_sch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br)
/* compose burst */
memcpy(br->burst + 3, burst, 39);
memcpy(br->burst + 42, _sched_sch_train, 64);
memcpy(br->burst + 42, _sched_train_seq_gmsk_sb, 64);
memcpy(br->burst + 106, burst + 39, 39);
br->burst_len = GSM_BURST_LEN;

4
src/osmo-bts-trx/sched_lchan_pdtch.c
View File

@ -212,7 +212,7 @@ send_burst:
burst = *bursts_p + br->bid * 348;
memset(br->burst, 1, 9);
memcpy(br->burst + 9, burst, 174);
memcpy(br->burst + 183, _sched_egprs_tsc[gsm_ts_tsc(l1ts->ts)], 78);
memcpy(br->burst + 183, _sched_train_seq_8psk_nb[gsm_ts_tsc(l1ts->ts)], 78);
memcpy(br->burst + 261, burst + 174, 174);
memset(br->burst + 435, 1, 9);
@ -220,7 +220,7 @@ send_burst:
} else {
burst = *bursts_p + br->bid * 116;
memcpy(br->burst + 3, burst, 58);
memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 87, burst + 58, 58);
br->burst_len = GSM_BURST_LEN;

2
src/osmo-bts-trx/sched_lchan_tchf.c
View File

@ -562,7 +562,7 @@ send_burst:
/* compose burst */
burst = *bursts_p + br->bid * 116;
memcpy(br->burst + 3, burst, 58);
memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 87, burst + 58, 58);
br->burst_len = GSM_BURST_LEN;

2
src/osmo-bts-trx/sched_lchan_tchh.c
View File

@ -451,7 +451,7 @@ send_burst:
/* compose burst */
burst = *bursts_p + br->bid * 116;
memcpy(br->burst + 3, burst, 58);
memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 87, burst + 58, 58);
br->burst_len = GSM_BURST_LEN;

2
src/osmo-bts-trx/sched_lchan_xcch.c
View File

@ -239,7 +239,7 @@ send_burst:
/* compose burst */
burst = *bursts_p + br->bid * 116;
memcpy(br->burst + 3, burst, 58);
memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);
memcpy(br->burst + 87, burst + 58, 58);
br->burst_len = GSM_BURST_LEN;