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/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h
index d71872e..4aa771e 100644
--- a/include/osmocom/msc/ran_conn.h
+++ b/include/osmocom/msc/ran_conn.h
@@ -6,16 +6,7 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/sigtran/sccp_sap.h>
#include <osmocom/mgcp_client/mgcp_client.h>
-
-enum ran_type {
- RAN_UNKNOWN,
- RAN_GERAN_A, /* 2G / A-interface */
- RAN_UTRAN_IU, /* 3G / Iu-interface (IuCS or IuPS) */
-};
-
-extern const struct value_string ran_type_names[];
-static inline const char *ran_type_name(enum ran_type val)
-{ return get_value_string(ran_type_names, val); }
+#include <osmocom/gsm/gsm_utils.h>
enum ran_conn_fsm_event {
/* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */
@@ -115,7 +106,7 @@
struct gsm_network *network;
/* connected via 2G or 3G? */
- enum ran_type via_ran;
+ enum osmo_rat_type via_ran;
uint16_t lac;
struct geran_encr geran_encr;
@@ -177,7 +168,7 @@
struct gsm_classmark temporary_classmark;
};
-struct ran_conn *ran_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac);
+struct ran_conn *ran_conn_alloc(struct gsm_network *network, enum osmo_rat_type via_ran, uint16_t lac);
void ran_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id);
char *ran_conn_get_conn_id(struct ran_conn *conn);
diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h
index 3c778a9..029ef31 100644
--- a/include/osmocom/msc/vlr.h
+++ b/include/osmocom/msc/vlr.h
@@ -178,7 +178,7 @@
/* list of struct subscr_request */
struct llist_head requests;
uint8_t lac;
- enum ran_type attached_via_ran;
+ enum osmo_rat_type attached_via_ran;
} cs;
struct gsm_classmark classmark;