Osmocom Open Build Service

osmo-bts.spec Changed

commit_0978d1df716d59bc8b22c21bed036616b974f850.txt Added

commit_852b2cbadc132750014147dfbd87bb8f100962ee.txt Deleted

osmo-bts_1.7.0.7.852b2c.dsc -> osmo-bts_1.7.0.8.0978.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bts
 Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc
 Architecture: any all
-Version: 1.7.0.7.852b2c
+Version: 1.7.0.8.0978
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmobts
 Standards-Version: 3.9.8
@@ -17,8 +17,8 @@
  osmo-bts-virtual deb net optional arch=any
  osmo-bts-virtual-dbg deb debug extra arch=any
 Checksums-Sha1:
- f3321e8307ea8b068ade53767ae0f9da08ee5ec6 488328 osmo-bts_1.7.0.7.852b2c.tar.xz
+ 44b1b87d1a538afe80a24699b14b1aa52b2d45ad 489436 osmo-bts_1.7.0.8.0978.tar.xz
 Checksums-Sha256:
- 5f3fbbae5273449d05c321cc36f281d92aea7fef517d0587fe66772b182945e9 488328 osmo-bts_1.7.0.7.852b2c.tar.xz
+ 2acb00a8ab73937d072cc206d63610b2fa58b7415c82a4b93cc9ed4ef2b1b528 489436 osmo-bts_1.7.0.8.0978.tar.xz
 Files:
- af80ee7cc6b7de176754bc2ac3400820 488328 osmo-bts_1.7.0.7.852b2c.tar.xz
+ a56b440a4131b13807d68fe393d4e740 489436 osmo-bts_1.7.0.8.0978.tar.xz

osmo-bts_1.7.0.7.852b2c.tar.xz/.tarball-version -> osmo-bts_1.7.0.8.0978.tar.xz/.tarball-version Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/debian/changelog -> osmo-bts_1.7.0.8.0978.tar.xz/debian/changelog Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/include/osmo-bts/bts.h -> osmo-bts_1.7.0.8.0978.tar.xz/include/osmo-bts/bts.h Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/include/osmo-bts/bts_trx.h -> osmo-bts_1.7.0.8.0978.tar.xz/include/osmo-bts/bts_trx.h Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/include/osmo-bts/gsm_data.h -> osmo-bts_1.7.0.8.0978.tar.xz/include/osmo-bts/gsm_data.h Changed

@@ -59,6 +59,52 @@
 
 #define MAX_VERSION_LENGTH 64
 
+/* NM_IPAC_F_CHANT_* mask for NM_IPAC_EIE_CHAN_TYPES (common) */
+#define NM_IPAC_MASK_CHANT_COMMON \
+	(NM_IPAC_F_CHANT_TCHF		| \
+	 NM_IPAC_F_CHANT_TCHH		| \
+	 NM_IPAC_F_CHANT_SDCCH8		| \
+	 NM_IPAC_F_CHANT_BCCH		| \
+	 NM_IPAC_F_CHANT_BCCH_SDCCH4)
+/* NM_IPAC_F_CHANM_SPEECH_* mask for NM_IPAC_EIE_CHAN_MODES */
+#define NM_IPAC_MASK_CHANM_SPEECH \
+	(NM_IPAC_F_CHANM_SPEECH_FS	| \
+	 NM_IPAC_F_CHANM_SPEECH_EFS	| \
+	 NM_IPAC_F_CHANM_SPEECH_AFS	| \
+	 NM_IPAC_F_CHANM_SPEECH_HS	| \
+	 NM_IPAC_F_CHANM_SPEECH_AHS)
+/* NM_IPAC_F_CHANM_CSD_NT_* mask for NM_IPAC_EIE_CHAN_MODES */
+#define NM_IPAC_MASK_CHANM_CSD_NT \
+	(NM_IPAC_F_CHANM_CSD_NT_4k8	| \
+	 NM_IPAC_F_CHANM_CSD_NT_9k6	| \
+	 NM_IPAC_F_CHANM_CSD_NT_14k4)
+/* NM_IPAC_F_CHANM_CSD_T_* mask for NM_IPAC_EIE_CHAN_MODES */
+#define NM_IPAC_MASK_CHANM_CSD_T \
+	(NM_IPAC_F_CHANM_CSD_T_1200_75	| \
+	 NM_IPAC_F_CHANM_CSD_T_600	| \
+	 NM_IPAC_F_CHANM_CSD_T_1k2	| \
+	 NM_IPAC_F_CHANM_CSD_T_2k4	| \
+	 NM_IPAC_F_CHANM_CSD_T_4k8	| \
+	 NM_IPAC_F_CHANM_CSD_T_9k6	| \
+	 NM_IPAC_F_CHANM_CSD_T_14k4)
+/* NM_IPAC_F_GPRS_CODING_CS1-4 mask for NM_IPAC_EIE_GPRS_CODING */
+#define NM_IPAC_MASK_GPRS_CODING_CS \
+	(NM_IPAC_F_GPRS_CODING_CS1	| \
+	 NM_IPAC_F_GPRS_CODING_CS2	| \
+	 NM_IPAC_F_GPRS_CODING_CS3	| \
+	 NM_IPAC_F_GPRS_CODING_CS4)
+/* NM_IPAC_F_GPRS_CODING_MCS1-9 mask for NM_IPAC_EIE_GPRS_CODING */
+#define NM_IPAC_MASK_GPRS_CODING_MCS \
+	(NM_IPAC_F_GPRS_CODING_MCS1	| \
+	 NM_IPAC_F_GPRS_CODING_MCS2	| \
+	 NM_IPAC_F_GPRS_CODING_MCS3	| \
+	 NM_IPAC_F_GPRS_CODING_MCS4	| \
+	 NM_IPAC_F_GPRS_CODING_MCS5	| \
+	 NM_IPAC_F_GPRS_CODING_MCS6	| \
+	 NM_IPAC_F_GPRS_CODING_MCS7	| \
+	 NM_IPAC_F_GPRS_CODING_MCS8	| \
+	 NM_IPAC_F_GPRS_CODING_MCS9)
+
 enum gsm_bts_trx_ts_flags {
 	TS_F_PDCH_ACTIVE =		0x1000,
 	TS_F_PDCH_ACT_PENDING =		0x2000,

osmo-bts_1.7.0.7.852b2c.tar.xz/src/common/bts.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/common/bts.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/common/oml.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/common/oml.c Changed

@@ -217,6 +217,68 @@
 	msgb_tl16v_put(msg, NM_ATT_MANUF_ID, len, bts->features->data);
 }
 
+/* Add ip.access feature flags for the given MO */
+static int add_att_ipacc_features(struct msgb *msg, const struct gsm_abis_mo *mo)
+{
+	const struct gsm_bts *bts = mo->bts;
+	const struct gsm_bts_trx *trx;
+	uint32_t val;
+	uint8_t *len;
+
+	msgb_v_put(msg, NM_ATT_IPACC_SUPP_FEATURES);
+
+	/* We don't know the length yet, so we update it later. */
+	len = msgb_put(msg, 2);
+
+	switch (mo->obj_class) {
+	case NM_OC_BTS:
+		msgb_tv16_put(msg, NM_IPAC_EIE_MAX_TA, 1); /* TL16 */
+		msgb_put_u8(msg, (bts->support.max_ta >> 0) & 0xff);
+		break;
+	case NM_OC_RADIO_CARRIER:
+		trx = container_of(mo, struct gsm_bts_trx, mo);
+		msgb_tv16_put(msg, NM_IPAC_EIE_FREQ_BANDS, 1); /* TL16 */
+		msgb_put_u8(msg, (trx->support.freq_bands >> 0) & 0xff);
+		break;
+	case NM_OC_BASEB_TRANSC:
+		trx = container_of(mo, struct gsm_bts_trx, bb_transc.mo);
+		msgb_tv16_put(msg, NM_IPAC_EIE_CIPH_ALGOS, 1); /* TL16 */
+		msgb_put_u8(msg, bts->support.ciphers); /* LSB is A5/1 */
+
+		msgb_tv16_put(msg, NM_IPAC_EIE_CHAN_TYPES, 2); /* TL16 */
+		msgb_put_u8(msg, (trx->support.chan_types >> 0) & 0xff);
+		msgb_put_u8(msg, (trx->support.chan_types >> 8) & 0xff);
+
+		msgb_tv16_put(msg, NM_IPAC_EIE_CHAN_MODES, 3); /* TL16 */
+		msgb_put_u8(msg, (trx->support.chan_modes >>  0) & 0xff);
+		msgb_put_u8(msg, (trx->support.chan_modes >>  8) & 0xff);
+		msgb_put_u8(msg, (trx->support.chan_modes >> 16) & 0xff);
+
+		msgb_tv16_put(msg, NM_IPAC_EIE_RTP_FEATURES, 1); /* TL16 */
+		val = NM_IPAC_F_RTP_FEAT_IR_64k;
+		msgb_put_u8(msg, (val >> 0) & 0xff);
+
+		msgb_tv16_put(msg, NM_IPAC_EIE_RSL_FEATURES, 1); /* TL16 */
+		val = NM_IPAC_F_RSL_FEAT_DYN_PDCH_ACT
+		    | NM_IPAC_F_RSL_FEAT_RTP_PT2;
+		msgb_put_u8(msg, (val >> 0) & 0xff);
+		break;
+	case NM_OC_GPRS_CELL:
+		msgb_tv16_put(msg, NM_IPAC_EIE_GPRS_CODING, 2); /* TL16 */
+		msgb_put_u8(msg, (bts->gprs.cell.support.gprs_codings >> 0) & 0xff);
+		msgb_put_u8(msg, (bts->gprs.cell.support.gprs_codings >> 8) & 0xff);
+		break;
+	default:
+		msgb_get(msg, 1 + 2); /* TL16 */
+		return -ENOTSUP;
+	}
+
+	/* Finally, update the length */
+	osmo_store16be((uint16_t)(msg->tail - (len + 2)), len);
+
+	return 0;
+}
+
 /* send 3GPP TS 52.021 §8.11.2 Get Attribute Response */
 static int oml_tx_attr_resp(const struct gsm_abis_mo *mo,
 			    const uint8_t *attr, uint16_t attr_len)
@@ -252,6 +314,10 @@
 			else
 				goto unsupported;
 			break;
+		case NM_ATT_IPACC_SUPP_FEATURES:
+			if (add_att_ipacc_features(nmsg, mo) != 0)
+				goto unsupported;
+			break;
 		default:
 unsupported:
 			LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes %u, %s is unsupported\n",

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-lc15/l1_if.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-lc15/l1_if.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-lc15/main.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-lc15/main.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-oc2g/l1_if.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-oc2g/l1_if.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-oc2g/main.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-oc2g/main.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-octphy/l1_if.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-octphy/l1_if.c Changed

@@ -768,6 +768,7 @@
 
 	bts->variant = BTS_OSMO_OCTPHY;
 	bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
+	bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS;
 
 	/* FIXME: what is the nominal transmit power of the PHY/board? */
 	bts->c0->nominal_power = 15;
@@ -786,6 +787,29 @@
 
 int bts_model_trx_init(struct gsm_bts_trx *trx)
 {
+	/* Frequency bands indicated to the BSC */
+	trx->support.freq_bands = NM_IPAC_F_FREQ_BAND_PGSM
+				| NM_IPAC_F_FREQ_BAND_EGSM
+				| NM_IPAC_F_FREQ_BAND_RGSM
+				| NM_IPAC_F_FREQ_BAND_DCS
+				| NM_IPAC_F_FREQ_BAND_PCS
+				| NM_IPAC_F_FREQ_BAND_850
+				| NM_IPAC_F_FREQ_BAND_480
+				| NM_IPAC_F_FREQ_BAND_450;
+
+	/* Channel types and modes indicated to the BSC */
+	trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON
+#if defined(cOCTVC1_GSM_LOGICAL_CHANNEL_COMBINATION_ENUM_FCCH_SCH_BCCH_CCCH_SDCCH4_CBCH_SACCHC4)
+				| NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH
+#endif
+#if defined(cOCTVC1_GSM_LOGICAL_CHANNEL_COMBINATION_ENUM_SDCCH8_CBCH_SACCHC8)
+				| NM_IPAC_F_CHANT_SDCCH8_CBCH
+#endif
+				| NM_IPAC_F_CHANT_PDCHF
+				| NM_IPAC_F_CHANT_TCHF_PDCHF;
+	trx->support.chan_modes = NM_IPAC_F_CHANM_SPEECH_FS
+				| NM_IPAC_F_CHANM_SPEECH_HS;
+
 	return 0;
 }

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-sysmo/l1_if.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-sysmo/l1_if.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-sysmo/main.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-sysmo/main.c Changed

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-trx/main.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-trx/main.c Changed

@@ -132,6 +132,8 @@
 	bts->model_priv = bts_trx;
 	bts->variant = BTS_OSMO_TRX;
 	bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3) | CIPHER_A5(4);
+	bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS
+					    | NM_IPAC_MASK_GPRS_CODING_MCS;
 
 	/* The nominal value for each TRX is later overwritten through VTY cmd
 	 * 'nominal-tx-power' if present, otherwise through TRXC cmd NOMTXPOWER.
@@ -173,6 +175,28 @@
 
 int bts_model_trx_init(struct gsm_bts_trx *trx)
 {
+	/* Frequency bands indicated to the BSC */
+	trx->support.freq_bands = NM_IPAC_F_FREQ_BAND_PGSM
+				| NM_IPAC_F_FREQ_BAND_EGSM
+				| NM_IPAC_F_FREQ_BAND_RGSM
+				| NM_IPAC_F_FREQ_BAND_DCS
+				| NM_IPAC_F_FREQ_BAND_PCS
+				| NM_IPAC_F_FREQ_BAND_850
+				| NM_IPAC_F_FREQ_BAND_480
+				| NM_IPAC_F_FREQ_BAND_450;
+
+	/* Channel types and modes indicated to the BSC */
+	trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON
+				| NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH
+				| NM_IPAC_F_CHANT_SDCCH8_CBCH
+				| NM_IPAC_F_CHANT_PDCHF
+				| NM_IPAC_F_CHANT_TCHF_PDCHF;
+	trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH
+				| NM_IPAC_MASK_CHANM_CSD_NT
+				| NM_IPAC_MASK_CHANM_CSD_T;
+	/* TODO: NM_IPAC_F_CHANM_CSD_T_14k4 (see OS#6167) */
+	trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_T_14k4;
+
 	/* The nominal value for each TRX is later overwritten through VTY cmd
 	 * 'nominal-tx-power' if present, otherwise through TRXC cmd NOMTXPOWER.
 	 */

osmo-bts_1.7.0.7.852b2c.tar.xz/src/osmo-bts-virtual/main.c -> osmo-bts_1.7.0.8.0978.tar.xz/src/osmo-bts-virtual/main.c Changed

@@ -61,6 +61,8 @@
 	bts->model_priv = bts_virt;
 	bts->variant = BTS_OSMO_VIRTUAL;
 	bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
+	bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS
+					    | NM_IPAC_MASK_GPRS_CODING_MCS;
 
 	/* order alphabetically */
 	osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH);
@@ -78,6 +80,28 @@
 
 int bts_model_trx_init(struct gsm_bts_trx *trx)
 {
+	/* Frequency bands indicated to the BSC */
+	trx->support.freq_bands = NM_IPAC_F_FREQ_BAND_PGSM
+				| NM_IPAC_F_FREQ_BAND_EGSM
+				| NM_IPAC_F_FREQ_BAND_RGSM
+				| NM_IPAC_F_FREQ_BAND_DCS
+				| NM_IPAC_F_FREQ_BAND_PCS
+				| NM_IPAC_F_FREQ_BAND_850
+				| NM_IPAC_F_FREQ_BAND_480
+				| NM_IPAC_F_FREQ_BAND_450;
+
+	/* Channel types and modes indicated to the BSC */
+	trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON
+				| NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH
+				| NM_IPAC_F_CHANT_SDCCH8_CBCH
+				| NM_IPAC_F_CHANT_PDCHF
+				| NM_IPAC_F_CHANT_TCHF_PDCHF;
+	trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH
+				| NM_IPAC_MASK_CHANM_CSD_NT
+				| NM_IPAC_MASK_CHANM_CSD_T;
+	/* TODO: NM_IPAC_F_CHANM_CSD_T_14k4 (see OS#6167) */
+	trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_T_14k4;
+
 	return 0;
 }

Changes of Revision 156