No subject
Sat Apr 16 12:26:00 UTC 2016
it should return gsm_phys_chan_config?
In the implementation we do have:
static const enum abis_nm_chan_comb chcomb4pchan[] = {
and at the indexes we use values from gsm_phys_chan_config. Do you think
the below is correct?
holger
diff --git a/include/osmocom/gsm/abis_nm.h b/include/osmocom/gsm/abis_nm.h
index 4dee012..4682ead 100644
--- a/include/osmocom/gsm/abis_nm.h
+++ b/include/osmocom/gsm/abis_nm.h
@@ -43,7 +43,7 @@ const char *abis_nm_test_name(uint8_t test);
int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan);
-enum abis_nm_chan_comb abis_nm_pchan4chcomb(uint8_t chcomb);
+enum gsm_phys_chan_config abis_nm_pchan4chcomb(uint8_t chcomb);
/*! @} */
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c
index bb7008b..2c8f871 100644
--- a/src/gsm/abis_nm.c
+++ b/src/gsm/abis_nm.c
@@ -407,7 +407,7 @@ const struct value_string abis_nm_adm_state_names[] = {
{ 0, NULL }
};
-static const enum abis_nm_chan_comb chcomb4pchan[] = {
+static const enum gsm_phys_chan_config chcomb4pchan[] = {
[GSM_PCHAN_NONE] = 0xff,
[GSM_PCHAN_CCCH] = NM_CHANC_mainBCCH,
[GSM_PCHAN_CCCH_SDCCH4] = NM_CHANC_BCCHComb,
@@ -430,7 +430,7 @@ int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan)
}
/*! \brief Obtain physical channel config for OML Channel Combination */
-enum abis_nm_chan_comb abis_nm_pchan4chcomb(uint8_t chcomb)
+enum gsm_phys_chan_config abis_nm_pchan4chcomb(uint8_t chcomb)
{
int i;
for (i = 0; i < ARRAY_SIZE(chcomb4pchan); i++) {
More information about the OpenBSC
mailing list