From 5ca825e431e837b95f7db9057792e5a66de97a89 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 6 Dec 2012 12:01:38 +0100 Subject: 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. --- openbsc/src/libbsc/abis_rsl.c | 7 ++++--- openbsc/src/libbsc/chan_alloc.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'openbsc/src/libbsc') diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index d365a9718..95d5c1ea7 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -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); } diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 69b2625c5..fa369a2cd 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -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); -- cgit v1.2.3