diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-26 00:40:18 +0100 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2019-01-04 17:26:14 +0000 |
commit | 7814a832980caa1206a3f217ef79f1a19831305a (patch) | |
tree | 7e2e1f71e3ba6966822027df5064e125d28c5024 /src/libmsc/ran_conn.c | |
parent | 3a3ed9b704bf01792628d116056b565a67a2eaa6 (diff) |
use osmo_rat_type from libosmocore
Replace locally defined enum ran_type with libosmocore's new enum
osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names.
The string representations change, which has cosmetic effects on the test suite
expectations.
Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore)
Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b
Diffstat (limited to 'src/libmsc/ran_conn.c')
-rw-r--r-- | src/libmsc/ran_conn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 9b63f16a0..d6349ebd5 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -363,7 +363,7 @@ static void ran_conn_fsm_releasing_onenter(struct osmo_fsm_inst *fi, uint32_t pr trans_conn_closed(conn); switch (conn->via_ran) { - case RAN_GERAN_A: + case OSMO_RAT_GERAN_A: a_iface_tx_clear_cmd(conn); if (conn->a.waiting_for_clear_complete) { LOGPFSML(fi, LOGL_ERROR, @@ -372,7 +372,7 @@ static void ran_conn_fsm_releasing_onenter(struct osmo_fsm_inst *fi, uint32_t pr } conn->a.waiting_for_clear_complete = true; break; - case RAN_UTRAN_IU: + case OSMO_RAT_UTRAN_IU: ranap_iu_tx_release(conn->iu.ue_ctx, NULL); if (conn->iu.waiting_for_release_complete) { LOGPFSML(fi, LOGL_ERROR, @@ -496,10 +496,10 @@ char *ran_conn_get_conn_id(struct ran_conn *conn) char *id; switch (conn->via_ran) { - case RAN_GERAN_A: + case OSMO_RAT_GERAN_A: id = talloc_asprintf(conn, "GERAN_A-%08x", conn->a.conn_id); break; - case RAN_UTRAN_IU: + case OSMO_RAT_UTRAN_IU: id = talloc_asprintf(conn, "UTRAN_IU-%08x", iu_get_conn_id(conn->iu.ue_ctx)); break; default: @@ -627,7 +627,7 @@ void ran_conn_init(void) * conn. As long as the FSM is waiting for responses from the subscriber, it will itself hold a use count * on the conn. */ struct ran_conn *ran_conn_alloc(struct gsm_network *network, - enum ran_type via_ran, uint16_t lac) + enum osmo_rat_type via_ran, uint16_t lac) { struct ran_conn *conn; struct osmo_fsm_inst *fi; |