paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-03 13:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

msc: Add channel information to the meas_feed, bump version to v1.

Browse Source
This commit is contained in:
Alexander Chemeris
2015-08-20 20:48:39 -04:00
committed by Holger Hans Peter Freyther
parent d721579a6a
commit 08c508f84a
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openbsc/include/openbsc/meas_feed.h
View File

@@ -17,13 +17,25 @@ struct meas_feed_meas {
char name[31+1]; char name[31+1];
char scenario[31+1]; char scenario[31+1];
struct gsm_meas_rep mr; struct gsm_meas_rep mr;
/* The logical channel type, enum gsm_chan_t */
uint8_t lchan_type;
/* The physical channel type, enum gsm_phys_chan_config */
uint8_t pchan_type;
/* number of ths BTS in network */
uint8_t bts_nr;
/* number of this TRX in the BTS */
uint8_t trx_nr;
/* number of this timeslot at the TRX */
uint8_t ts_nr;
/* The logical subslot number in the TS */
uint8_t ss_nr;
}; };
enum meas_feed_msgtype { enum meas_feed_msgtype {
MEAS_FEED_MEAS = 0, MEAS_FEED_MEAS = 0,
}; };
#define MEAS_FEED_VERSION 0 #define MEAS_FEED_VERSION 1
#endif #endif

9
openbsc/src/libmsc/meas_feed.c
View File

@@ -62,6 +62,15 @@ static int process_meas_rep(struct gsm_meas_rep *mr)
/* copy the entire measurement report */ /* copy the entire measurement report */
memcpy(&mfm->mr, mr, sizeof(mfm->mr)); memcpy(&mfm->mr, mr, sizeof(mfm->mr));
/* copy channel information */
/* we assume that the measurement report always belong to some timeslot */
mfm->lchan_type = (uint8_t)mr->lchan->type;
mfm->pchan_type = (uint8_t)mr->lchan->ts->pchan;
mfm->bts_nr = mr->lchan->ts->trx->bts->nr;
mfm->trx_nr = mr->lchan->ts->trx->nr;
mfm->ts_nr = mr->lchan->ts->nr;
mfm->ss_nr = mr->lchan->nr;
/* and send it to the socket */ /* and send it to the socket */
if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0)
msgb_free(msg); msgb_free(msg);