diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-05-22 20:26:58 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-05-22 20:26:58 +0200 |
| commit | 8a183fb4235cdd51b660380f7e05de40713bdfa8 (patch) | |
| tree | ead8f542ec53421d5109c5239303bef6ce8e65d1 /include | |
| parent | 430f35194d1f0ed01f53bea6a8611ca0dae30065 (diff) | |
[partial] port to new libosmocore-0.3 APIs
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmo-bts/abis.h | 8 | ||||
| -rw-r--r-- | include/osmo-bts/bts.h | 5 | ||||
| -rw-r--r-- | include/osmo-bts/logging.h | 2 | ||||
| -rw-r--r-- | include/osmo-bts/rtp.h | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/include/osmo-bts/abis.h b/include/osmo-bts/abis.h index 1862fd6d..a42f703f 100644 --- a/include/osmo-bts/abis.h +++ b/include/osmo-bts/abis.h @@ -1,8 +1,8 @@ #ifndef _ABIS_H #define _ABIS_H -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #define IPA_TCP_PORT_OML 3002 #define IPA_TCP_PORT_RSL 3003 @@ -47,8 +47,8 @@ struct ipabis_link { int state; struct osmocom_bts *bts; /* set, if OML link */ struct osmobts_trx *trx; /* set, if RSL link */ - struct bsc_fd bfd; - struct timer_list timer; + struct osmo_fd bfd; + struct osmo_timer_list timer; struct msgb *rx_msg; struct llist_head tx_queue; int ping, pong, id_resp; diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 3e37e0bf..70642207 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -62,7 +62,7 @@ struct osmobts_sysinfo { uint8_t flags[BTS_SI_NUM]; uint8_t si[BTS_SI_NUM][23]; - struct timer_list timer; + struct osmo_timer_list timer; }; struct osmobts_slot; @@ -71,7 +71,6 @@ struct osmobts_slot; struct osmobts_ms { struct llist_head entry; struct osmobts_trx *trx; - struct osmocom_ms ms; }; /* one logical channel instance */ @@ -79,7 +78,7 @@ struct osmobts_lchan { struct osmobts_slot *slot; uint8_t lchan_nr; uint8_t chan_nr; /* CBITS+TN */ - struct osmol2_entity l2_entity; + struct lapdm_channel lapdm_channel; struct osmobts_rtp rtp; }; diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h index 775c969e..601fb2f5 100644 --- a/include/osmo-bts/logging.h +++ b/include/osmo-bts/logging.h @@ -2,7 +2,7 @@ #define _LOGGING_H #define DEBUG -#include <osmocore/logging.h> +#include <osmocom/core/logging.h> enum { DRSL, diff --git a/include/osmo-bts/rtp.h b/include/osmo-bts/rtp.h index 28800fa0..d104a6b4 100644 --- a/include/osmo-bts/rtp.h +++ b/include/osmo-bts/rtp.h @@ -11,7 +11,7 @@ struct osmobts_lchan *lchan; struct osmobts_udp { struct osmobts_rtp *rtp; - struct bsc_fd bfd; + struct osmo_fd bfd; struct sockaddr_in sin_local, sin_remote; struct llist_head tx_queue; }; |