allow ASP_RSL_UD on MSC_ConnHdlr RSL
In BSC_Tests_VAMOS.ttcn, in f_est_and_reassign_to_secondary_lchan() there is a missing channel release ack. By allowing ASP_RSL_UD, this rel ack can be sent trivially. Change-Id: Icd04184ed87c359349d86c5e0893c2ce9de2f7f1
This commit is contained in:
parent
9f3e6ac649
commit
1470fc668a
|
@ -451,10 +451,8 @@ private function f_reassign_secondary_to_primary_lchan(RslChannelNr new_chan_nr)
|
||||||
}
|
}
|
||||||
[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {}
|
[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {}
|
||||||
[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
|
[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
|
||||||
/*
|
|
||||||
RSL.send(ts_ASP_RSL_UD(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr),
|
RSL.send(ts_ASP_RSL_UD(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr),
|
||||||
IPAC_PROTO_RSL_TRX0));
|
IPAC_PROTO_RSL_TRX0));
|
||||||
*/
|
|
||||||
f_rslem_unregister(0, g_chan_nr, RSL_PROC);
|
f_rslem_unregister(0, g_chan_nr, RSL_PROC);
|
||||||
g_chan_nr := new_chan_nr;
|
g_chan_nr := new_chan_nr;
|
||||||
}
|
}
|
||||||
|
@ -563,10 +561,8 @@ private function f_est_and_reassign_to_secondary_lchan(RslChannelNr new_chan_nr)
|
||||||
}
|
}
|
||||||
[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {}
|
[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {}
|
||||||
[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
|
[] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
|
||||||
/*
|
|
||||||
RSL.send(ts_ASP_RSL_UD(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr),
|
RSL.send(ts_ASP_RSL_UD(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr),
|
||||||
IPAC_PROTO_RSL_TRX0));
|
IPAC_PROTO_RSL_TRX0));
|
||||||
*/
|
|
||||||
f_rslem_unregister(0, g_chan_nr, RSL_PROC);
|
f_rslem_unregister(0, g_chan_nr, RSL_PROC);
|
||||||
g_chan_nr := new_chan_nr;
|
g_chan_nr := new_chan_nr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ template RSLEm_Event tr_RSLEm_EV(template RSLEm_EventType ev_type,
|
||||||
};
|
};
|
||||||
|
|
||||||
type port RSL_DCHAN_PT message {
|
type port RSL_DCHAN_PT message {
|
||||||
inout RSLDC_ChanRqd, RSL_Message;
|
inout RSLDC_ChanRqd, RSL_Message, ASP_RSL_Unitdata;
|
||||||
} with { extension "internal" };
|
} with { extension "internal" };
|
||||||
|
|
||||||
type port RSL_CCHAN_PT message {
|
type port RSL_CCHAN_PT message {
|
||||||
|
@ -638,6 +638,9 @@ function main(boolean bts_role := true) runs on RSL_Emulation_CT {
|
||||||
cid := f_cid_by_comp_ref(vc_conn);
|
cid := f_cid_by_comp_ref(vc_conn);
|
||||||
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg, ConnectionTable[cid].stream_id));
|
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg, ConnectionTable[cid].stream_id));
|
||||||
}
|
}
|
||||||
|
[bts_role] CLIENT_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) -> value rx_rsl {
|
||||||
|
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId));
|
||||||
|
}
|
||||||
[not bts_role] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn {
|
[not bts_role] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn {
|
||||||
cid := f_cid_by_comp_ref(vc_conn);
|
cid := f_cid_by_comp_ref(vc_conn);
|
||||||
conn_id := f_trx_conn_map_resolve(ConnectionTable[cid].stream_id);
|
conn_id := f_trx_conn_map_resolve(ConnectionTable[cid].stream_id);
|
||||||
|
|
Loading…
Reference in New Issue