diff options
-rw-r--r-- | include/osmo-bts/Makefile.am | 2 | ||||
-rw-r--r-- | include/osmo-bts/scheduler.h (renamed from src/osmo-bts-trx/scheduler.h) | 0 | ||||
-rw-r--r-- | include/osmo-bts/scheduler_backend.h (renamed from src/osmo-bts-trx/scheduler_backend.h) | 0 | ||||
-rw-r--r-- | src/common/Makefile.am | 4 | ||||
-rw-r--r-- | src/common/scheduler.c (renamed from src/osmo-bts-trx/scheduler.c) | 5 | ||||
-rw-r--r-- | src/osmo-bts-trx/Makefile.am | 6 | ||||
-rw-r--r-- | src/osmo-bts-trx/l1_if.c | 2 | ||||
-rw-r--r-- | src/osmo-bts-trx/l1_if.h | 2 | ||||
-rw-r--r-- | src/osmo-bts-trx/main.c | 2 | ||||
-rw-r--r-- | src/osmo-bts-trx/scheduler_trx.c | 4 | ||||
-rw-r--r-- | src/osmo-bts-trx/trx_if.c | 2 | ||||
-rw-r--r-- | src/osmo-bts-trx/trx_vty.c | 2 |
12 files changed, 16 insertions, 15 deletions
diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index bf037ae3..af88a1ac 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -1,4 +1,4 @@ noinst_HEADERS = abis.h bts.h bts_model.h gsm_data.h logging.h measurement.h \ oml.h paging.h rsl.h signal.h vty.h amr.h pcu_if.h pcuif_proto.h \ handover.h msg_utils.h tx_power.h control_if.h cbch.h l1sap.h \ - power_control.h + power_control.h scheduler.h scheduler_backend.h diff --git a/src/osmo-bts-trx/scheduler.h b/include/osmo-bts/scheduler.h index 13ef0511..13ef0511 100644 --- a/src/osmo-bts-trx/scheduler.h +++ b/include/osmo-bts/scheduler.h diff --git a/src/osmo-bts-trx/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h index 9f663cdd..9f663cdd 100644 --- a/src/osmo-bts-trx/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h diff --git a/src/common/Makefile.am b/src/common/Makefile.am index e577eba6..fea205c1 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,10 +2,12 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(OPENBSC_INCDIR) AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) -noinst_LIBRARIES = libbts.a +noinst_LIBRARIES = libbts.a libl1sched.a libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \ rsl.c vty.c paging.c measurement.c amr.c lchan.c \ load_indication.c pcu_sock.c handover.c msg_utils.c \ load_indication.c pcu_sock.c handover.c msg_utils.c \ tx_power.c bts_ctrl_commands.c bts_ctrl_lookup.c \ l1sap.c cbch.c power_control.c main.c + +libl1sched_a_SOURCES = scheduler.c diff --git a/src/osmo-bts-trx/scheduler.c b/src/common/scheduler.c index dee46ed1..64d89ac4 100644 --- a/src/osmo-bts-trx/scheduler.c +++ b/src/common/scheduler.c @@ -35,9 +35,8 @@ #include <osmo-bts/logging.h> #include <osmo-bts/rsl.h> #include <osmo-bts/l1sap.h> - -#include "scheduler.h" -#include "scheduler_backend.h" +#include <osmo-bts/scheduler.h> +#include <osmo-bts/scheduler_backend.h> extern void *tall_bts_ctx; diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 1644af6b..0c0d2818 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -2,10 +2,10 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(OPENBSC_INCDIR) AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(ORTP_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) -EXTRA_DIST = trx_if.h l1_if.h scheduler.h scheduler_backend.h gsm0503_parity.h gsm0503_conv.h gsm0503_interleaving.h gsm0503_mapping.h gsm0503_coding.h gsm0503_tables.h loops.h amr.h +EXTRA_DIST = trx_if.h l1_if.h gsm0503_parity.h gsm0503_conv.h gsm0503_interleaving.h gsm0503_mapping.h gsm0503_coding.h gsm0503_tables.h loops.h amr.h bin_PROGRAMS = osmobts-trx -osmobts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler.c scheduler_trx.c trx_vty.c gsm0503_parity.c gsm0503_conv.c gsm0503_interleaving.c gsm0503_mapping.c gsm0503_coding.c gsm0503_tables.c loops.c amr.c -osmobts_trx_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) +osmobts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler_trx.c trx_vty.c gsm0503_parity.c gsm0503_conv.c gsm0503_interleaving.c gsm0503_mapping.c gsm0503_coding.c gsm0503_tables.c loops.c amr.c +osmobts_trx_LDADD = $(top_builddir)/src/common/libbts.a $(top_builddir)/src/common/libl1sched.a $(LDADD) diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 70a5c591..edd4b7bd 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -36,10 +36,10 @@ #include <osmo-bts/bts_model.h> #include <osmo-bts/amr.h> #include <osmo-bts/abis.h> +#include <osmo-bts/scheduler.h> #include "l1_if.h" #include "trx_if.h" -#include "scheduler.h" static const uint8_t transceiver_chan_types[_GSM_PCHAN_MAX] = { diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 6dec2733..f4926876 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -1,7 +1,7 @@ #ifndef L1_IF_H_TRX #define L1_IF_H_TRX -#include "scheduler.h" +#include <osmo-bts/scheduler.h> struct trx_config { uint8_t poweron; /* poweron(1) or poweroff(0) */ diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 6c2dabf7..aa6987c5 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -53,10 +53,10 @@ #include <osmo-bts/pcu_if.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/control_if.h> +#include <osmo-bts/scheduler.h> #include "l1_if.h" #include "trx_if.h" -#include "scheduler.h" int bts_model_init(struct gsm_bts *bts) { diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 5629a64f..ac9212ba 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -38,10 +38,10 @@ #include <osmo-bts/rsl.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/amr.h> +#include <osmo-bts/scheduler.h> +#include <osmo-bts/scheduler_backend.h> #include "l1_if.h" -#include "scheduler.h" -#include "scheduler_backend.h" #include "gsm0503_coding.h" #include "trx_if.h" #include "loops.h" diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index c9cfaef5..dbe6f68c 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -36,10 +36,10 @@ #include <osmo-bts/logging.h> #include <osmo-bts/bts.h> +#include <osmo-bts/scheduler.h> #include "l1_if.h" #include "trx_if.h" -#include "scheduler.h" /* enable to print RSSI level graph */ //#define TOA_RSSI_DEBUG diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 5da0c21f..a4a79091 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -39,9 +39,9 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/logging.h> #include <osmo-bts/vty.h> +#include <osmo-bts/scheduler.h> #include "l1_if.h" -#include "scheduler.h" #include "trx_if.h" #include "loops.h" |