From e28a20a2d9d049cd6312e218a7646593bbc43431 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 7 Dec 2015 11:16:00 +0100 Subject: sysmobts: Catch up with the API changes and specify the version API revision 5.1 allows us to pass a version number for the rx/tx calibration and the DSP/FPGA will inform us about clock errors. --- src/osmo-bts-sysmo/calib_file.c | 12 ++++++++++++ src/osmo-bts-sysmo/femtobts.c | 3 +++ 2 files changed, 15 insertions(+) (limited to 'src') diff --git a/src/osmo-bts-sysmo/calib_file.c b/src/osmo-bts-sysmo/calib_file.c index 476d7963..884643f7 100644 --- a/src/osmo-bts-sysmo/calib_file.c +++ b/src/osmo-bts-sysmo/calib_file.c @@ -334,6 +334,12 @@ static int calib_eeprom_read(const struct calib_file_desc *desc, SuperFemto_Prim for (i = 0; i < ARRAY_SIZE(rx->u16IqImbalCorr); i++) rx->u16IqImbalCorr[i] = rx_cal.u16IqImbalCorr[i]; } +#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(5,1,0) + rx->u8DspMajVer = rx_cal.u8DspMajVer; + rx->u8DspMinVer = rx_cal.u8DspMinVer; + rx->u8FpgaMajVer = rx_cal.u8FpgaMajVer; + rx->u8FpgaMinVer = rx_cal.u8FpgaMinVer; +#endif } else { SuperFemto_SetTxCalibTblReq_t *tx = &prim->u.setTxCalibTblReq; eeprom_TxCal_t tx_cal; @@ -361,6 +367,12 @@ static int calib_eeprom_read(const struct calib_file_desc *desc, SuperFemto_Prim for (i = 0; i < arrsize_by_band[desc->band]; i++) tx->fTxRollOffCorr[i] = tx_cal.fTxRollOffCorr[i]; +#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(5,1,0) + tx->u8DspMajVer = tx_cal.u8DspMajVer; + tx->u8DspMinVer = tx_cal.u8DspMinVer; + tx->u8FpgaMajVer = tx_cal.u8FpgaMajVer; + tx->u8FpgaMinVer = tx_cal.u8FpgaMinVer; +#endif } #endif diff --git a/src/osmo-bts-sysmo/femtobts.c b/src/osmo-bts-sysmo/femtobts.c index da165c5d..480fe06b 100644 --- a/src/osmo-bts-sysmo/femtobts.c +++ b/src/osmo-bts-sysmo/femtobts.c @@ -224,6 +224,9 @@ const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1] = { { GsmL1_Status_TxBurstFifoUndr, "FIFO underrun" }, { GsmL1_Status_NotSynchronized, "Not synchronized" }, { GsmL1_Status_Unsupported, "Unsupported feature" }, +#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(5,1,0) + { GsmL1_Status_ClockError, "Clock error" }, +#endif { 0, NULL } }; -- cgit v1.2.3