roox has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/14821
Change subject: Fix common misspellings and typos ...................................................................... Fix common misspellings and typos Change-Id: I00ebf013104b55decbdd7f758756a19b220dc7b3 --- M README.md M debian/changelog M doc/manuals/rtp-amr.adoc M doc/manuals/vty/bts_vty_reference.xml M src/common/l1sap.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-sysmo/misc/sysmobts-layer1.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c M tests/meas/meas_test.c 14 files changed, 118 insertions(+), 118 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/14821/1 diff --git a/README.md b/README.md index 7e26d82..1fca596 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ as well as a [VTY Reference Manual](http://ftp.osmocom.org/docs/latest/osmobsc-vty-reference.pdf) and a -[Abis refrence MAnual](http://ftp.osmocom.org/docs/latest/osmobts-abis.pdf) +[Abis reference MAnual](http://ftp.osmocom.org/docs/latest/osmobts-abis.pdf) describing the OsmoBTS specific A-bis dialect. Mailing List diff --git a/debian/changelog b/debian/changelog index a33d21f..0dce96c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,7 +133,7 @@ * bts_model: Allow TS connect to be processed asynchronously * OsmoBTS/chapters/configuration.adoc: Add bts index in example * OsmoBTS: Update osmotrx ip to diff between local and remote - * rtp-amr: Describe requirement to recieve all PH-DATA.ind events + * rtp-amr: Describe requirement to receive all PH-DATA.ind events * rtp-amr: Fix typo and trailing whitespace * Allow easily disabling GFDL references * OsmoBTS: bts-models: Add Lime Microsystems devices as supported osmo-trx @@ -341,7 +341,7 @@ * RSL: Implement DELETE INDICATION on AGCH overflow * RSL: Send ERROR REPORT on too short/truncated messages + wrong discriminator * BTS: add rate_ctr about CCCH (paging, agch, pch) - * paging: Drop + Log paging requests for non-existant paging groups + * paging: Drop + Log paging requests for non-existent paging groups * paging.c: Fix encoding of optional Mobile ID RR PAGING TYPE 1 / 2 * rsl: Improve ERROR REPORTing * paging: Fix encoding of PAGING TYPE 3 Rest Octets @@ -601,7 +601,7 @@ * Add Abis OML failure event reporting * Alarm on various errors * Remove obsolete define TLVP_PRES_LEN - * scheduler: log lchan on which prim error occured + * scheduler: log lchan on which prim error occurred * deb: use gsm_data_shared.* from openbsc-dev * OML: internalize failure reporting * Add ctrl command to send OML alert diff --git a/doc/manuals/rtp-amr.adoc b/doc/manuals/rtp-amr.adoc index 5a36aea..0c733d1 100644 --- a/doc/manuals/rtp-amr.adoc +++ b/doc/manuals/rtp-amr.adoc @@ -95,10 +95,10 @@ phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_FIRST)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -110,10 +110,10 @@ bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_UPDATE)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; } @@ -123,7 +123,7 @@ the SID_FIRST frame is immediately followed by a speech frame. It has been observed that some phone does not transmit the last 4 bursts even if it is not followed by a speech frame. -ULSU2:: There must be exactly two supressed voice frames between the +ULSU2:: There must be exactly two suppressed voice frames between the SID_FIRST and the SID_UPDATE, i.e. there's 60ms between SID_FIRST and SID_UPDATE. @@ -152,52 +152,52 @@ phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_UPDATE)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -208,10 +208,10 @@ phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_UPDATE)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; } @@ -254,10 +254,10 @@ ...; --- [label="Once voice is active again"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -345,10 +345,10 @@ ...; --- [label="FACCH/F Frame During DTX"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -368,10 +368,10 @@ phy => bts [label="PH-DATA.ind FACCH/F"]; bts => mgw [label="FACCH/F"]; - ms -x phy [label="Supressed L1 burst", id="ULSF2"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst", id="ULSF2"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_FIRST)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; ...; @@ -660,10 +660,10 @@ phy => bts [label="PH-RTS.ind (TCH)"]; phy <= bts [label="PH-EMPTY-FRAME.req (FACCH/F)"]; phy <= bts [label="PH-EMPTY-FRAME.req (TCH/F)"]; - ms x- phy [label="Supressed burst"]; - ms x- phy [label="Supressed burst"]; - ms x- phy [label="Supressed burst"]; - ms x- phy [label="Supressed burst"]; + ms x- phy [label="Suppressed burst"]; + ms x- phy [label="Suppressed burst"]; + ms x- phy [label="Suppressed burst"]; + ms x- phy [label="Suppressed burst"]; } ---- @@ -738,8 +738,8 @@ phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (N)"]; bts => mgw [label="RTP (AMR FT=0..7,Q=1)"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr_SidFirstP1", id="ULSF1"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; @@ -753,8 +753,8 @@ phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_UPDATE)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; } @@ -764,7 +764,7 @@ NOTE:: It has been observed that not all phones transmit SID_FIRST_P2 so the PH-DATA.ind GsmL1_TchPlType_Amr_SidFirstP2 is not guaranteed to be sent to the BTS. -ULSU1:: There must be exactly two supressed voice frames between the +ULSU1:: There must be exactly two suppressed voice frames between the SID_FIRST and the SID_UPDATE, i.e. there's 60ms between SID_FIRST and SID_UPDATE. @@ -795,33 +795,33 @@ phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_UPDATE)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -834,8 +834,8 @@ phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr (SID_UPDATE)"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; } @@ -910,7 +910,7 @@ been transmitted yet, SID_FIRST can be inhibited by means of a SID_FIRST_INH frame. This allows the first voice frame to be transmitted with minimal delay, compared to first completing -the regular SID_FIRTS_P2 and SID_ONSET procedure. +the regular SID_FIRST_P2 and SID_ONSET procedure. ["mscgen"] ---- @@ -999,8 +999,8 @@ ...; ms .. mgw [label="FACCH/H during DTX operation"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -1026,8 +1026,8 @@ phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; - ms -x phy [label="Supressed L1 burst"]; - ms -x phy [label="Supressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; + ms -x phy [label="Suppressed L1 burst"]; phy => bts [label="PH-DATA.ind GsmL1_TchPlType_Amr_SidFirstP1"]; bts => mgw [label="RTP (AMR FT=SID,Q=1)"]; } diff --git a/doc/manuals/vty/bts_vty_reference.xml b/doc/manuals/vty/bts_vty_reference.xml index b50ac1b..c2035dd 100644 --- a/doc/manuals/vty/bts_vty_reference.xml +++ b/doc/manuals/vty/bts_vty_reference.xml @@ -173,7 +173,7 @@ <param name='everything' doc='Don't use. It doesn't log anything' /> <param name='debug' doc='Log debug messages and higher levels' /> <param name='info' doc='Log informational messages and higher levels' /> - <param name='notice' doc='Log noticable messages and higher levels' /> + <param name='notice' doc='Log noticeable messages and higher levels' /> <param name='error' doc='Log error messages and higher levels' /> <param name='fatal' doc='Log only fatal messages' /> </params> @@ -542,7 +542,7 @@ <param name='everything' doc='Don't use. It doesn't log anything' /> <param name='debug' doc='Log debug messages and higher levels' /> <param name='info' doc='Log informational messages and higher levels' /> - <param name='notice' doc='Log noticable messages and higher levels' /> + <param name='notice' doc='Log noticeable messages and higher levels' /> <param name='error' doc='Log error messages and higher levels' /> <param name='fatal' doc='Log only fatal messages' /> </params> @@ -1113,7 +1113,7 @@ <param name='everything' doc='Don't use. It doesn't log anything' /> <param name='debug' doc='Log debug messages and higher levels' /> <param name='info' doc='Log informational messages and higher levels' /> - <param name='notice' doc='Log noticable messages and higher levels' /> + <param name='notice' doc='Log noticeable messages and higher levels' /> <param name='error' doc='Log error messages and higher levels' /> <param name='fatal' doc='Log only fatal messages' /> </params> diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b730b85..389f4cf 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -160,7 +160,7 @@ } /* allocate a msgb containing a osmo_phsap_prim + optional l2 data - * in order to wrap femtobts header arround l2 data, there must be enough space + * in order to wrap femtobts header around l2 data, there must be enough space * in front and behind data pointer */ struct msgb *l1sap_msgb_alloc(unsigned int l2_len) { @@ -715,7 +715,7 @@ int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn) { /* Note: The number of available access grant channels is set by the * parameter BS_AG_BLKS_RES via system information type 3. This SI is - * transfered to osmo-bts via RSL */ + * transferred to osmo-bts via RSL */ return l1sap_fn2ccch_block(fn) < num_agch(trx, "PH-RTS-IND"); } diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c index badb545..903c5cd 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_calib.c @@ -233,7 +233,7 @@ */ int timeout = 60; //int timeout = 2 * 60 * 60; - //if (outcome != CALIB_SUCESS) } + //if (outcome != CALIB_SUCCESS) } // timeout = 5 * 60; //} diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c index 80751fb..424ff18 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c @@ -584,39 +584,39 @@ lc15bts_mgr_sensor_get_state(s_mgr->state.state), VTY_NEWLINE); vty_out(vty, "Current Temperatures%s", VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_SUPPLY, &temp); - vty_out(vty, " Main Supply : %4.2f Celcius%s", + vty_out(vty, " Main Supply : %4.2f Celsius%s", temp/ 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_SOC, &temp); - vty_out(vty, " SoC : %4.2f Celcius%s", + vty_out(vty, " SoC : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_FPGA, &temp); - vty_out(vty, " FPGA : %4.2f Celcius%s", + vty_out(vty, " FPGA : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_RMSDET, &temp); - vty_out(vty, " RMSDet : %4.2f Celcius%s", + vty_out(vty, " RMSDet : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_OCXO, &temp); - vty_out(vty, " OCXO : %4.2f Celcius%s", + vty_out(vty, " OCXO : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_TX0, &temp); - vty_out(vty, " TX 0 : %4.2f Celcius%s", + vty_out(vty, " TX 0 : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_TX1, &temp); - vty_out(vty, " TX 1 : %4.2f Celcius%s", + vty_out(vty, " TX 1 : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_PA0, &temp); - vty_out(vty, " Power Amp #0: %4.2f Celcius%s", + vty_out(vty, " Power Amp #0: %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); lc15bts_temp_get(LC15BTS_TEMP_PA1, &temp); - vty_out(vty, " Power Amp #1: %4.2f Celcius%s", + vty_out(vty, " Power Amp #1: %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c index 3ddf0e8..5775065 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c @@ -518,7 +518,7 @@ */ int timeout = 60; //int timeout = 2 * 60 * 60; - //if (outcome != CALIB_SUCESS) } + //if (outcome != CALIB_SUCCESS) } // timeout = 5 * 60; //} diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c index 7e80e03..9693eab 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c @@ -512,35 +512,35 @@ oc2gbts_mgr_sensor_get_state(s_mgr->state.state), VTY_NEWLINE); vty_out(vty, "Current Temperatures%s", VTY_NEWLINE); oc2gbts_temp_get(OC2GBTS_TEMP_SUPPLY, &temp); - vty_out(vty, " Main Supply : %4.2f Celcius%s", + vty_out(vty, " Main Supply : %4.2f Celsius%s", temp/ 1000.0f, VTY_NEWLINE); oc2gbts_temp_get(OC2GBTS_TEMP_SOC, &temp); - vty_out(vty, " SoC : %4.2f Celcius%s", + vty_out(vty, " SoC : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); oc2gbts_temp_get(OC2GBTS_TEMP_FPGA, &temp); - vty_out(vty, " FPGA : %4.2f Celcius%s", + vty_out(vty, " FPGA : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); if (oc2gbts_option_get(OC2GBTS_OPTION_RMS_FWD) || oc2gbts_option_get(OC2GBTS_OPTION_RMS_REFL)) { oc2gbts_temp_get(OC2GBTS_TEMP_RMSDET, &temp); - vty_out(vty, " RMSDet : %4.2f Celcius%s", + vty_out(vty, " RMSDet : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); } oc2gbts_temp_get(OC2GBTS_TEMP_OCXO, &temp); - vty_out(vty, " OCXO : %4.2f Celcius%s", + vty_out(vty, " OCXO : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); oc2gbts_temp_get(OC2GBTS_TEMP_TX, &temp); - vty_out(vty, " TX : %4.2f Celcius%s", + vty_out(vty, " TX : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); if (oc2gbts_option_get(OC2GBTS_OPTION_PA_TEMP)) { oc2gbts_temp_get(OC2GBTS_TEMP_PA, &temp); - vty_out(vty, " Power Amp : %4.2f Celcius%s", + vty_out(vty, " Power Amp : %4.2f Celsius%s", temp / 1000.0f, VTY_NEWLINE); } diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index d44f721..d306c11 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -506,7 +506,7 @@ * sub-channel, only th request contains this information :( */ lchan = &ts->lchan[(unsigned long) data]; - /* TODO: This state machine should be shared accross BTS models? */ + /* TODO: This state machine should be shared across BTS models? */ switch (lchan->ciph_state) { case LCHAN_CIPH_RX_REQ: lchan->ciph_state = LCHAN_CIPH_RX_CONF; diff --git a/src/osmo-bts-sysmo/misc/sysmobts-layer1.c b/src/osmo-bts-sysmo/misc/sysmobts-layer1.c index 4b34f50..20ca6f5 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts-layer1.c +++ b/src/osmo-bts-sysmo/misc/sysmobts-layer1.c @@ -622,7 +622,7 @@ return -1; } if (prim.u.rfClockSetupCnf.status != GsmL1_Status_Success) { - printf("Clock setup was not successfull.\n"); + printf("Clock setup was not successful.\n"); return -2; } diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index a0ba649..d769ce7 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -54,7 +54,7 @@ CALIB_FAIL_START, CALIB_FAIL_GPS, CALIB_FAIL_CTRL, - CALIB_SUCESS, + CALIB_SUCCESS, }; static inline int compat_gps_read(struct gps_data_t *data) @@ -271,7 +271,7 @@ * and in case of a failure in some minutes. */ int timeout = 2 * 60 * 60; - if (outcome != CALIB_SUCESS) + if (outcome != CALIB_SUCCESS) timeout = 5 * 60; mgr->calib.calib_timeout.data = mgr; @@ -390,7 +390,7 @@ LOGP(DCALIB, LOGL_NOTICE, "Calibration process completed\n"); - calib_state_reset(mgr, CALIB_SUCESS); + calib_state_reset(mgr, CALIB_SUCCESS); } static void handle_ctrl(struct sysmobts_mgr_instance *mgr, struct msgb *msg) diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c index 444ee7c..fb3987b 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c @@ -380,11 +380,11 @@ vty_out(vty, "Temperature control state: %s%s", sysmobts_mgr_temp_get_state(s_mgr->state), VTY_NEWLINE); vty_out(vty, "Current Temperatures%s", VTY_NEWLINE); - vty_out(vty, " Digital: %f Celcius%s", + vty_out(vty, " Digital: %f Celsius%s", sysmobts_temp_get(SYSMOBTS_TEMP_DIGITAL, SYSMOBTS_TEMP_INPUT) / 1000.0f, VTY_NEWLINE); - vty_out(vty, " RF: %f Celcius%s", + vty_out(vty, " RF: %f Celsius%s", sysmobts_temp_get(SYSMOBTS_TEMP_RF, SYSMOBTS_TEMP_INPUT) / 1000.0f, VTY_NEWLINE); @@ -396,8 +396,8 @@ is_sbts2050_master() ? "master" : "slave", VTY_NEWLINE); sbts2050_uc_check_temp(&temp_pa, &temp_board); - vty_out(vty, " sysmoBTS 2050 PA: %d Celcius%s", temp_pa, VTY_NEWLINE); - vty_out(vty, " sysmoBTS 2050 PA: %d Celcius%s", temp_board, VTY_NEWLINE); + vty_out(vty, " sysmoBTS 2050 PA: %d Celsius%s", temp_pa, VTY_NEWLINE); + vty_out(vty, " sysmoBTS 2050 PA: %d Celsius%s", temp_board, VTY_NEWLINE); sbts2050_uc_get_status(&status); vty_out(vty, "Power Status%s", VTY_NEWLINE); diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index b2bf80e..c8f06b6 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -306,7 +306,7 @@ * received. The process must still go on when measurement indications (blocks) * are lost or otherwise spaced out. Even the complete absence of the * measurement indications from the SACCH which are used to detect the interval - * end must not keep the interval from beeing processed. */ + * end must not keep the interval from being processed. */ void test_lchan_meas_process_measurement(bool no_sacch, bool dropouts) { struct gsm_lchan *lchan = &trx->ts[2].lchan[0]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I00ebf013104b55decbdd7f758756a19b220dc7b3 Gerrit-Change-Number: 14821 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mar...@gmx.de> Gerrit-MessageType: newchange
