From ed5cacb240b846c106f0fc6a3ab8e8721f4c70a5 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 17 Aug 2011 22:44:07 +0200 Subject: src: port openBSC over libosmo-abis This is a big patch that ports openBSC over libosmo-abis. Sorry, the changes that are included here are all dependent of libosmo-abis, splitting them into smaller pieces would leave the repository in some intermediate state, which is not desired. The main changes are: - The directory libabis/ has been removed as it now lives in libosmo-abis. - new configuration file format for nanoBTS and HSL femto, we need to define the virtual e1_line and attach it to the OML link. - all the existing BTS drivers (nanoBTS, hsl femto, Nokia site, BS11 and rbs2000) now use the new libosmo-abis framework. - use r232 input driver available in libosmo-abis for bs11_config. - use ipa_msg_recv instead of old ipaccess_read_msg function. - delete definition of gsm_e1_subslot and input_signal_data. These structures now lives in libosmo-abis. Most of this patch are deletions of libabis/ which has been moved to libosmo-abis. This patch also modifies openBSC to use all the new definitions available in libosmocore and libosmo-abis. In order to do that, we have replaced the following: - DINP, DMI, DMIB and DMUX by their respective DL* correspondences. - SS_GLOBAL by SS_L_GLOBAL - SS_INPUT by SS_L_INPUT - S_GLOBAL_SHUTDOWN by S_L_GLOBAL_SHUTDOWN - SS_INPUT by SS_L_INPUT - S_INP_* by S_L_INP_* sub-signals - E1INP_NODE by L_E1INP_NODE vty node This patch has been tested with: - one nanoBTS - the HSL femto with the examples available under libosmo-abis - BS11 with both dahdi and misdn drivers. --- openbsc/src/libtrau/trau_mux.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'openbsc/src/libtrau/trau_mux.c') diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c index ab2787956..6a6b7c58d 100644 --- a/openbsc/src/libtrau/trau_mux.c +++ b/openbsc/src/libtrau/trau_mux.c @@ -23,10 +23,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include @@ -70,7 +70,7 @@ int trau_mux_map(const struct gsm_e1_subslot *src, me = talloc(tall_map_ctx, struct map_entry); if (!me) { - LOGP(DMIB, LOGL_FATAL, "Out of memory\n"); + LOGP(DLMIB, LOGL_FATAL, "Out of memory\n"); return -ENOMEM; } @@ -186,7 +186,7 @@ int trau_mux_input(struct gsm_e1_subslot *src_e1_ss, if (!ue->callref) return -EINVAL; if (memcmp(tf.c_bits, c_bits_check, sizeof(c_bits_check))) - DEBUGPC(DMUX, "illegal trau (C1-C5) %s\n", + DEBUGPC(DLMUX, "illegal trau (C1-C5) %s\n", osmo_hexdump(tf.c_bits, sizeof(c_bits_check))); msg = msgb_alloc(sizeof(struct gsm_data_frame) + 33, "GSM-DATA"); @@ -232,6 +232,20 @@ int trau_mux_input(struct gsm_e1_subslot *src_e1_ss, TRAU_FRAME_BITS); } +/* callback when a TRAU frame was received */ +int subch_cb(struct subch_demux *dmx, int ch, uint8_t *data, int len, + void *_priv) +{ + struct e1inp_ts *e1i_ts = _priv; + struct gsm_e1_subslot src_ss; + + src_ss.e1_nr = e1i_ts->line->num; + src_ss.e1_ts = e1i_ts->num; + src_ss.e1_ts_ss = ch; + + return trau_mux_input(&src_ss, data, len); +} + /* add receiver instance for lchan and callref */ int trau_recv_lchan(struct gsm_lchan *lchan, uint32_t callref) { @@ -301,7 +315,7 @@ int trau_send_frame(struct gsm_lchan *lchan, struct gsm_data_frame *frame) } break; default: - DEBUGPC(DMUX, "unsupported message type %d\n", + DEBUGPC(DLMUX, "unsupported message type %d\n", frame->msg_type); return -EINVAL; } -- cgit v1.2.3