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

[ip.access] Parse cell global ID as part of BCCH info

This commit is contained in:
Harald Welte 2009-11-13 11:56:05 +01:00
parent 5bde51b91e
commit b40a38ff46
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openbsc/include/openbsc/abis_nm.h
View File

@ -684,9 +684,18 @@ enum ipac_bcch_info_type {
IPAC_BINF_CELL_ALLOC = (1 << 2),
};
struct cell_global_id {
u_int16_t mcc;
u_int16_t mnc;
u_int16_t lac;
u_int16_t ci;
};
/* The BCCH info from an ip.access test, in host byte order
* and already parsed... */
struct ipac_bcch_info {
struct llist_head list;
u_int16_t info_type;
u_int8_t freq_qual;
u_int16_t arfcn;
@ -696,7 +705,7 @@ struct ipac_bcch_info {
u_int16_t frame_offset;
u_int32_t frame_nr_offset;
u_int8_t bsic;
u_int8_t cgi[7];
struct cell_global_id cgi;
u_int8_t ba_list_si2[16];
u_int8_t ba_list_si2bis[16];
u_int8_t ba_list_si2ter[16];

23
openbsc/src/abis_nm.c
View File

@ -2702,6 +2702,25 @@ const char *ipacc_testres_name(u_int8_t res)
return "unknown";
}
void ipac_parse_cgi(struct cell_global_id *cid, const u_int8_t *buf)
{
cid->mcc = (buf[0] & 0xf) * 100;
cid->mcc += (buf[0] >> 4) * 10;
cid->mcc += (buf[1] & 0xf) * 1;
if (buf[1] >> 4 == 0xf) {
cid->mnc = (buf[2] & 0xf) * 10;
cid->mnc += (buf[2] >> 4) * 1;
} else {
cid->mnc = (buf[2] & 0xf) * 100;
cid->mnc += (buf[2] >> 4) * 10;
cid->mnc += (buf[1] >> 4) * 1;
}
cid->lac = ntohs(buf+3);
cid->ci = ntohs(buf+5);
}
/* parse BCCH information IEI from wire format to struct ipac_bcch_info */
int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf)
{
@ -2750,8 +2769,8 @@ int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf)
binf->bsic = *cur++ & 0x3f;
cur++;
memcpy(binf->cgi, cur, sizeof(binf->cgi));
cur += sizeof(binf->cgi);
ipac_parse_cgi(&binf->cgi, cur);
cur += 7;
if (binf->info_type & IPAC_BINF_NEIGH_BA_SI2) {
memcpy(binf->ba_list_si2, cur, sizeof(binf->ba_list_si2));