diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-09-01 09:02:24 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2014-04-05 12:48:13 +0200 |
| commit | f8745b80e9e4f4e0f4fc002017f13008074018f2 (patch) | |
| tree | ab1b8815aa4955e5f780a9a375da59fffbe34141 /src | |
| parent | f76287d9df15c408cd7c08c8c982b46c898749f6 (diff) | |
Relace bts_model_get_time() by get_time() at common part
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/bts.c | 8 | ||||
| -rw-r--r-- | src/common/rsl.c | 3 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/oml.c | 11 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/common/bts.c b/src/common/bts.c index 878770af..53324471 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -595,3 +595,11 @@ int bts_supports_cipher(struct gsm_bts_role_bts *bts, int rsl_cipher) sup = (1 << (rsl_cipher - 2)) & bts->support.ciphers; return sup > 0; } + +struct gsm_time *get_time(struct gsm_bts *bts) +{ + struct gsm_bts_role_bts *btsb = bts->role; + + return &btsb->gsm_time; +} + diff --git a/src/common/rsl.c b/src/common/rsl.c index 6b683bd5..bfd72aae 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -517,8 +517,9 @@ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan) } /* 8.4.2 sending CHANnel ACTIVation ACKnowledge */ -int rsl_tx_chan_act_ack(struct gsm_lchan *lchan, struct gsm_time *gtime) +int rsl_tx_chan_act_ack(struct gsm_lchan *lchan) { + struct gsm_time *gtime = get_time(lchan->ts->trx->bts); struct msgb *msg; uint8_t chan_nr = gsm_lchan2chan_nr(lchan); uint8_t ie[2]; diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index f8f7a0af..00f7c729 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -948,10 +948,8 @@ static int sapi_activate_cb(struct gsm_lchan *lchan, int status) if (lchan->state != LCHAN_S_ACT_REQ) return 0; - struct gsm_time *time; lchan_set_state(lchan, LCHAN_S_ACTIVE); - time = bts_model_get_time(lchan->ts->trx->bts); - rsl_tx_chan_act_ack(lchan, time); + rsl_tx_chan_act_ack(lchan); /* set the initial ciphering parameters for both directions */ l1if_set_ciphering(fl1h, lchan, 0); @@ -1500,13 +1498,6 @@ static int lchan_deactivate_sacch(struct gsm_lchan *lchan) return 0; } -struct gsm_time *bts_model_get_time(struct gsm_bts *bts) -{ - struct femtol1_hdl *fl1h = trx_femtol1_hdl(bts->c0); - - return &fl1h->gsm_time; -} - /* callback from OML */ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type, struct tlv_parsed *old_attr, struct tlv_parsed *new_attr, |