diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2012-08-19 19:20:43 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2012-08-19 20:14:17 +0200 |
commit | 7a3e8d01f54e68997c22036b1291f7f90a018def (patch) | |
tree | 930400e22835f6e4166a381bba170690c71e6958 /include | |
parent | 5abf7f2ea492fced6824092e1ee471c40b714bde (diff) |
consolidate ipa_unit infrastructure
Provide unified infrastructure for handling IPA units and modify
existing code to use it.
Diffstat (limited to 'include')
-rw-r--r-- | include/osmocom/netif/channel/abis_ipa_client.h | 4 | ||||
-rw-r--r-- | include/osmocom/netif/ipa_unit.h | 56 |
2 files changed, 43 insertions, 17 deletions
diff --git a/include/osmocom/netif/channel/abis_ipa_client.h b/include/osmocom/netif/channel/abis_ipa_client.h index 5790ecf..cd35852 100644 --- a/include/osmocom/netif/channel/abis_ipa_client.h +++ b/include/osmocom/netif/channel/abis_ipa_client.h @@ -1,13 +1,13 @@ #ifndef _OSMO_ABIS_IPA_CLIENT_H_ #define _OSMO_ABIS_IPA_CLIENT_H_ -struct ipaccess_unit; +struct osmo_ipa_unit; void osmo_abis_ipa_cli_set_oml_addr(struct osmo_chan *c, const char *addr); void osmo_abis_ipa_cli_set_oml_port(struct osmo_chan *c, uint16_t port); void osmo_abis_ipa_cli_set_rsl_addr(struct osmo_chan *c, const char *addr); void osmo_abis_ipa_cli_set_rsl_port(struct osmo_chan *c, uint16_t port); -void osmo_abis_ipa_cli_set_unit(struct osmo_chan *c, struct ipaccess_unit *unit); +void osmo_abis_ipa_cli_set_unit(struct osmo_chan *c, struct osmo_ipa_unit *unit); void osmo_abis_ipa_cli_set_cb_signalmsg(struct osmo_chan *c, void (*signal_msg)(struct msgb *msg, int type)); #endif /* _OSMO_ABIS_IPA_CLIENT_H_ */ diff --git a/include/osmocom/netif/ipa_unit.h b/include/osmocom/netif/ipa_unit.h index 95fde5a..2e537c4 100644 --- a/include/osmocom/netif/ipa_unit.h +++ b/include/osmocom/netif/ipa_unit.h @@ -1,20 +1,46 @@ #ifndef _IPA_UNIT_H_ #define _IPA_UNIT_H_ -struct ipaccess_unit; - -struct ipaccess_unit *osmo_ipa_unit_alloc(); -void osmo_ipa_unit_free(struct ipaccess_unit *unit); - -void osmo_ipa_unit_set_site_id(struct ipaccess_unit *unit, uint16_t site_id); -void osmo_ipa_unit_set_bts_id(struct ipaccess_unit *unit, uint16_t bts_id); -void osmo_ipa_unit_set_trx_id(struct ipaccess_unit *unit, uint16_t trx_id); -void osmo_ipa_unit_set_unit_name(struct ipaccess_unit *unit, const char *name); -void osmo_ipa_unit_set_unit_hwvers(struct ipaccess_unit *unit, const char *vers); -void osmo_ipa_unit_set_unit_swvers(struct ipaccess_unit *unit, const char *vers); -void osmo_ipa_unit_set_unit_mac_addr(struct ipaccess_unit *unit, uint8_t *addr); -void osmo_ipa_unit_set_unit_loc1(struct ipaccess_unit *unit, const char *loc); -void osmo_ipa_unit_set_unit_loc2(struct ipaccess_unit *unit, const char *loc); -void osmo_ipa_unit_set_unit_serno(struct ipaccess_unit *unit, const char *serno); +struct osmo_ipa_unit; + +struct osmo_ipa_unit *osmo_ipa_unit_alloc(size_t datalen); +void osmo_ipa_unit_free(struct osmo_ipa_unit *unit); + +void *osmo_ipa_unit_get_data(struct osmo_ipa_unit *unit); + +void osmo_ipa_unit_set_site_id(struct osmo_ipa_unit *unit, uint16_t site_id); +void osmo_ipa_unit_set_bts_id(struct osmo_ipa_unit *unit, uint16_t bts_id); +void osmo_ipa_unit_set_trx_id(struct osmo_ipa_unit *unit, uint16_t trx_id); +void osmo_ipa_unit_set_unit_name(struct osmo_ipa_unit *unit, const char *name); +void osmo_ipa_unit_set_unit_hwvers(struct osmo_ipa_unit *unit, const char *vers); +void osmo_ipa_unit_set_unit_swvers(struct osmo_ipa_unit *unit, const char *vers); +void osmo_ipa_unit_set_unit_mac_addr(struct osmo_ipa_unit *unit, uint8_t *addr); +void osmo_ipa_unit_set_unit_loc1(struct osmo_ipa_unit *unit, const char *loc); +void osmo_ipa_unit_set_unit_loc2(struct osmo_ipa_unit *unit, const char *loc); +void osmo_ipa_unit_set_unit_serno(struct osmo_ipa_unit *unit, const char *serno); + +uint16_t osmo_ipa_unit_get_site_id(struct osmo_ipa_unit *unit); +uint16_t osmo_ipa_unit_get_bts_id(struct osmo_ipa_unit *unit); +uint16_t osmo_ipa_unit_get_trx_id(struct osmo_ipa_unit *unit); +const char *osmo_ipa_unit_get_unit_name(struct osmo_ipa_unit *unit); +const char *osmo_ipa_unit_get_unit_hwvers(struct osmo_ipa_unit *unit); +const char *osmo_ipa_unit_get_unit_swvers(struct osmo_ipa_unit *unit); +uint8_t *osmo_ipa_unit_get_unit_mac_addr(struct osmo_ipa_unit *unit); +const char *osmo_ipa_unit_get_unit_loc1(struct osmo_ipa_unit *unit); +const char *osmo_ipa_unit_get_unit_loc2(struct osmo_ipa_unit *unit); +const char *osmo_ipa_unit_get_unit_serno(struct osmo_ipa_unit *unit); + +int osmo_ipa_unit_snprintf(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_mac_addr(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_name(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_loc1(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_loc2(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_hwvers(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_swvers(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_swvers(char *buf, size_t size, struct osmo_ipa_unit *unit); +int osmo_ipa_unit_snprintf_serno(char *buf, size_t size, struct osmo_ipa_unit *unit); + +struct osmo_ipa_unit *osmo_ipa_unit_find(struct llist_head *list, uint16_t site_id, uint16_t bts_id); +void osmo_ipa_unit_add(struct llist_head *list, struct osmo_ipa_unit *unit); #endif /* _IPA_UNIT_H_ */ |