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
diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h
index 7eb6d24..b35053c 100644
--- a/tests/msc_vlr/msc_vlr_tests.h
+++ b/tests/msc_vlr/msc_vlr_tests.h
@@ -53,7 +53,7 @@
extern struct gsm_bts *the_bts;
extern void *msgb_ctx;
-extern enum ran_type rx_from_ran;
+extern enum osmo_rat_type rx_from_ran;
extern const char *gsup_tx_expected;
extern bool gsup_tx_confirmed;
@@ -125,13 +125,13 @@
bssap_clear_sent = false;
}
-static inline void expect_release_clear(enum ran_type via_ran)
+static inline void expect_release_clear(enum osmo_rat_type via_ran)
{
switch (via_ran) {
- case RAN_GERAN_A:
+ case OSMO_RAT_GERAN_A:
expect_bssap_clear();
return;
- case RAN_UTRAN_IU:
+ case OSMO_RAT_UTRAN_IU:
expect_iu_release();
return;
default:
@@ -153,7 +153,7 @@
void clear_vlr();
bool conn_exists(const struct ran_conn *conn);
void conn_conclude_cm_service_req(struct ran_conn *conn,
- enum ran_type via_ran);
+ enum osmo_rat_type via_ran);
void dtap_expect_tx(const char *hex);
void dtap_expect_tx_ussd(char *ussd_text);
@@ -234,10 +234,10 @@
#define ASSERT_RELEASE_CLEAR(via_ran) \
switch (via_ran) { \
- case RAN_GERAN_A: \
+ case OSMO_RAT_GERAN_A: \
VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); \
break; \
- case RAN_UTRAN_IU: \
+ case OSMO_RAT_UTRAN_IU: \
VERBOSE_ASSERT(iu_release_sent, == true, "%d"); \
break; \
default: \
@@ -245,13 +245,13 @@
break; \
}
-static inline void bss_rnc_sends_release_clear_complete(enum ran_type via_ran)
+static inline void bss_rnc_sends_release_clear_complete(enum osmo_rat_type via_ran)
{
switch (via_ran) {
- case RAN_GERAN_A:
+ case OSMO_RAT_GERAN_A:
bss_sends_clear_complete();
return;
- case RAN_UTRAN_IU:
+ case OSMO_RAT_UTRAN_IU:
rnc_sends_release_complete();
return;
default: