cellular-infrastructure
/
osmo-sgsn
mirror of https://gerrit.osmocom.org/osmo-sgsn
9
0
Fork 0
Code Issues Releases Wiki Activity

introduce new 'mode' parameter to RSL ACTIVATE CHANNEL

This commit is contained in:
Harald Welte 2009-02-28 13:19:15 +00:00
parent 4a543e81cf
commit ddab3c78c5
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/openbsc/abis_rsl.h
View File

@ -379,7 +379,7 @@ int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr,
u_int8_t bs_power, u_int8_t ms_power, u_int8_t bs_power, u_int8_t ms_power,
u_int8_t ta); u_int8_t ta);
int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type, int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type,
u_int8_t ta); u_int8_t ta, u_int8_t mode);
int rsl_chan_mode_modify_req(struct gsm_lchan *ts); int rsl_chan_mode_modify_req(struct gsm_lchan *ts);
int rsl_paging_cmd(struct gsm_bts *bts, u_int8_t paging_group, u_int8_t len, int rsl_paging_cmd(struct gsm_bts *bts, u_int8_t paging_group, u_int8_t len,
u_int8_t *ms_ident, u_int8_t chan_needed); u_int8_t *ms_ident, u_int8_t chan_needed);

21
src/abis_rsl.c
View File

@ -356,6 +356,7 @@ int rsl_sacch_filling(struct gsm_bts_trx *trx, u_int8_t type,
} }
/* Chapter 8.4.1 */ /* Chapter 8.4.1 */
#if 0
int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr, int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr,
u_int8_t act_type, u_int8_t act_type,
struct rsl_ie_chan_mode *chan_mode, struct rsl_ie_chan_mode *chan_mode,
@ -388,11 +389,10 @@ int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr,
return abis_rsl_sendmsg(msg); return abis_rsl_sendmsg(msg);
} }
#endif
#define TSC 7
int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type, int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type,
u_int8_t ta) u_int8_t ta, u_int8_t mode)
{ {
struct abis_rsl_dchan_hdr *dh; struct abis_rsl_dchan_hdr *dh;
struct msgb *msg = rsl_msgb_alloc(); struct msgb *msg = rsl_msgb_alloc();
@ -412,10 +412,17 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type,
cm.chan_rate = 0x00; cm.chan_rate = 0x00;
break; break;
case GSM_LCHAN_TCH_F: case GSM_LCHAN_TCH_F:
/* TCH/F are always activated in signalling mode first */
cm.spd_ind = RSL_CMOD_SPD_SIGN;
cm.chan_rt = RSL_CMOD_CRT_TCH_Bm; cm.chan_rt = RSL_CMOD_CRT_TCH_Bm;
cm.chan_rate = 0x00; switch (mode) {
case RSL_CMOD_SPD_SIGN:
cm.spd_ind = RSL_CMOD_SPD_SIGN;
cm.chan_rate = 0x00;
break;
case RSL_CMOD_SPD_SPEECH:
cm.spd_ind = RSL_CMOD_SPD_SPEECH;
cm.chan_rate = RSL_CMOD_SP_GSM2;
break;
}
break; break;
case GSM_LCHAN_TCH_H: case GSM_LCHAN_TCH_H:
DEBUGP(DRSL, "Unimplemented TCH_H activation\n"); DEBUGP(DRSL, "Unimplemented TCH_H activation\n");
@ -805,7 +812,7 @@ static int rsl_rx_chan_rqd(struct msgb *msg)
subch = lchan->nr; subch = lchan->nr;
lchan->ms_power = lchan->bs_power = 0x0f; /* 30dB reduction */ lchan->ms_power = lchan->bs_power = 0x0f; /* 30dB reduction */
rsl_chan_activate_lchan(lchan, 0x00, rqd_ta); rsl_chan_activate_lchan(lchan, 0x00, rqd_ta, RSL_CMOD_SPD_SIGN);
/* create IMMEDIATE ASSIGN 04.08 messge */ /* create IMMEDIATE ASSIGN 04.08 messge */
memset(&ia, 0, sizeof(ia)); memset(&ia, 0, sizeof(ia));