diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-01-25 07:22:59 +0100 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2013-01-25 07:22:59 +0100 |
| commit | 3afe56d7d8d63d64ec3afb7d3d3b1490426bdfa2 (patch) | |
| tree | 89e0934f49f355067c339334b77a6db4586656ec | |
| parent | 827ed55c3b6fdaa27c8454af1535b201a107626f (diff) | |
Fixed closing of PDCH when enabling sysmo-bts' direct DSP access
If not compiled with this support, the closing function does not exists,
so it must not be called.
Removed a "#warning", because closing is already supported.
| -rw-r--r-- | src/pcu_l1_if.cpp | 2 | ||||
| -rw-r--r-- | src/sysmo_sock.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index a4ab1d45..6b8b3fef 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -40,7 +40,6 @@ extern "C" { // FIXME: move this, when changed from c++ to c. extern "C" { void *l1if_open_pdch(void *priv, uint32_t hlayer1); -int l1if_close_pdch(void *obj); int l1if_connect_pdch(void *obj, uint8_t ts); int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len); @@ -476,7 +475,6 @@ bssgp_failed: "BTS. Please deactivate it!\n"); exit(0); #endif -#warning close TBD } for (ts = 0; ts < 8; ts++) { diff --git a/src/sysmo_sock.cpp b/src/sysmo_sock.cpp index 1982472b..a4cc6ded 100644 --- a/src/sysmo_sock.cpp +++ b/src/sysmo_sock.cpp @@ -99,10 +99,12 @@ static void pcu_sock_close(struct pcu_sock_state *state, int lost) /* disable all slots, kick all TBFs */ for (trx = 0; trx < 8; trx++) { +#ifdef ENABLE_SYSMODSP if (bts->trx[trx].fl1h) { l1if_close_pdch(bts->trx[trx].fl1h); bts->trx[trx].fl1h = NULL; } +#endif for (ts = 0; ts < 8; ts++) bts->trx[trx].pdch[ts].enable = 0; for (tfi = 0; tfi < 32; tfi++) { |