aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-bb
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-05-22 20:26:58 +0200
committerHarald Welte <laforge@gnumonks.org>2011-05-22 20:26:58 +0200
commit8a183fb4235cdd51b660380f7e05de40713bdfa8 (patch)
treeead8f542ec53421d5109c5239303bef6ce8e65d1 /src/osmo-bts-bb
parent430f35194d1f0ed01f53bea6a8611ca0dae30065 (diff)
[partial] port to new libosmocore-0.3 APIs
Diffstat (limited to 'src/osmo-bts-bb')
-rw-r--r--src/osmo-bts-bb/l1ctl.c19
-rw-r--r--src/osmo-bts-bb/main.c11
2 files changed, 14 insertions, 16 deletions
diff --git a/src/osmo-bts-bb/l1ctl.c b/src/osmo-bts-bb/l1ctl.c
index fe64752e..6f66150d 100644
--- a/src/osmo-bts-bb/l1ctl.c
+++ b/src/osmo-bts-bb/l1ctl.c
@@ -31,16 +31,15 @@
#include <l1ctl_proto.h>
-#include <osmocore/signal.h>
-#include <osmocore/logging.h>
-#include <osmocore/timer.h>
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/gsmtap_util.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/protocol/gsm_08_58.h>
-#include <osmocore/rsl.h>
+#include <osmocom/core/signal.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/gsm/gsmtap_util.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
+#include <osmocom/gsm/rsl.h>
#include <osmocom/bb/common/l1ctl.h>
#include <osmocom/bb/common/osmocom_data.h>
diff --git a/src/osmo-bts-bb/main.c b/src/osmo-bts-bb/main.c
index 076a6538..7300b682 100644
--- a/src/osmo-bts-bb/main.c
+++ b/src/osmo-bts-bb/main.c
@@ -19,11 +19,10 @@
*/
#include <netinet/in.h>
-#include <osmocore/talloc.h>
-#include <osmocore/signal.h>
-#include <osmocore/timer.h>
-#include <osmocore/select.h>
-#include <osmocore/signal.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/signal.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/select.h>
#include <osmo-bts/logging.h>
//#include <osmocom/bb/common/osmocom_data.h>
#include <osmo-bts/support.h>
@@ -206,7 +205,7 @@ int main(int argc, char **argv)
while (!quit) {
work_bts(bts);
- bsc_select_main(0);
+ osmo_select_main(0);
}
fail: