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

rsl: Rename the reason to release_mode and use the enum value 

The API with 0 and 1 as legal values is hard to understand. Use the
recently introduced enum values instead.
This commit is contained in:
Holger Hans Peter Freyther 2012-12-06 12:01:38 +01:00
parent 1411c066cc
commit 5ca825e431
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openbsc/include/openbsc/abis_rsl.h
View File

@ -67,7 +67,8 @@ int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act);
int abis_rsl_rcvmsg(struct msgb *msg);
uint64_t str_to_imsi(const char *imsi_str);
int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id, uint8_t reason);
int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id,
enum rsl_rel_mode release_mode);
int rsl_lchan_set_state(struct gsm_lchan *lchan, int);

2
openbsc/include/openbsc/chan_alloc.h
View File

@ -46,7 +46,7 @@ void lchan_free(struct gsm_lchan *lchan);
void lchan_reset(struct gsm_lchan *lchan);
/* Release the given lchan */
int lchan_release(struct gsm_lchan *lchan, int sacch_deact, int release_mode);
int lchan_release(struct gsm_lchan *lchan, int sacch_deact, enum rsl_rel_mode release_mode);
struct load_counter {
unsigned int total;

4
openbsc/include/openbsc/gsm_data_shared.h
View File

@ -196,8 +196,8 @@ struct gsm_lchan {
uint8_t sapis[8];
int sacch_deact;
/** GSM 08.58 9.3.20 */
int release_mode;
/* Release handling */
enum rsl_rel_mode release_mode;
struct {
uint32_t bound_ip;

7
openbsc/src/libbsc/abis_rsl.c
View File

@ -833,7 +833,8 @@ int rsl_establish_request(struct gsm_lchan *lchan, uint8_t link_id)
RELEASE CONFIRM, which we in turn use to trigger RSL CHANNEL RELEASE,
which in turn is acknowledged by RSL CHANNEL RELEASE ACK, which calls
lchan_free() */
int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id, uint8_t reason)
int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id,
enum rsl_rel_mode release_mode)
{
struct msgb *msg;
@ -841,14 +842,14 @@ int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id, uint8_t reason
msg = rsl_rll_simple(RSL_MT_REL_REQ, gsm_lchan2chan_nr(lchan),
link_id, 0);
/* 0 is normal release, 1 is local end */
msgb_tv_put(msg, RSL_IE_RELEASE_MODE, reason);
msgb_tv_put(msg, RSL_IE_RELEASE_MODE, release_mode);
/* FIXME: start some timer in case we don't receive a REL ACK ? */
msg->dst = lchan->ts->trx->rsl_link;
DEBUGP(DRLL, "%s RSL RLL RELEASE REQ (link_id=0x%02x, reason=%u)\n",
gsm_lchan_name(lchan), link_id, reason);
gsm_lchan_name(lchan), link_id, release_mode);
return abis_rsl_sendmsg(msg);
}

4
openbsc/src/libbsc/chan_alloc.c
View File

@ -345,7 +345,7 @@ void lchan_free(struct gsm_lchan *lchan)
}
lchan->sacch_deact = 0;
lchan->release_mode = 0;
lchan->release_mode = RSL_REL_NORMAL;
/* FIXME: ts_free() the timeslot, if we're the last logical
* channel using it */
@ -424,7 +424,7 @@ int rsl_lchan_rll_release(struct gsm_lchan *lchan, uint8_t link_id)
}
/* Consider releasing the channel now */
int lchan_release(struct gsm_lchan *lchan, int sacch_deact, int mode)
int lchan_release(struct gsm_lchan *lchan, int sacch_deact, enum rsl_rel_mode mode)
{
DEBUGP(DRLL, "%s starting release sequence\n", gsm_lchan_name(lchan));
rsl_lchan_set_state(lchan, LCHAN_S_REL_REQ);