diff options
author | Harald Welte <laforge@gnumonks.org> | 2014-08-20 22:04:11 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2014-08-20 23:41:07 +0200 |
commit | b65f58f6f9e504a017e83634e1cceebdd7525fdb (patch) | |
tree | 47853fc50e66c59a39d4dac8188641468dd51610 /include | |
parent | 46fc7e2df78d489bfd9de2fa4084ea8d369f1401 (diff) |
move various generic IPA related functions to libosmocore
libosmo-abis is about forming A-bis interfaces/lines by means
of E1 or the IPA multiplex (or possibly other link layers).
The IPA multiplex is used in other contexts, such as the Control
interface, or the A interface. In that context, it makes sense to have
generic IPA related functions in libosmocore.
Diffstat (limited to 'include')
-rw-r--r-- | include/osmocom/abis/ipa.h | 15 | ||||
-rw-r--r-- | include/osmocom/abis/ipaccess.h | 13 |
2 files changed, 1 insertions, 27 deletions
diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index 17b5f23..19815f6 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -4,7 +4,7 @@ #include <stdint.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/timer.h> -#include <osmocom/abis/ipaccess.h> +#include <osmocom/gsm/ipa.h> struct ipa_server_link { struct e1inp_line *line; @@ -80,22 +80,9 @@ void ipa_client_conn_close(struct ipa_client_conn *link); void ipa_client_conn_send(struct ipa_client_conn *link, struct msgb *msg); -int ipa_msg_recv(int fd, struct msgb **rmsg); -int ipa_msg_recv_buffered(int fd, struct msgb **rmsg, struct msgb **tmp_msg); - -int ipaccess_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd); int ipaccess_bts_handle_ccm(struct ipa_client_conn *link, struct ipaccess_unit *dev, struct msgb *msg); -void ipaccess_prepend_header(struct msgb *msg, int proto); -void ipaccess_prepend_header_ext(struct msgb *msg, int proto); - void ipa_msg_push_header(struct msgb *msg, uint8_t proto); -int ipaccess_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len); -int ipaccess_send_id_req(int fd); -int ipaccess_parse_unitid(const char *str, struct ipaccess_unit *unit_data); -int ipaccess_tlv_to_unitdata(struct ipaccess_unit *ud, - const struct tlv_parsed *tp); - #endif diff --git a/include/osmocom/abis/ipaccess.h b/include/osmocom/abis/ipaccess.h index 1992807..b1fe2c9 100644 --- a/include/osmocom/abis/ipaccess.h +++ b/include/osmocom/abis/ipaccess.h @@ -4,19 +4,6 @@ #include <stdint.h> #include <osmocom/gsm/protocol/ipaccess.h> -struct ipaccess_unit { - uint16_t site_id; - uint16_t bts_id; - uint16_t trx_id; - char *unit_name; - char *equipvers; - char *swversion; - uint8_t mac_addr[6]; - char *location1; - char *location2; - char *serno; -}; - /* quick solution to get openBSC's ipaccess tools working. */ extern int ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what); |