host/mobile/sms: Adding SAPI 3 support to MM and RR layers

RR now handles SAPI 3 datalink.

MM connections now have and individual sapi, so MM can use right SAPI
for communication with other layers, as well as releasing the right
MM connections in case of link release.

Written-by: Andreas Eversberg <jolly@eversberg.eu>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

2 files changed, 17 insertions, 2 deletions

diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index afdcf020..fb62aae1 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -58,6 +58,7 @@ struct gsm48_mmxx_hdr {
 	int		msg_type; /* MMxx_* primitive */
 	uint32_t	ref; /* reference to transaction */
 	uint32_t	transaction_id; /* transaction identifier */
+	uint8_t		sapi; /* sapi */
 	uint8_t		emergency; /* emergency type of call */
 	uint8_t		cause; /* cause used for release */
 };
@@ -193,6 +194,9 @@ struct gsm48_mmlayer {
 	uint8_t			est_cause; /* cause of establishment msg */
 	int			mr_substate;	/* rem most recent substate */
 	uint8_t			power_off_idle; /* waits for IDLE before po */
+
+	/* sapi 3 */
+	int			sapi3_link;
 };
 
 /* MM connection entry */
@@ -204,6 +208,7 @@ struct gsm48_mm_conn {
 	uint32_t		ref; /* reference to trans */
 	uint8_t			protocol;
 	uint8_t			transaction_id;
+	uint8_t			sapi;
 
 	int			state;
 };
@@ -221,7 +226,7 @@ int gsm48_mmr_dequeue(struct osmocom_ms *ms);
 int gsm48_mmevent_dequeue(struct osmocom_ms *ms);
 int gsm48_mmxx_downmsg(struct osmocom_ms *ms, struct msgb *msg);
 struct msgb *gsm48_mmxx_msgb_alloc(int msg_type, uint32_t ref,
-	uint8_t transaction_id);
+	uint8_t transaction_id, uint8_t sapi);
 const char *get_mmr_name(int value);
 const char *get_mmxx_name(int value);
 extern const char *gsm48_mm_state_names[];
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index 118848bf..b7280fb4 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -54,6 +54,7 @@
 /* GSM 04.08 RR-SAP header */
 struct gsm48_rr_hdr {
 	uint32_t		msg_type; /* RR-* primitive */
+	uint8_t			sapi;
 	uint8_t			cause;
 };
 
@@ -63,6 +64,12 @@ struct gsm48_rr_hdr {
 #define GSM48_RR_ST_DEDICATED		2
 #define GSM48_RR_ST_REL_PEND		3
 
+/* special states for SAPI 3 link */
+#define GSM48_RR_SAPI3ST_IDLE		0
+#define GSM48_RR_SAPI3ST_WAIT_EST	1
+#define GSM48_RR_SAPI3ST_ESTAB		2
+#define GSM48_RR_SAPI3ST_WAIT_REL	3
+
 /* modify state */
 #define GSM48_RR_MOD_NONE		0
 #define GSM48_RR_MOD_IMM_ASS		1
@@ -79,7 +86,6 @@ struct gsm48_rr_cd {
 	uint8_t			maio;
 	uint8_t			hsn;
 	uint8_t			chan_nr; /* type, slot, sub slot */
-	uint8_t			link_id;
 	uint8_t			ind_tx_power; /* last indicated power */
 	uint8_t			ind_ta; /* last indicated ta */
 	uint8_t			mob_alloc_lv[9]; /* len + up to 64 bits */
@@ -176,6 +182,10 @@ struct gsm48_rrlayer {
 
 	/* audio flow */
 	uint8_t                 audio_mode;
+
+	/* sapi 3 */
+	uint8_t			sapi3_state;
+	uint8_t			sapi3_link_id;
 };
 
 const char *get_rr_name(int value);