diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-08-17 22:44:07 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-08-19 22:38:35 +0200 |
commit | ed5cacb240b846c106f0fc6a3ab8e8721f4c70a5 (patch) | |
tree | ba6bffbf0c95ecc0c50b5335bed77f3a2b29120f /openbsc/src/libcommon | |
parent | 7abecfcfc9ef94c1367cd88ac858b79d20f75db0 (diff) |
src: port openBSC over libosmo-abisopenbsc/0.9.15
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.
Diffstat (limited to 'openbsc/src/libcommon')
-rw-r--r-- | openbsc/src/libcommon/debug.c | 20 | ||||
-rw-r--r-- | openbsc/src/libcommon/socket.c | 4 |
2 files changed, 2 insertions, 22 deletions
diff --git a/openbsc/src/libcommon/debug.c b/openbsc/src/libcommon/debug.c index 479390c10..e15342ba6 100644 --- a/openbsc/src/libcommon/debug.c +++ b/openbsc/src/libcommon/debug.c @@ -95,26 +95,6 @@ static const struct log_info_cat default_categories[] = { .description = "Radio Measurement Processing", .enabled = 0, .loglevel = LOGL_NOTICE, }, - [DMI] = { - .name = "DMI", - .description = "A-bis Input Driver for Signalling", - .enabled = 0, .loglevel = LOGL_NOTICE, - }, - [DMIB] = { - .name = "DMIB", - .description = "A-bis Input Driver for B-Channels (voice)", - .enabled = 0, .loglevel = LOGL_NOTICE, - }, - [DMUX] = { - .name = "DMUX", - .description = "A-bis B-Subchannel TRAU Frame Multiplex", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, - [DINP] = { - .name = "DINP", - .description = "A-bis Intput Subsystem", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, [DSCCP] = { .name = "DSCCP", .description = "SCCP Protocol", diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c index ff846aa6a..6c47a8d13 100644 --- a/openbsc/src/libcommon/socket.c +++ b/openbsc/src/libcommon/socket.c @@ -68,7 +68,7 @@ int make_sock(struct osmo_fd *bfd, int proto, bfd->priv_nr = priv_nr; if (bfd->fd < 0) { - LOGP(DINP, LOGL_ERROR, "could not create socket.\n"); + LOGP(DLINP, LOGL_ERROR, "could not create socket.\n"); return -EIO; } @@ -84,7 +84,7 @@ int make_sock(struct osmo_fd *bfd, int proto, ret = bind(bfd->fd, (struct sockaddr *) &addr, sizeof(addr)); if (ret < 0) { - LOGP(DINP, LOGL_ERROR, "could not bind socket %s\n", + LOGP(DLINP, LOGL_ERROR, "could not bind socket %s\n", strerror(errno)); close(bfd->fd); return -EIO; |