diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-03-04 14:18:23 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-03-04 14:18:23 +0100 |
commit | 33e2041b289af270fad905b9b6b6ff24f74daed5 (patch) | |
tree | 18061396a6be58cd262d18b886d08e8949669910 | |
parent | 7241d22867e4a30d1f48fa71ef013fe386d90810 (diff) |
Fix include paths and start to make code compile
(still lots of missing references into osmocom-bb code)
-rw-r--r-- | include/osmo-bts/abis.h | 3 | ||||
-rw-r--r-- | include/osmo-bts/logging.h | 1 | ||||
-rw-r--r-- | src/common/bts.c | 18 | ||||
-rw-r--r-- | src/common/oml.c | 18 | ||||
-rw-r--r-- | src/common/rsl.c | 17 | ||||
-rw-r--r-- | src/common/rtp.c | 23 | ||||
-rw-r--r-- | src/common/support.c | 4 | ||||
-rw-r--r-- | src/osmo-bts-bb/l1ctl.c | 8 | ||||
-rw-r--r-- | src/osmo-bts-bb/main.c | 12 |
9 files changed, 57 insertions, 47 deletions
diff --git a/include/osmo-bts/abis.h b/include/osmo-bts/abis.h index 517c6e72..1862fd6d 100644 --- a/include/osmo-bts/abis.h +++ b/include/osmo-bts/abis.h @@ -1,6 +1,9 @@ #ifndef _ABIS_H #define _ABIS_H +#include <osmocore/select.h> +#include <osmocore/timer.h> + #define IPA_TCP_PORT_OML 3002 #define IPA_TCP_PORT_RSL 3003 diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h index 466d5953..775c969e 100644 --- a/include/osmo-bts/logging.h +++ b/include/osmo-bts/logging.h @@ -19,6 +19,7 @@ enum { DSAP, DABIS, DRTP, + DSUM, }; extern const struct log_info log_info; diff --git a/src/common/bts.c b/src/common/bts.c index 668fd917..ff23bdde 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -18,6 +18,8 @@ * */ +#include <errno.h> + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> @@ -27,14 +29,14 @@ #include <osmocore/msgb.h> #include <osmocore/talloc.h> #include <osmocore/protocol/gsm_12_21.h> -#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/common/l1l2_interface.h> -#include <osmocom/bb/bts/abis.h> -#include <osmocom/bb/bts/rtp.h> -#include <osmocom/bb/bts/bts.h> -#include <osmocom/bb/bts/rsl.h> -#include <osmocom/bb/bts/oml.h> +#include <osmo-bts/logging.h> +//#include <osmocom/bb/common/osmocom_data.h> +//#include <osmocom/bb/common/l1l2_interface.h> +#include <osmo-bts/abis.h> +#include <osmo-bts/rtp.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/rsl.h> +#include <osmo-bts/oml.h> extern void *l23_ctx; diff --git a/src/common/oml.c b/src/common/oml.c index 62be30b5..f873370f 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -23,19 +23,19 @@ * Operation and Maintainance Messages */ -#include <stdio.h> +#include <errno.h> #include <sys/types.h> #include <arpa/inet.h> #include <osmocore/protocol/gsm_12_21.h> -#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/bts/support.h> -#include <osmocom/bb/bts/abis.h> -#include <osmocom/bb/bts/rtp.h> -#include <osmocom/bb/bts/bts.h> -#include <osmocom/bb/bts/rsl.h> -#include <osmocom/bb/bts/oml.h> +#include <osmo-bts/logging.h> +//#include <osmocom/bb/common/osmocom_data.h> +#include <osmo-bts/support.h> +#include <osmo-bts/abis.h> +#include <osmo-bts/rtp.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/rsl.h> +#include <osmo-bts/oml.h> /* * support diff --git a/src/common/rsl.c b/src/common/rsl.c index 48bb99b2..2f6fbfdb 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -24,20 +24,21 @@ */ #include <stdio.h> +#include <errno.h> #include <sys/types.h> #include <arpa/inet.h> #include <osmocore/msgb.h> #include <osmocore/rsl.h> #include <osmocore/protocol/gsm_12_21.h> -#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/bts/abis.h> -#include <osmocom/bb/bts/rtp.h> -#include <osmocom/bb/bts/bts.h> -#include <osmocom/bb/bts/rsl.h> -#include <osmocom/bb/bts/oml.h> -#include <osmocom/bb/bts/support.h> +#include <osmo-bts/logging.h> +//#include <osmocom/bb/common/osmocom_data.h> +#include <osmo-bts/abis.h> +#include <osmo-bts/rtp.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/rsl.h> +#include <osmo-bts/oml.h> +#include <osmo-bts/support.h> static int rsl_tx_error_report(struct osmobts_trx *trx, uint8_t cause); diff --git a/src/common/rtp.c b/src/common/rtp.c index 64c51aa5..f62d7bd5 100644 --- a/src/common/rtp.c +++ b/src/common/rtp.c @@ -23,21 +23,24 @@ * RTP peer */ -#include <stdio.h> +#include <errno.h> #include <sys/types.h> #include <arpa/inet.h> #include <unistd.h> #include <stdlib.h> #include <time.h> - -#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/bts/support.h> -#include <osmocom/bb/bts/abis.h> -#include <osmocom/bb/bts/rtp.h> -#include <osmocom/bb/bts/bts.h> -#include <osmocom/bb/bts/rsl.h> -#include <osmocom/bb/bts/oml.h> +#include <string.h> + +#include <osmocore/msgb.h> + +#include <osmo-bts/logging.h> +//#include <osmocom/bb/common/osmocom_data.h> +#include <osmo-bts/support.h> +#include <osmo-bts/abis.h> +#include <osmo-bts/rtp.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/rsl.h> +#include <osmo-bts/oml.h> #define RTP_PORTBASE 30000 static unsigned short next_udp_port = RTP_PORTBASE; diff --git a/src/common/support.c b/src/common/support.c index 1bee3e12..45f33b88 100644 --- a/src/common/support.c +++ b/src/common/support.c @@ -20,9 +20,9 @@ #include <sys/types.h> #include <string.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/bts/support.h> #include <osmocore/protocol/gsm_12_21.h> +//#include <osmocom/bb/common/osmocom_data.h> +#include <osmo-bts/support.h> struct bts_support bts_support; diff --git a/src/osmo-bts-bb/l1ctl.c b/src/osmo-bts-bb/l1ctl.c index b99af2ff..fe64752e 100644 --- a/src/osmo-bts-bb/l1ctl.c +++ b/src/osmo-bts-bb/l1ctl.c @@ -46,10 +46,10 @@ #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/lapdm.h> -#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/bts/abis.h> -#include <osmocom/bb/bts/rtp.h> -#include <osmocom/bb/bts/bts.h> +#include <osmo-bts/logging.h> +#include <osmo-bts/abis.h> +#include <osmo-bts/rtp.h> +#include <osmo-bts/bts.h> static struct msgb *osmo_l1_alloc(uint8_t msg_type) { diff --git a/src/osmo-bts-bb/main.c b/src/osmo-bts-bb/main.c index 5dd5a799..076a6538 100644 --- a/src/osmo-bts-bb/main.c +++ b/src/osmo-bts-bb/main.c @@ -24,12 +24,12 @@ #include <osmocore/timer.h> #include <osmocore/select.h> #include <osmocore/signal.h> -#include <osmocom/bb/common/logging.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/bts/support.h> -#include <osmocom/bb/bts/abis.h> -#include <osmocom/bb/bts/rtp.h> -#include <osmocom/bb/bts/bts.h> +#include <osmo-bts/logging.h> +//#include <osmocom/bb/common/osmocom_data.h> +#include <osmo-bts/support.h> +#include <osmo-bts/abis.h> +#include <osmo-bts/rtp.h> +#include <osmo-bts/bts.h> #include <net/if.h> |