aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2020-08-01 21:07:50 +0200
committerAlexander Couzens <lynxis@fe80.eu>2020-08-21 18:19:04 +0200
commit7186df879a80bdecbe2d52abd53de940d9258f02 (patch)
treefa88c1da7aab1f3fd8edb6fc1fa52e847b0b4fed
parent3a148696b566fe3e39e3ca8460cad2d33552b899 (diff)
fixup bssgp callback renaming
-rw-r--r--src/gprs_bssgp_pcu.cpp2
-rw-r--r--src/gprs_bssgp_pcu.h2
-rw-r--r--src/pcu_main.cpp2
-rw-r--r--tests/emu/pcu_emu.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp
index 6fef87a3..154b1be4 100644
--- a/src/gprs_bssgp_pcu.cpp
+++ b/src/gprs_bssgp_pcu.cpp
@@ -549,7 +549,7 @@ int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
return 0;
}
-int gprs_bssgp_ns_cb(enum gprs_ns_evt event, struct msgb *msg, uint16_t nsei, uint16_t bvci)
+int gprs_bssgp_ns_cb(enum gprs_ns2_evt event, struct msgb *msg, uint16_t nsei, uint16_t bvci)
{
int rc = 0;
switch (event) {
diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h
index 94fccfef..1e7a4d81 100644
--- a/src/gprs_bssgp_pcu.h
+++ b/src/gprs_bssgp_pcu.h
@@ -82,7 +82,7 @@ struct gprs_bssgp_pcu *gprs_bssgp_create_and_connect(struct gprs_rlcmac_bts *bts
uint16_t lac, uint16_t rac, uint16_t cell_id);
-int gprs_bssgp_ns_cb(enum gprs_ns_evt event, struct msgb *msg,
+int gprs_bssgp_ns_cb(enum gprs_ns2_evt event, struct msgb *msg,
uint16_t nsei, uint16_t bvci);
void gprs_bssgp_destroy(struct gprs_rlcmac_bts *bts);
diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp
index b84537bc..3656f9a0 100644
--- a/src/pcu_main.cpp
+++ b/src/pcu_main.cpp
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
LOGP(DBSSGP, LOGL_ERROR, "Failed to create NS instance\n");
exit(1);
}
- bssgp_set_bssgp_callback((bssgp_bvc_send*) gprs_ns2_send, bts->nsi);
+ bssgp_set_bssgp_callback((bssgp_bvc_send) gprs_ns2_send, bts->nsi);
gprs_ns2_vty_init(bts->nsi);
rc = vty_read_config_file(config_file, NULL);
diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp
index a338078a..eb6d80df 100644
--- a/tests/emu/pcu_emu.cpp
+++ b/tests/emu/pcu_emu.cpp
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
current_test = 0;
init_main_bts();
- bssgp_set_bssgp_callback((bssgp_bvc_send*) gprs_ns2_send, bts->nsi);
+ bssgp_set_bssgp_callback((bssgp_bvc_send) gprs_ns2_send, bts->nsi);
create_and_connect_bssgp(bts, INADDR_LOOPBACK, 23000);
for (;;)