diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-02-13 04:55:50 +0100 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-02-13 04:55:55 +0100 |
| commit | 58952ac2b4bd80c341eb275e480966ac50dfa281 (patch) | |
| tree | aa95abb2e5936730f646a42cec86613db5a0d6a7 /src | |
| parent | 82aeeacd5296a6f50f51087ec562a3f01d4793d8 (diff) | |
GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c
There is no point in having it there, as VTY is the only user.
Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/l1sap.c | 17 | ||||
| -rw-r--r-- | src/common/vty.c | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 97dd6611..9b3b0870 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -350,23 +350,6 @@ struct gsmtap_inst *gsmtap = NULL; uint32_t gsmtap_sapi_mask = 0; uint8_t gsmtap_sapi_acch = 0; -const struct value_string gsmtap_sapi_names[] = { - { GSMTAP_CHANNEL_BCCH, "BCCH" }, - { GSMTAP_CHANNEL_CCCH, "CCCH" }, - { GSMTAP_CHANNEL_RACH, "RACH" }, - { GSMTAP_CHANNEL_AGCH, "AGCH" }, - { GSMTAP_CHANNEL_PCH, "PCH" }, - { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, - { GSMTAP_CHANNEL_TCH_F, "TCH/F" }, - { GSMTAP_CHANNEL_TCH_H, "TCH/H" }, - { GSMTAP_CHANNEL_PACCH, "PACCH" }, - { GSMTAP_CHANNEL_PDCH, "PDTCH" }, - { GSMTAP_CHANNEL_PTCCH, "PTCCH" }, - { GSMTAP_CHANNEL_CBCH51,"CBCH" }, - { GSMTAP_CHANNEL_ACCH, "SACCH" }, - { 0, NULL } -}; - /* send primitive as gsmtap */ static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap, uint8_t *chan_type, uint8_t *ss, uint32_t fn, diff --git a/src/common/vty.c b/src/common/vty.c index f36c09e5..84e39687 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -71,6 +71,23 @@ int g_vty_port_num = OSMO_VTY_PORT_BTS; +static const struct value_string gsmtap_sapi_names[] = { + { GSMTAP_CHANNEL_BCCH, "BCCH" }, + { GSMTAP_CHANNEL_CCCH, "CCCH" }, + { GSMTAP_CHANNEL_RACH, "RACH" }, + { GSMTAP_CHANNEL_AGCH, "AGCH" }, + { GSMTAP_CHANNEL_PCH, "PCH" }, + { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, + { GSMTAP_CHANNEL_TCH_F, "TCH/F" }, + { GSMTAP_CHANNEL_TCH_H, "TCH/H" }, + { GSMTAP_CHANNEL_PACCH, "PACCH" }, + { GSMTAP_CHANNEL_PDCH, "PDTCH" }, + { GSMTAP_CHANNEL_PTCCH, "PTCCH" }, + { GSMTAP_CHANNEL_CBCH51,"CBCH" }, + { GSMTAP_CHANNEL_ACCH, "SACCH" }, + { 0, NULL } +}; + struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr) { struct phy_link *plink = phy_link_by_num(phy_nr); |