cosmetic: more expressive function names in a_iface

The function names if the API function in a_iface.c are not
very expressive. Besides of that, the prototypes are in the
wrong header file. This commit gives the function more
expressive names and moves the prototypes in the right header
file.

2 files changed, 13 insertions, 17 deletions

diff --git a/openbsc/include/openbsc/a_iface.h b/openbsc/include/openbsc/a_iface.h
index d5c5f9efb..483ffa47f 100644
--- a/openbsc/include/openbsc/a_iface.h
+++ b/openbsc/include/openbsc/a_iface.h
@@ -22,4 +22,17 @@
 int a_init(void *ctx, const char *name, uint32_t local_pc, const char *listen_addr,
 	   const char *remote_addr, uint16_t local_port, struct gsm_network *network);
 
+/* Send DTAP message via A-interface */
+int a_iface_tx_dtap(struct msgb *msg);
+
+/* Send Cipher mode command via A-interface */
+int a_iface_tx_cipher_mode(struct gsm_subscriber_connection *conn,
+			   int cipher, const uint8_t *key, int len, int include_imeisv);
+
+/* Page a subscriber via A-interface */
+int a_iface_tx_paging(const char *imsi, uint32_t tmsi, uint16_t lac);
+
+/* Send assignment request via A-interface */
+int a_iface_tx_assignment(struct gsm_trans *trans);
+
 #pragma once
diff --git a/openbsc/include/openbsc/msc_ifaces.h b/openbsc/include/openbsc/msc_ifaces.h
index e278f9305..620859b7c 100644
--- a/openbsc/include/openbsc/msc_ifaces.h
+++ b/openbsc/include/openbsc/msc_ifaces.h
@@ -28,18 +28,6 @@
 /* Each main linkage must implement this function (see comment above). */
 extern int iu_tx(struct msgb *msg, uint8_t sapi);
 
-/* FIXME: Maybe the function prototypes that are implemented in a_iface.c
- * should be moved to a_iface.h too? */
-
-/* Send DTAP message via A-interface (see also: a_iface.c) */
-extern int a_tx(struct msgb *msg);
-
-/* Page a subscriber via A-interface (see also: a_iface.c) */
-extern int a_page(const char *imsi, uint32_t tmsi, uint16_t lac);
-
-/* Send assignment request via A-interface */
-extern int a_assign(struct gsm_trans *trans);
-
 int msc_tx_dtap(struct gsm_subscriber_connection *conn,
 		struct msgb *msg);
 
@@ -47,11 +35,6 @@ int msc_gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn);
 int msc_gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn,
 			     enum gsm48_reject_value value);
 
-/* TODO: specific to A interface, move this away */
-/* Send Cipher mode command via A-interface (see also: a_iface.c) */
-int msc_gsm0808_tx_cipher_mode(struct gsm_subscriber_connection *conn, int cipher,
-			       const uint8_t *key, int len, int include_imeisv);
-
 int msc_tx_common_id(struct gsm_subscriber_connection *conn);
 int msc_call_assignment(struct gsm_trans *trans);
 int msc_call_bridge(struct gsm_trans *trans1, struct gsm_trans *trans2);