diff options
author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-07-31 14:03:51 +0600 |
---|---|---|
committer | Vadim Yanitskiy <axilirator@gmail.com> | 2017-11-19 17:35:07 +0700 |
commit | c0100cd145ade5ff36025d9640f78ee0aabb0846 (patch) | |
tree | 98e4a101ddbb19538b50c2b430ae44ca9865f3cf /src/host/trxcon | |
parent | 8fd143ee5ae34573db56f2dd1c85ec5a6d889b32 (diff) |
host/trxcon/scheduler: get rid of useless nbits argument
Change-Id: I8508676e2cb347396c6ca6b394f13113f3e63084
Diffstat (limited to 'src/host/trxcon')
-rw-r--r-- | src/host/trxcon/sched_lchan_desc.c | 10 | ||||
-rw-r--r-- | src/host/trxcon/sched_lchan_rach.c | 3 | ||||
-rw-r--r-- | src/host/trxcon/sched_lchan_sch.c | 2 | ||||
-rw-r--r-- | src/host/trxcon/sched_lchan_xcch.c | 8 | ||||
-rw-r--r-- | src/host/trxcon/sched_trx.c | 4 | ||||
-rw-r--r-- | src/host/trxcon/sched_trx.h | 4 |
6 files changed, 12 insertions, 19 deletions
diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index dee8f6ac..c483db8b 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -40,19 +40,17 @@ /* Forward declaration of handlers */ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, - sbit_t *bits, uint16_t nbits, int8_t rssi, float toa); + sbit_t *bits, int8_t rssi, float toa); int tx_data_fn(struct trx_instance *trx, struct trx_ts *ts, - struct trx_lchan_state *lchan, uint32_t fn, - uint8_t bid, uint16_t *nbits); + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); int rx_sch_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, - sbit_t *bits, uint16_t nbits, int8_t rssi, float toa); + sbit_t *bits, int8_t rssi, float toa); int tx_rach_fn(struct trx_instance *trx, struct trx_ts *ts, - struct trx_lchan_state *lchan, uint32_t fn, - uint8_t bid, uint16_t *nbits); + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = { { diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c index 6a10ab86..2709df0e 100644 --- a/src/host/trxcon/sched_lchan_rach.c +++ b/src/host/trxcon/sched_lchan_rach.c @@ -58,8 +58,7 @@ static ubit_t rach_synch_seq[] = { /* Obtain a to-be-transmitted RACH burst */ int tx_rach_fn(struct trx_instance *trx, struct trx_ts *ts, - struct trx_lchan_state *lchan, uint32_t fn, - uint8_t bid, uint16_t *nbits) + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid) { struct trx_ts_prim *prim; struct l1ctl_rach_req *req; diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/sched_lchan_sch.c index aff8fb66..e3c4c97c 100644 --- a/src/host/trxcon/sched_lchan_sch.c +++ b/src/host/trxcon/sched_lchan_sch.c @@ -74,7 +74,7 @@ static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info) int rx_sch_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, - sbit_t *bits, uint16_t nbits, int8_t rssi, float toa) + sbit_t *bits, int8_t rssi, float toa) { sbit_t payload[2 * 39]; struct gsm_time time; diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c index aa95656b..1ea74685 100644 --- a/src/host/trxcon/sched_lchan_xcch.c +++ b/src/host/trxcon/sched_lchan_xcch.c @@ -84,7 +84,7 @@ static const uint8_t nb_training_bits[8][26] = { int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, - sbit_t *bits, uint16_t nbits, int8_t rssi, float toa) + sbit_t *bits, int8_t rssi, float toa) { const struct trx_lchan_desc *lchan_desc; int n_errors, n_bits_total, rc; @@ -189,8 +189,7 @@ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, } int tx_data_fn(struct trx_instance *trx, struct trx_ts *ts, - struct trx_lchan_state *lchan, uint32_t fn, - uint8_t bid, uint16_t *nbits) + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid) { const struct trx_lchan_desc *lchan_desc; struct trx_ts_prim *prim; @@ -250,9 +249,6 @@ send_burst: memcpy(burst + 87, offset + 58, 58); /* Payload 2/2 */ memset(burst + 145, 0, 3); /* TB */ - if (nbits) - *nbits = GSM_BURST_LEN; - LOGP(DSCH, LOGL_DEBUG, "Transmitting %s fn=%u ts=%u burst=%u\n", lchan_desc->name, fn, ts->index, bid); diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index b9f18891..956c261b 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -97,7 +97,7 @@ static void sched_frame_clck_cb(struct trx_sched *sched) /* Poke lchan handler */ if (prim->chan == chan) - handler(trx, ts, lchan, fn, bid, NULL); + handler(trx, ts, lchan, fn, bid); } } @@ -506,7 +506,7 @@ int sched_trx_handle_rx_burst(struct trx_instance *trx, uint8_t tn, /* Put burst to handler */ if (fn == burst_fn) { /* TODO: decrypt if required */ - handler(trx, ts, lchan, fn, bid, bits, nbits, rssi, toa); + handler(trx, ts, lchan, fn, bid, bits, rssi, toa); } next_frame: diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index f8a8b536..1b74041c 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -81,11 +81,11 @@ enum trx_lchan_type { typedef int trx_lchan_rx_func(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, sbit_t *bits, - uint16_t nbits, int8_t rssi, float toa); + int8_t rssi, float toa); typedef int trx_lchan_tx_func(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, - uint32_t fn, uint8_t bid, uint16_t *nbits); + uint32_t fn, uint8_t bid); struct trx_lchan_desc { /*! \brief TRX Channel Type */ |