OAP: use osmo_oap_ prefix for OAP, rather than plain oap_

this is in preparation of moving related code to libosmocore.

2 files changed, 8 insertions, 8 deletions

diff --git a/openbsc/include/openbsc/oap.h b/openbsc/include/openbsc/oap.h
index 2370cbe07..2206184d1 100644
--- a/openbsc/include/openbsc/oap.h
+++ b/openbsc/include/openbsc/oap.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 struct msgb;
-struct oap_message;
+struct osmo_oap_message;
 
 /* This is the config part for vty. It is essentially copied in oap_state,
  * where values are copied over once the config is considered valid. */
@@ -74,5 +74,5 @@ int oap_handle(struct oap_state *state, const struct msgb *msg_rx, struct msgb *
 /* Allocate a msgb and in it, return the encoded oap_msg. Return NULL on
  * error. (Like oap_encode(), but also allocates a msgb.)
  * About the name: the idea is do_something(oap_encoded(my_struct)) */
-struct msgb *oap_encoded(const struct oap_message *oap_msg);
+struct msgb *oap_encoded(const struct osmo_oap_message *oap_msg);
 
diff --git a/openbsc/include/openbsc/oap_messages.h b/openbsc/include/openbsc/oap_messages.h
index e76287bae..496a6de88 100644
--- a/openbsc/include/openbsc/oap_messages.h
+++ b/openbsc/include/openbsc/oap_messages.h
@@ -36,7 +36,7 @@ enum oap_iei {
 	OAP_CLIENT_ID_IE		= 0x30,
 };
 
-enum oap_message_type {
+enum osmo_oap_message_type {
 	OAP_MSGT_REGISTER_REQUEST	= 0b00000100,
 	OAP_MSGT_REGISTER_ERROR		= 0b00000101,
 	OAP_MSGT_REGISTER_RESULT	= 0b00000110,
@@ -50,8 +50,8 @@ enum oap_message_type {
 	OAP_MSGT_SYNC_RESULT		= 0b00001110,
 };
 
-struct oap_message {
-	enum oap_message_type	message_type;
+struct osmo_oap_message {
+	enum osmo_oap_message_type	message_type;
 	enum gsm48_gmm_cause	cause;
 	uint16_t		client_id;
 	int			rand_present;
@@ -64,7 +64,7 @@ struct oap_message {
 	uint8_t			auts[16];
 };
 
-int oap_decode(const uint8_t *data, size_t data_len,
-	       struct oap_message *oap_msg);
-void oap_encode(struct msgb *msg, const struct oap_message *oap_msg);
+int osmo_oap_decode(const uint8_t *data, size_t data_len,
+		    struct osmo_oap_message *oap_msg);
+void osmo_oap_encode(struct msgb *msg, const struct osmo_oap_message *oap_msg);