diff options
author | Philipp Maier <pmaier@sysmocom.de> | 2023-04-25 09:41:17 +0200 |
---|---|---|
committer | Philipp Maier <pmaier@sysmocom.de> | 2023-05-03 09:57:38 +0200 |
commit | 6ee8d136d3126b8392495f52510ed662b9b8fb32 (patch) | |
tree | d3444b971e971186c2e6c5cc03b875a7a37c8b27 | |
parent | 5e024342c4956f34dbc69b085229c81a20226760 (diff) |
pcu_l1_if_phy: fix API function names
The functions l1if_open_pdch and l1if_close_pdch have a misleading
naming since what they actually do is opening and closing the TRX since
they return and accept a context (obj) that is valid for a whole TRX.
This also explains why the other functions accept a timeslot as
parameter in addition to the context. Let's rename those functions so
that it is clear what they do.
Related: OS#6022
Change-Id: I395a60b2fba39bac4facec78989bac20f0cef0d3
-rw-r--r-- | src/ericsson-rbs/er_ccu_if.c | 2 | ||||
-rw-r--r-- | src/ericsson-rbs/er_ccu_l1_if.c | 4 | ||||
-rw-r--r-- | src/osmo-bts-litecell15/lc15_l1_if.c | 4 | ||||
-rw-r--r-- | src/osmo-bts-oc2g/oc2g_l1_if.c | 4 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/sysmo_l1_if.c | 4 | ||||
-rw-r--r-- | src/osmobts_sock.c | 2 | ||||
-rw-r--r-- | src/pcu_l1_if.cpp | 2 | ||||
-rw-r--r-- | src/pcu_l1_if_phy.h | 4 | ||||
-rw-r--r-- | tests/alloc/AllocTest.cpp | 4 | ||||
-rw-r--r-- | tests/alloc/MslotTest.cpp | 4 | ||||
-rw-r--r-- | tests/app_info/AppInfoTest.cpp | 4 | ||||
-rw-r--r-- | tests/edge/EdgeTest.cpp | 4 | ||||
-rw-r--r-- | tests/emu/pcu_emu.cpp | 4 | ||||
-rw-r--r-- | tests/fn/FnTest.cpp | 4 | ||||
-rw-r--r-- | tests/llc/LlcTest.cpp | 4 | ||||
-rw-r--r-- | tests/ms/MsTest.cpp | 4 | ||||
-rw-r--r-- | tests/tbf/TbfTest.cpp | 4 | ||||
-rw-r--r-- | tests/types/TypesTest.cpp | 4 | ||||
-rw-r--r-- | tests/ulc/PdchUlcTest.cpp | 4 |
19 files changed, 35 insertions, 35 deletions
diff --git a/src/ericsson-rbs/er_ccu_if.c b/src/ericsson-rbs/er_ccu_if.c index aa659a3e..fb5b1b49 100644 --- a/src/ericsson-rbs/er_ccu_if.c +++ b/src/ericsson-rbs/er_ccu_if.c @@ -184,7 +184,7 @@ static int add_i460_subslot(void *ctx, struct er_ccu_descr *ccu_descr) enum osmo_tray_sync_pat_id sync_pattern; if (ccu_descr->link.schan) { - /* NOTE: This is a serious error: subslots should be removed when l1if_close_pdch() is called by the + /* NOTE: This is a serious error: subslots should be removed when l1if_close_trx() is called by the * PCU. This log line points towards a problem with the PDCH management inside the PCU! */ LOGPCCU(ccu_descr, LOGL_ERROR, "SETUP", "I.460 subslot is already configured -- will not touch it!\n"); return -EINVAL; diff --git a/src/ericsson-rbs/er_ccu_l1_if.c b/src/ericsson-rbs/er_ccu_l1_if.c index 0fe30b27..1a1f8e4e 100644 --- a/src/ericsson-rbs/er_ccu_l1_if.c +++ b/src/ericsson-rbs/er_ccu_l1_if.c @@ -452,7 +452,7 @@ int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, return 0; } -void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_trx(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct er_trx_descr *trx_descr; unsigned int i; @@ -475,7 +475,7 @@ void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gs return trx_descr; } -int l1if_close_pdch(void *obj) +int l1if_close_trx(void *obj) { struct er_trx_descr *trx_descr = obj; unsigned int i; diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c index dce9e530..3b8b21b0 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -367,7 +367,7 @@ int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, return 0; } -void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_trx(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct lc15l1_hdl *fl1h; int rc; @@ -396,7 +396,7 @@ void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gs return fl1h; } -int l1if_close_pdch(void *obj) +int l1if_close_trx(void *obj) { struct lc15l1_hdl *fl1h = obj; if (fl1h) diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c index 93b46546..2c9da725 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -372,7 +372,7 @@ int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, return 0; } -void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_trx(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct oc2gl1_hdl *fl1h; int rc; @@ -401,7 +401,7 @@ void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gs return fl1h; } -int l1if_close_pdch(void *obj) +int l1if_close_trx(void *obj) { struct oc2gl1_hdl *fl1h = obj; if (fl1h) diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c index 99ccf9a6..e97b9bdf 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -352,7 +352,7 @@ int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, return 0; } -void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_trx(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct femtol1_hdl *fl1h; int rc; @@ -378,7 +378,7 @@ void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gs return fl1h; } -int l1if_close_pdch(void *obj) +int l1if_close_trx(void *obj) { struct femtol1_hdl *fl1h = obj; if (fl1h) diff --git a/src/osmobts_sock.c b/src/osmobts_sock.c index bf1fbb4d..c4a042fa 100644 --- a/src/osmobts_sock.c +++ b/src/osmobts_sock.c @@ -111,7 +111,7 @@ static void pcu_sock_close(int lost) for (trx = 0; trx < 8; trx++) { #ifdef ENABLE_DIRECT_PHY if (bts->trx[trx].fl1h) { - l1if_close_pdch(bts->trx[trx].fl1h); + l1if_close_trx(bts->trx[trx].fl1h); bts->trx[trx].fl1h = NULL; } #endif diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index bb0a3097..a830c318 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -884,7 +884,7 @@ bssgp_failed: LOGP(DL1IF, LOGL_DEBUG, " TRX %d hlayer1=%x\n", trx_nr, info_ind->trx[trx_nr].hlayer1); if (!bts->trx[trx_nr].fl1h) - bts->trx[trx_nr].fl1h = l1if_open_pdch( + bts->trx[trx_nr].fl1h = l1if_open_trx( bts->nr, trx_nr, info_ind->trx[trx_nr].hlayer1, the_pcu->gsmtap); diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h index 7eba5cce..08b7d238 100644 --- a/src/pcu_l1_if_phy.h +++ b/src/pcu_l1_if_phy.h @@ -4,9 +4,9 @@ #include <osmocom/core/gsmtap_util.h> int l1if_init(void); -void *l1if_open_pdch(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap); +void *l1if_open_trx(uint8_t bts_nr, uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap); 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); int l1if_disconnect_pdch(void *obj, uint8_t ts); -int l1if_close_pdch(void *obj); +int l1if_close_trx(void *obj); diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index ed13a916..8d833f54 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -928,6 +928,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/alloc/MslotTest.cpp b/tests/alloc/MslotTest.cpp index 1d5ff975..cb294f0e 100644 --- a/tests/alloc/MslotTest.cpp +++ b/tests/alloc/MslotTest.cpp @@ -176,6 +176,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index 72b8a0cf..4f928b3c 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -217,6 +217,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index edce20f1..55bf2a77 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1428,6 +1428,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index e136969d..2704bc9a 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -172,6 +172,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/fn/FnTest.cpp b/tests/fn/FnTest.cpp index f4b998ce..fa7c105d 100644 --- a/tests/fn/FnTest.cpp +++ b/tests/fn/FnTest.cpp @@ -174,10 +174,10 @@ extern "C" { } void l1if_disconnect_pdch() { abort(); } - void l1if_close_pdch() { + void l1if_close_trx() { abort(); } - void l1if_open_pdch() { + void l1if_open_trx() { abort(); } } diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index 3ceb17bb..554c7495 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -382,6 +382,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index ea54a124..f0514017 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -574,6 +574,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index b4828789..bbd68211 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3531,6 +3531,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 56908397..871e0d1b 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -994,6 +994,6 @@ extern "C" { void l1if_pdch_req() { abort(); } void l1if_connect_pdch() { abort(); } void l1if_disconnect_pdch() { abort(); } -void l1if_close_pdch() { abort(); } -void l1if_open_pdch() { abort(); } +void l1if_close_trx() { abort(); } +void l1if_open_trx() { abort(); } } diff --git a/tests/ulc/PdchUlcTest.cpp b/tests/ulc/PdchUlcTest.cpp index 47b8855d..7d649b03 100644 --- a/tests/ulc/PdchUlcTest.cpp +++ b/tests/ulc/PdchUlcTest.cpp @@ -349,10 +349,10 @@ extern "C" { } void l1if_disconnect_pdch() { abort(); } - void l1if_close_pdch() { + void l1if_close_trx() { abort(); } - void l1if_open_pdch() { + void l1if_open_trx() { abort(); } } |