diff options
| author | Harald Welte <laforge@gnumonks.org> | 2012-05-13 14:16:28 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2012-05-13 14:16:28 +0200 |
| commit | 388b9d0a357fece464f8c6dc37ae06aacf175897 (patch) | |
| tree | 606cc00c2c9024dc25e4a2696a9fc3c96dbf6c83 /src/osmo-bts-sysmo | |
| parent | 9de1e9f914cfff62236649549b52b5d675966e3c (diff) | |
Adapt to L1 firmware/API version 2.1
Diffstat (limited to 'src/osmo-bts-sysmo')
| -rw-r--r-- | src/osmo-bts-sysmo/femtobts.c | 16 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/femtobts.h | 12 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 8 |
3 files changed, 13 insertions, 23 deletions
diff --git a/src/osmo-bts-sysmo/femtobts.c b/src/osmo-bts-sysmo/femtobts.c index 3f08ef57..69b33be0 100644 --- a/src/osmo-bts-sysmo/femtobts.c +++ b/src/osmo-bts-sysmo/femtobts.c @@ -239,13 +239,15 @@ const struct value_string femtobts_tch_pl_names[] = { }; const struct value_string femtobts_clksrc_names[] = { - { SF_CLKSRC_NONE, "None" }, - { SF_CLKSRC_OCXO, "ocxo" }, - { SF_CLKSRC_TCXO, "tcxo" }, - { SF_CLKSRC_EXT, "ext" }, - { SF_CLKSRC_GPS, "gps" }, - { SF_CLKSRC_TRX, "TRX" }, - { SF_CLKSRC_RX, "RX" }, + { SuperFemto_ClkSrcId_None, "None" }, + { SuperFemto_ClkSrcId_Ocxo, "ocxo" }, + { SuperFemto_ClkSrcId_Tcxo, "tcxo" }, + { SuperFemto_ClkSrcId_External, "ext" }, + { SuperFemto_ClkSrcId_GpsPps, "gps" }, + { SuperFemto_ClkSrcId_Trx, "trx" }, + { SuperFemto_ClkSrcId_Rx, "rx" }, + { SuperFemto_ClkSrcId_Edge, "edge" }, + { SuperFemto_ClkSrcId_NetList, "nwl" }, { 0, NULL } }; diff --git a/src/osmo-bts-sysmo/femtobts.h b/src/osmo-bts-sysmo/femtobts.h index 82761922..f2ac59dd 100644 --- a/src/osmo-bts-sysmo/femtobts.h +++ b/src/osmo-bts-sysmo/femtobts.h @@ -18,18 +18,6 @@ enum l1prim_type { L1P_T_IND, }; -/* this should actually be part of the header files */ -enum superfemto_clk_src { - SF_CLKSRC_NONE = 0, - SF_CLKSRC_OCXO = 1, - SF_CLKSRC_TCXO = 2, - SF_CLKSRC_EXT = 3, - SF_CLKSRC_GPS = 4, - SF_CLKSRC_TRX = 5, - SF_CLKSRC_RX = 6, - SF_CLKSRC_NL = 7, -}; - const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM]; const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1]; const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM]; diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 21605650..74d08f10 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -881,8 +881,8 @@ int l1if_activate_rf(struct femtol1_hdl *hdl, int on) sysp->u.activateRfReq.msgq.u8UseTchMsgq = 0; sysp->u.activateRfReq.msgq.u8UsePdtchMsgq = 0; /* Use clock from OCXO or whatever source is configured */ - sysp->u.activateRfReq.rfTrx.u8ClkSrc = hdl->clk_src; - sysp->u.activateRfReq.rfRx.u8ClkSrc = hdl->clk_src; + sysp->u.activateRfReq.rfTrx.clkSrc = hdl->clk_src; + sysp->u.activateRfReq.rfRx.clkSrc = hdl->clk_src; sysp->u.activateRfReq.rfTrx.iClkCor = hdl->clk_cal; sysp->u.activateRfReq.rfRx.iClkCor = hdl->clk_cal; #endif @@ -1016,9 +1016,9 @@ struct femtol1_hdl *l1if_open(void *priv) INIT_LLIST_HEAD(&fl1h->wlc_list); fl1h->priv = priv; - fl1h->clk_cal = 0xffff; + fl1h->clk_cal = 0; /* default clock source: OCXO */ - fl1h->clk_src = SF_CLKSRC_OCXO; + fl1h->clk_src = SuperFemto_ClkSrcId_Ocxo; rc = l1if_transport_open(fl1h); if (rc < 0) { |