commit 138b96f21c0992a768517011647f4e44a5912f3a
author Alexander Couzens <lynxis@fe80.eu> Mon Jan 25 16:23:29 2021 +0100
committer pespin <pespin@sysmocom.de> Thu Jan 28 11:56:37 2021 +0000
tree ab2d72b28c5e805289e9496a72ddbb93000f0fe2
parent f2afb98c833ce4a4b9c95b9b7977b1cb80d5e89f

gprs_ns2: refactor: ensure all enums have GPRS_NS2_

All public enum should have the prefix GPRS_NS2_.

API change which must be synchronized with osmo-pcu,
osmo-gbproxy, osmo-sgsn.

Change-Id: I548ff12f7277cbb7e1a630a3dc02b738ce89be72

src/gb/gprs_ns2_vc_fsm.c

diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index 7ee29a1..457a41f 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -212,7 +212,7 @@
 			osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);
 		} else {
 			/* lost connection */
-			if (priv->nsvc->mode == NS2_VC_MODE_BLOCKRESET) {
+			if (priv->nsvc->mode == GPRS_NS2_VC_MODE_BLOCKRESET) {
 				osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0);
 			} else {
 				osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);
@@ -235,10 +235,10 @@
 	switch (event) {
 	case GPRS_NS2_EV_REQ_START:
 		switch (priv->nsvc->mode) {
-		case NS2_VC_MODE_ALIVE:
+		case GPRS_NS2_VC_MODE_ALIVE:
 			osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE);
 			break;
-		case NS2_VC_MODE_BLOCKRESET:
+		case GPRS_NS2_VC_MODE_BLOCKRESET:
 			osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET);
 			break;
 		}
@@ -372,7 +372,7 @@
 
 	priv->accept_unitdata = true;
 	ns2_nse_notify_unblocked(nsvc, true);
-	ns2_prim_status_ind(nse, nsvc, 0, NS_AFF_CAUSE_VC_RECOVERY);
+	ns2_prim_status_ind(nse, nsvc, 0, GPRS_NS2_AFF_CAUSE_VC_RECOVERY);
 }
 
 static void ns2_st_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)
@@ -551,9 +551,9 @@
 
 	/* 10.3.9 NS SDU Control Bits */
 	if (nsh->data[0] & 0x1)
-		nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE;
+		nsp.u.unitdata.change = GPRS_NS2_ENDPOINT_REQUEST_CHANGE;
 
-	osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA,
+	osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA,
 			PRIM_OP_INDICATION, msg);
 	nsi->cb(&nsp.oph, nsi->cb_data);
 }
@@ -568,7 +568,7 @@
 
 	switch (event) {
 	case GPRS_NS2_EV_RX_RESET:
-		if (priv->nsvc->mode != NS2_VC_MODE_BLOCKRESET)
+		if (priv->nsvc->mode != GPRS_NS2_VC_MODE_BLOCKRESET)
 			break;
 
 		/* move the FSM into reset */