diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2012-10-30 10:26:20 +0100 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2012-10-30 10:26:20 +0100 |
| commit | 07f83456460a2cdb8d288ac647f04a5bc09dc1cf (patch) | |
| tree | bb213ff0af638ac4439ae079eda12b094b34fbea /src/host/layer23/include/osmocom | |
| parent | a4924a33b03a13ad78d69785b73d3d2dd09b18b2 (diff) | |
Fixed decoding of hexadecimal LAI components
libosmocore has changed its LAI decoding from hex to decimal. This caused
wrong decoding of MCC and MNC. In order to provide required hex
transcoding, special hex encoding and decoding function are added to
mobile/sysinfo.c.
Diffstat (limited to 'src/host/layer23/include/osmocom')
| -rw-r--r-- | src/host/layer23/include/osmocom/bb/common/sysinfo.h | 4 | ||||
| -rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h b/src/host/layer23/include/osmocom/bb/common/sysinfo.h index 5d3ed596..f843f271 100644 --- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h +++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h @@ -154,5 +154,9 @@ int gsm48_decode_sysinfo6(struct gsm48_sysinfo *s, int gsm48_decode_mobile_alloc(struct gsm_sysinfo_freq *freq, uint8_t *ma, uint8_t len, uint16_t *hopping, uint8_t *hopp_len, int si4); +int gsm48_encode_lai_hex(struct gsm48_loc_area_id *lai, uint16_t mcc, + uint16_t mnc, uint16_t lac); +int gsm48_decode_lai_hex(struct gsm48_loc_area_id *lai, uint16_t *mcc, + uint16_t *mnc, uint16_t *lac); #endif /* _SYSINFO_H */ diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index b7280fb4..38ac3611 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -195,10 +195,6 @@ int gsm48_rsl_dequeue(struct osmocom_ms *ms); int gsm48_rr_downmsg(struct osmocom_ms *ms, struct msgb *msg); struct msgb *gsm48_l3_msgb_alloc(void); struct msgb *gsm48_rr_msgb_alloc(int msg_type); -int gsm48_decode_lai(struct gsm48_loc_area_id *lai, uint16_t *mcc, - uint16_t *mnc, uint16_t *lac); -int gsm48_encode_lai(struct gsm48_loc_area_id *lai, uint16_t mcc, - uint16_t mnc, uint16_t lac); int gsm48_rr_enc_cm2(struct osmocom_ms *ms, struct gsm48_classmark2 *cm, uint16_t arfcn); int gsm48_rr_tx_rand_acc(struct osmocom_ms *ms, struct msgb *msg); |