[MERGED] osmo-bts[master]: VIRT-BTS: Support for GPRS

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: VIRT-BTS: Support for GPRS
......................................................................


VIRT-BTS: Support for GPRS

Change-Id: Id851578c53255866537a16a0be6c3e9268e6ccbc
---
M src/osmo-bts-virtual/bts_model.c
M src/osmo-bts-virtual/l1_if.c
M src/osmo-bts-virtual/main.c
3 files changed, 7 insertions(+), 9 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c
index c82f1aa..b971af5 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -137,13 +137,12 @@
 	case NM_OC_SITE_MANAGER:
 	case NM_OC_BASEB_TRANSC:
 	case NM_OC_BTS:
-		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
-		rc = oml_mo_opstart_ack(mo);
-		break;
-		/* TODO: gprs support */
 	case NM_OC_GPRS_NSE:
 	case NM_OC_GPRS_CELL:
 	case NM_OC_GPRS_NSVC:
+		oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK);
+		rc = oml_mo_opstart_ack(mo);
+		break;
 	default:
 		rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP);
 	}
diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c
index bdbf2a7..cb6d483 100644
--- a/src/osmo-bts-virtual/l1_if.c
+++ b/src/osmo-bts-virtual/l1_if.c
@@ -133,6 +133,9 @@
 #endif
 	case GSMTAP_CHANNEL_SDCCH4:
 	case GSMTAP_CHANNEL_SDCCH8:
+	case GSMTAP_CHANNEL_PACCH:
+	case GSMTAP_CHANNEL_PDCH:
+	case GSMTAP_CHANNEL_PTCCH:
 		osmo_prim_init(&l1sap.oph, SAP_GSM_PH, PRIM_PH_DATA,
 		               PRIM_OP_INDICATION, msg);
 		l1sap.u.data.chan_nr = chan_nr;
@@ -142,7 +145,7 @@
 		l1sap.u.data.ber10k = 0; /* Bit Error Rate in 0.01%. Best -> 0 */
 		l1sap.u.data.ta_offs_qbits = 0; /* Burst time of arrival in quarter bits. Probably used for Timing Advance calc. Best -> 0 */
 		l1sap.u.data.lqual_cb = 10 * signal_dbm; /* Link quality in centiBel = 10 * dB. */
-		l1sap.u.data.pdch_presence_info = PRES_INFO_UNKNOWN;
+		l1sap.u.data.pdch_presence_info = PRES_INFO_BOTH;
 		break;
 	case GSMTAP_CHANNEL_AGCH:
 	case GSMTAP_CHANNEL_PCH:
@@ -151,9 +154,6 @@
 		goto nomessage;
 	case GSMTAP_CHANNEL_SDCCH:
 	case GSMTAP_CHANNEL_CCCH:
-	case GSMTAP_CHANNEL_PACCH:
-	case GSMTAP_CHANNEL_PDCH:
-	case GSMTAP_CHANNEL_PTCCH:
 	case GSMTAP_CHANNEL_CBCH51:
 	case GSMTAP_CHANNEL_CBCH52:
 		LOGP(DL1P, LOGL_NOTICE, "Ignore incoming msg - channel type not supported!\n");
diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c
index 937046b..8459107 100644
--- a/src/osmo-bts-virtual/main.c
+++ b/src/osmo-bts-virtual/main.c
@@ -51,7 +51,6 @@
 /* dummy, since no direct dsp support */
 uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
 {
-	LOGP(DSUM, LOGL_NOTICE, "Unimplemneted %s\n", __func__);
 	return 0;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/3371
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id851578c53255866537a16a0be6c3e9268e6ccbc
Gerrit-PatchSet: 5
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder