dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32426 )
Change subject: pcu_l1_if_phy: fix API function names ......................................................................
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.
Change-Id: I395a60b2fba39bac4facec78989bac20f0cef0d3 --- M src/ericsson-rbs/er_ccu_l1_if.c M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c M src/pcu_l1_if_phy.h 5 files changed, 26 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/26/32426/1
diff --git a/src/ericsson-rbs/er_ccu_l1_if.c b/src/ericsson-rbs/er_ccu_l1_if.c index babf625..dd7c9d1 100644 --- a/src/ericsson-rbs/er_ccu_l1_if.c +++ b/src/ericsson-rbs/er_ccu_l1_if.c @@ -452,7 +452,7 @@ 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 @@ 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 dce9e53..3b8b21b 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -367,7 +367,7 @@ 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 @@ 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 93b4654..2c9da72 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -372,7 +372,7 @@ 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 @@ 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 99ccf9a..e97b9bd 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -352,7 +352,7 @@ 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 @@ 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/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h index 7eba5cc..08b7d23 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);