From 221d3121b7e0b8ff216141432fa708fccca4b618 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 4 Jan 2019 18:12:03 +0100 Subject: layer23/sap_interface.c: avoid using 'osmo' prefix The 'osmo' prefix is usually used by libosmo-* symbols. Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 --- src/host/layer23/include/osmocom/bb/common/osmocom_data.h | 2 +- src/host/layer23/include/osmocom/bb/common/sap_interface.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/host/layer23/include/osmocom/bb') diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 486c36d0..a3ecc92c 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -23,7 +23,7 @@ struct osmocom_ms; #include struct osmosap_entity { - osmosap_cb_t msg_handler; + sap_cb_t msg_handler; uint8_t sap_state; uint16_t max_msg_size; }; diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 270c5655..5332982b 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,14 +1,14 @@ #pragma once -typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); +typedef int (*sap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); -int osmosap_init(struct osmocom_ms *ms); +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); +int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb); +int sap_init(struct osmocom_ms *ms); -enum osmosap_state { +enum sap_state { SAP_SOCKET_ERROR, SAP_NOT_CONNECTED, SAP_IDLE, @@ -18,7 +18,7 @@ enum osmosap_state { }; /* Table 5.1: Message Overview */ -enum osmosap_msg_type { +enum sap_msg_type { SAP_CONNECT_REQ = 0x00, SAP_CONNECT_RESP = 0x01, SAP_DISCONNECT_REQ = 0x02, @@ -43,7 +43,7 @@ enum osmosap_msg_type { }; /* Table 5.15: List of Parameter IDs */ -enum osmosap_param_type { +enum sap_param_type { SAP_MAX_MSG_SIZE = 0x00, SAP_CONNECTION_STATUS = 0x01, SAP_RESULT_CODE = 0x02, -- cgit v1.2.3