summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso2011-06-07 17:56:19 +0200
committerPablo Neira Ayuso2011-06-07 17:56:19 +0200
commit392d1dcb34cf73044bf58501c16a52a8f593c4e8 (patch)
treea5c1b357e10feba26b1620db262a494a1bab7cb2
parente1input: rework generic (virtual and real) E1 line operations (diff)
downloadlibosmo-abis-392d1dcb34cf73044bf58501c16a52a8f593c4e8.tar.gz
libosmo-abis-392d1dcb34cf73044bf58501c16a52a8f593c4e8.tar.xz
libosmo-abis-392d1dcb34cf73044bf58501c16a52a8f593c4e8.zip
include: remove superfluous definition from internal.h
Get rid of definitions that we no longer need. And move trau_frame_idle() definition where it really belongs to. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/internal.h34
-rw-r--r--include/osmocom/abis/trau_frame.h1
2 files changed, 1 insertions, 34 deletions
diff --git a/include/internal.h b/include/internal.h
index 5afcfe3..23d6261 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -33,32 +33,6 @@ enum signal_global {
S_GLOBAL_BTS_CLOSE_OM,
};
-/* from include/openbsc/vty.h, we need E1INP_NODE */
-#include <osmocom/vty/vty.h>
-#include <osmocom/vty/buffer.h>
-#include <osmocom/vty/command.h>
-
-enum bsc_vty_node {
- GSMNET_NODE = _LAST_OSMOVTY_NODE + 1,
- BTS_NODE,
- TRX_NODE,
- TS_NODE,
- SUBSCR_NODE,
- MGCP_NODE,
- GBPROXY_NODE,
- SGSN_NODE,
- NS_NODE,
- BSSGP_NODE,
- OML_NODE,
- E1INP_NODE,
- NAT_NODE,
- NAT_BSC_NODE,
- MSC_NODE,
- OM2K_NODE,
- TRUNK_NODE,
- PGROUP_NODE,
-};
-
/* from include/openbsc/debug.h */
enum {
DRLL,
@@ -94,12 +68,4 @@ struct osmo_fd;
struct msgb *ipaccess_read_msg(struct osmo_fd *bfd, int *error);
void ipaccess_prepend_header(struct msgb *msg, int proto);
-#include <stdint.h>
-
-int make_sock(struct osmo_fd *bfd, int proto,
- uint32_t ip, uint16_t port, int priv_nr,
- int (*cb)(struct osmo_fd *fd, unsigned int what), void *data);
-
-uint8_t *trau_idle_frame(void);
-
#endif
diff --git a/include/osmocom/abis/trau_frame.h b/include/osmocom/abis/trau_frame.h
index a76da33..64bec2b 100644
--- a/include/osmocom/abis/trau_frame.h
+++ b/include/osmocom/abis/trau_frame.h
@@ -59,5 +59,6 @@ int decode_trau_frame(struct decoded_trau_frame *fr, const uint8_t *trau_bits);
int encode_trau_frame(uint8_t *trau_bits, const struct decoded_trau_frame *fr);
int trau_frame_up2down(struct decoded_trau_frame *fr);
+uint8_t *trau_idle_frame(void);
#endif /* _TRAU_FRAME_H */