Fix include paths and start to make code compile
(still lots of missing references into osmocom-bb code)
This commit is contained in:
parent
7241d22867
commit
33e2041b28
|
@ -1,6 +1,9 @@
|
||||||
#ifndef _ABIS_H
|
#ifndef _ABIS_H
|
||||||
#define _ABIS_H
|
#define _ABIS_H
|
||||||
|
|
||||||
|
#include <osmocore/select.h>
|
||||||
|
#include <osmocore/timer.h>
|
||||||
|
|
||||||
#define IPA_TCP_PORT_OML 3002
|
#define IPA_TCP_PORT_OML 3002
|
||||||
#define IPA_TCP_PORT_RSL 3003
|
#define IPA_TCP_PORT_RSL 3003
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ enum {
|
||||||
DSAP,
|
DSAP,
|
||||||
DABIS,
|
DABIS,
|
||||||
DRTP,
|
DRTP,
|
||||||
|
DSUM,
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const struct log_info log_info;
|
extern const struct log_info log_info;
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
@ -27,14 +29,14 @@
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocore/msgb.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocore/talloc.h>
|
||||||
#include <osmocore/protocol/gsm_12_21.h>
|
#include <osmocore/protocol/gsm_12_21.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmo-bts/logging.h>
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
//#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/common/l1l2_interface.h>
|
//#include <osmocom/bb/common/l1l2_interface.h>
|
||||||
#include <osmocom/bb/bts/abis.h>
|
#include <osmo-bts/abis.h>
|
||||||
#include <osmocom/bb/bts/rtp.h>
|
#include <osmo-bts/rtp.h>
|
||||||
#include <osmocom/bb/bts/bts.h>
|
#include <osmo-bts/bts.h>
|
||||||
#include <osmocom/bb/bts/rsl.h>
|
#include <osmo-bts/rsl.h>
|
||||||
#include <osmocom/bb/bts/oml.h>
|
#include <osmo-bts/oml.h>
|
||||||
|
|
||||||
extern void *l23_ctx;
|
extern void *l23_ctx;
|
||||||
|
|
||||||
|
|
|
@ -23,19 +23,19 @@
|
||||||
* Operation and Maintainance Messages
|
* Operation and Maintainance Messages
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <errno.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_12_21.h>
|
#include <osmocore/protocol/gsm_12_21.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmo-bts/logging.h>
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
//#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/bts/support.h>
|
#include <osmo-bts/support.h>
|
||||||
#include <osmocom/bb/bts/abis.h>
|
#include <osmo-bts/abis.h>
|
||||||
#include <osmocom/bb/bts/rtp.h>
|
#include <osmo-bts/rtp.h>
|
||||||
#include <osmocom/bb/bts/bts.h>
|
#include <osmo-bts/bts.h>
|
||||||
#include <osmocom/bb/bts/rsl.h>
|
#include <osmo-bts/rsl.h>
|
||||||
#include <osmocom/bb/bts/oml.h>
|
#include <osmo-bts/oml.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* support
|
* support
|
||||||
|
|
|
@ -24,20 +24,21 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocore/msgb.h>
|
||||||
#include <osmocore/rsl.h>
|
#include <osmocore/rsl.h>
|
||||||
#include <osmocore/protocol/gsm_12_21.h>
|
#include <osmocore/protocol/gsm_12_21.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmo-bts/logging.h>
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
//#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/bts/abis.h>
|
#include <osmo-bts/abis.h>
|
||||||
#include <osmocom/bb/bts/rtp.h>
|
#include <osmo-bts/rtp.h>
|
||||||
#include <osmocom/bb/bts/bts.h>
|
#include <osmo-bts/bts.h>
|
||||||
#include <osmocom/bb/bts/rsl.h>
|
#include <osmo-bts/rsl.h>
|
||||||
#include <osmocom/bb/bts/oml.h>
|
#include <osmo-bts/oml.h>
|
||||||
#include <osmocom/bb/bts/support.h>
|
#include <osmo-bts/support.h>
|
||||||
|
|
||||||
static int rsl_tx_error_report(struct osmobts_trx *trx, uint8_t cause);
|
static int rsl_tx_error_report(struct osmobts_trx *trx, uint8_t cause);
|
||||||
|
|
||||||
|
|
|
@ -23,21 +23,24 @@
|
||||||
* RTP peer
|
* RTP peer
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <errno.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmocore/msgb.h>
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
|
||||||
#include <osmocom/bb/bts/support.h>
|
#include <osmo-bts/logging.h>
|
||||||
#include <osmocom/bb/bts/abis.h>
|
//#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/bts/rtp.h>
|
#include <osmo-bts/support.h>
|
||||||
#include <osmocom/bb/bts/bts.h>
|
#include <osmo-bts/abis.h>
|
||||||
#include <osmocom/bb/bts/rsl.h>
|
#include <osmo-bts/rtp.h>
|
||||||
#include <osmocom/bb/bts/oml.h>
|
#include <osmo-bts/bts.h>
|
||||||
|
#include <osmo-bts/rsl.h>
|
||||||
|
#include <osmo-bts/oml.h>
|
||||||
|
|
||||||
#define RTP_PORTBASE 30000
|
#define RTP_PORTBASE 30000
|
||||||
static unsigned short next_udp_port = RTP_PORTBASE;
|
static unsigned short next_udp_port = RTP_PORTBASE;
|
||||||
|
|
|
@ -20,9 +20,9 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <string.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 <osmocore/protocol/gsm_12_21.h>
|
||||||
|
//#include <osmocom/bb/common/osmocom_data.h>
|
||||||
|
#include <osmo-bts/support.h>
|
||||||
|
|
||||||
struct bts_support bts_support;
|
struct bts_support bts_support;
|
||||||
|
|
||||||
|
|
|
@ -46,10 +46,10 @@
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/common/l1l2_interface.h>
|
#include <osmocom/bb/common/l1l2_interface.h>
|
||||||
#include <osmocom/bb/common/lapdm.h>
|
#include <osmocom/bb/common/lapdm.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmo-bts/logging.h>
|
||||||
#include <osmocom/bb/bts/abis.h>
|
#include <osmo-bts/abis.h>
|
||||||
#include <osmocom/bb/bts/rtp.h>
|
#include <osmo-bts/rtp.h>
|
||||||
#include <osmocom/bb/bts/bts.h>
|
#include <osmo-bts/bts.h>
|
||||||
|
|
||||||
static struct msgb *osmo_l1_alloc(uint8_t msg_type)
|
static struct msgb *osmo_l1_alloc(uint8_t msg_type)
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,12 +24,12 @@
|
||||||
#include <osmocore/timer.h>
|
#include <osmocore/timer.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocore/select.h>
|
||||||
#include <osmocore/signal.h>
|
#include <osmocore/signal.h>
|
||||||
#include <osmocom/bb/common/logging.h>
|
#include <osmo-bts/logging.h>
|
||||||
#include <osmocom/bb/common/osmocom_data.h>
|
//#include <osmocom/bb/common/osmocom_data.h>
|
||||||
#include <osmocom/bb/bts/support.h>
|
#include <osmo-bts/support.h>
|
||||||
#include <osmocom/bb/bts/abis.h>
|
#include <osmo-bts/abis.h>
|
||||||
#include <osmocom/bb/bts/rtp.h>
|
#include <osmo-bts/rtp.h>
|
||||||
#include <osmocom/bb/bts/bts.h>
|
#include <osmo-bts/bts.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue