Osmocom Open Build Service

osmo-bsc.spec Changed

commit_17df53ea1af1f3df7dc512120c2daa2b2e7f4745.txt Deleted

commit_25947b7aa4d755c7ae5bdfd7c3e6182180361826.txt Added

osmo-bsc_1.10.0.56.17df.dsc -> osmo-bsc_1.10.0.57.25947.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.10.0.56.17df
+Version: 1.10.0.57.25947
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- f3a32c6d8ec763b4364067ade596f22f2fdb8536 592684 osmo-bsc_1.10.0.56.17df.tar.xz
+ 4d1e299992b799365d35d3ef928fb62e5301c066 592648 osmo-bsc_1.10.0.57.25947.tar.xz
 Checksums-Sha256:
- 8657b00a0f3886f0cd23f2565af656e4598d265e11fa04e4eecd51a585ec0475 592684 osmo-bsc_1.10.0.56.17df.tar.xz
+ 3095e6b930ac798d871a452afddc89ae97cdd2a86887365748f8d980d2f081e9 592648 osmo-bsc_1.10.0.57.25947.tar.xz
 Files:
- 4f1cddbcab2c6eefa4105f4ccde4544f 592684 osmo-bsc_1.10.0.56.17df.tar.xz
+ 4502f17b5422f6f97828d53e7c397bcf 592648 osmo-bsc_1.10.0.57.25947.tar.xz

osmo-bsc_1.10.0.56.17df.tar.xz/.tarball-version -> osmo-bsc_1.10.0.57.25947.tar.xz/.tarball-version Changed

osmo-bsc_1.10.0.56.17df.tar.xz/debian/changelog -> osmo-bsc_1.10.0.57.25947.tar.xz/debian/changelog Changed

osmo-bsc_1.10.0.56.17df.tar.xz/src/osmo-bsc/timeslot_fsm.c -> osmo-bsc_1.10.0.57.25947.tar.xz/src/osmo-bsc/timeslot_fsm.c Changed

@@ -323,11 +323,32 @@
 	chan_counts_ts_clear(ts);
 }
 
-static void ts_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+static void ts_fsm_unused_pdch_act(struct osmo_fsm_inst *fi)
 {
 	struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);
 	struct gsm_bts *bts = ts->trx->bts;
 
+	if (bts->gprs.mode == BTS_GPRS_NONE) {
+		LOG_TS(ts, LOGL_DEBUG, "GPRS mode is 'none': not activating PDCH.\n");
+		return;
+	}
+
+	if (!ts->pdch_act_allowed) {
+		LOG_TS(ts, LOGL_DEBUG, "PDCH is disabled for this timeslot,"
+		       " either due to a PDCH ACT NACK, or from manual VTY command:"
+		       " not activating PDCH. (last error: %s)\n",
+		       ts->last_errmsg ? : "-");
+		return;
+	}
+
+	osmo_fsm_inst_state_chg(fi, TS_ST_WAIT_PDCH_ACT, CHAN_ACT_DEACT_TIMEOUT,
+				T_CHAN_ACT_DEACT);
+}
+
+static void ts_fsm_unused_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
+{
+	struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);
+
 	chan_counts_ts_update(ts);
 
 	/* We are entering the unused state. There must by definition not be any lchans waiting to be
@@ -342,19 +363,7 @@
 	switch (ts->pchan_on_init) {
 	case GSM_PCHAN_OSMO_DYN:
 	case GSM_PCHAN_TCH_F_PDCH:
-		if (bts->gprs.mode == BTS_GPRS_NONE) {
-			LOG_TS(ts, LOGL_DEBUG, "GPRS mode is 'none': not activating PDCH.\n");
-			return;
-		}
-		if (!ts->pdch_act_allowed) {
-			LOG_TS(ts, LOGL_DEBUG, "PDCH is disabled for this timeslot,"
-			       " either due to a PDCH ACT NACK, or from manual VTY command:"
-			       " not activating PDCH. (last error: %s)\n",
-			       ts->last_errmsg ? : "-");
-			return;
-		}
-		osmo_fsm_inst_state_chg(fi, TS_ST_WAIT_PDCH_ACT, CHAN_ACT_DEACT_TIMEOUT,
-					T_CHAN_ACT_DEACT);
+		ts_fsm_unused_pdch_act(fi);
 		break;
 
 	case GSM_PCHAN_CCCH_SDCCH4_CBCH:

Changes of Revision 89