diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-11 11:35:34 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-11 11:35:34 +0200 |
commit | 38491d813bd331fd0324383189ae888670f40eb4 (patch) | |
tree | 26686bd92d5c64367141e94ee0488c030189c929 | |
parent | 1dc9e3f2f8c1c88a511ac9da5a07b3eaab1b1cb4 (diff) |
Move pcu_sock_state to gprs section of bts_sm
Change-Id: I7d739287fd11f81ce657bac362e55fa822fb0ef5
-rw-r--r-- | include/osmo-bts/bts_sm.h | 2 | ||||
-rw-r--r-- | src/common/pcu_sock.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/osmo-bts/bts_sm.h b/include/osmo-bts/bts_sm.h index 31061157..e6610a5e 100644 --- a/include/osmo-bts/bts_sm.h +++ b/include/osmo-bts/bts_sm.h @@ -37,8 +37,8 @@ struct gsm_bts_sm { struct llist_head bts_list; unsigned int num_bts; struct osmo_plmn_id plmn; - struct pcu_sock_state *pcu_state; struct { + struct pcu_sock_state *pcu_state; struct gsm_gprs_nse nse; } gprs; }; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fe2dc177..e7bedd1f 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -585,7 +585,7 @@ int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn) int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_pag_req *pag_req; @@ -955,7 +955,7 @@ struct pcu_sock_state { int pcu_sock_send(struct msgb *msg) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct osmo_fd *conn_bfd; struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data; @@ -1209,7 +1209,7 @@ int pcu_sock_init(const char *path) osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); - g_bts_sm->pcu_state = state; + g_bts_sm->gprs.pcu_state = state; LOGP(DPCU, LOGL_INFO, "Started listening on PCU socket: %s\n", path); @@ -1218,7 +1218,7 @@ int pcu_sock_init(const char *path) void pcu_sock_exit(void) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct osmo_fd *bfd, *conn_bfd; if (!state) @@ -1232,11 +1232,11 @@ void pcu_sock_exit(void) close(bfd->fd); osmo_fd_unregister(bfd); talloc_free(state); - g_bts_sm->pcu_state = NULL; + g_bts_sm->gprs.pcu_state = NULL; } bool pcu_connected(void) { - struct pcu_sock_state *state = g_bts_sm->pcu_state; + struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; if (!state) return false; |