summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2017-07-28 15:36:44 +0600
committerVadim Yanitskiy <axilirator@gmail.com>2017-10-23 22:05:49 +0330
commit32c49df6591a9c3d792082e54eea31dc4db51075 (patch)
treea6068483534609f0241ac776b77411e6e0fe914b
parente21e8f4141b89c97bed0a58c390d2cf80209a63f (diff)
host/trxcon/scheduler: use 'tn' instead of 'ts_num'
The new timeslot index designation is more generic for Osmocom projects, so let's use one. Change-Id: I8c0118aad439816148490e57938d7e32b6e20877
-rw-r--r--src/host/trxcon/sched_mframe.c4
-rw-r--r--src/host/trxcon/sched_trx.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/sched_mframe.c
index 5f9d78fd..25e7c29d 100644
--- a/src/host/trxcon/sched_mframe.c
+++ b/src/host/trxcon/sched_mframe.c
@@ -1800,12 +1800,12 @@ static const struct trx_multiframe layouts[] = {
};
const struct trx_multiframe *sched_mframe_layout(
- enum gsm_phys_chan_config config, int ts_num)
+ enum gsm_phys_chan_config config, int tn)
{
int i, ts_allowed;
for (i = 0; i < ARRAY_SIZE(layouts); i++) {
- ts_allowed = layouts[i].slotmask & (0x01 << ts_num);
+ ts_allowed = layouts[i].slotmask & (0x01 << tn);
if (layouts[i].chan_config == config && ts_allowed)
return &layouts[i];
}
diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h
index ad2c569d..e733de8f 100644
--- a/src/host/trxcon/sched_trx.h
+++ b/src/host/trxcon/sched_trx.h
@@ -242,7 +242,7 @@ struct trx_ts_prim {
extern const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX];
const struct trx_multiframe *sched_mframe_layout(
- enum gsm_phys_chan_config config, int ts_num);
+ enum gsm_phys_chan_config config, int tn);
/* Scheduler management functions */
int sched_trx_init(struct trx_instance *trx);
@@ -250,10 +250,10 @@ int sched_trx_reset(struct trx_instance *trx, int reset_clock);
int sched_trx_shutdown(struct trx_instance *trx);
/* Timeslot management functions */
-struct trx_ts *sched_trx_add_ts(struct trx_instance *trx, int ts_num);
-void sched_trx_del_ts(struct trx_instance *trx, int ts_num);
-int sched_trx_reset_ts(struct trx_instance *trx, int ts_num);
-int sched_trx_configure_ts(struct trx_instance *trx, int ts_num,
+struct trx_ts *sched_trx_add_ts(struct trx_instance *trx, int tn);
+void sched_trx_del_ts(struct trx_instance *trx, int tn);
+int sched_trx_reset_ts(struct trx_instance *trx, int tn);
+int sched_trx_configure_ts(struct trx_instance *trx, int tn,
enum gsm_phys_chan_config config);
/* Logical channel management functions */
@@ -265,5 +265,5 @@ int sched_trx_deactivate_lchan(struct trx_ts *ts, enum trx_lchan_type chan);
struct trx_lchan_state *sched_trx_find_lchan(struct trx_ts *ts,
enum trx_lchan_type chan);
-int sched_trx_handle_rx_burst(struct trx_instance *trx, uint8_t ts_num,
+int sched_trx_handle_rx_burst(struct trx_instance *trx, uint8_t tn,
uint32_t burst_fn, sbit_t *bits, uint16_t nbits, int8_t rssi, float toa);