From a6ab8ce7d19c833860c17a534bb0f5ef22a8757e Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 15 Jul 2020 20:53:52 +0200 Subject: Fix trailing whitespace in several files Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02 --- include/osmocom/bsc/abis_nm.h | 4 ++-- src/osmo-bsc/bts_nokia_site.c | 6 +++--- src/osmo-bsc/bts_siemens_bs11.c | 2 +- src/osmo-bsc/codec_pref.c | 4 ++-- src/osmo-bsc/handover_vty.c | 1 - src/osmo-bsc/lchan_fsm.c | 2 +- src/osmo-bsc/pcu_sock.c | 1 - 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h index 83bc2f809..3a0cb0e3c 100644 --- a/include/osmocom/bsc/abis_nm.h +++ b/include/osmocom/bsc/abis_nm.h @@ -1,4 +1,4 @@ -/* GSM Network Management messages on the A-bis interface +/* GSM Network Management messages on the A-bis interface * 3GPP TS 12.21 version 8.0.0 Release 1999 / ETSI TS 100 623 V8.0.0 */ /* (C) 2008-2009 by Harald Welte @@ -151,7 +151,7 @@ int abis_nm_ipaccess_restart(struct gsm_bts_trx *trx); int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, uint8_t obj_class, uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, uint8_t *attr, uint8_t attr_len); -int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, +int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, uint32_t ip, uint16_t port, uint8_t stream); void abis_nm_ipaccess_cgi(uint8_t *buf, struct gsm_bts *bts); int ipac_parse_bcch_info(struct ipac_bcch_info *binf, uint8_t *buf); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 51710b81e..523c9edf3 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1533,7 +1533,7 @@ static void reset_timer_cb(void *_bts) - receive ACK, start RSL link(s) ACK some other messages received from the BTS. - Probably its also possible to configure the BTS without a reset, this + Probably its also possible to configure the BTS without a reset, this has not been tested yet. */ @@ -1608,8 +1608,8 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) if (!bts->nokia.did_reset) { bts->nokia.did_reset = 1; - /* - TODO: For the InSite processing the received data is + /* + TODO: For the InSite processing the received data is blocked in the driver during reset. Otherwise the LAPD module might assert because the InSite sends garbage on the E1 line during reset. diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 2750f8cbe..057a0e153 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -61,7 +61,7 @@ static struct gsm_bts_model model_bs11 = { [NM_ATT_BS11_L1_PROT_TYPE] = { TLV_TYPE_TV }, [NM_ATT_BS11_BIT_ERR_THESH] = { TLV_TYPE_FIXED, 2 }, [NM_ATT_BS11_DIVERSITY] = { TLV_TYPE_TLV }, - [NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV }, + [NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_LOGIN_TIME] = { TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_USER_ACC_LEV] ={ TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_USER_NAME] = { TLV_TYPE_TLV }, diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index be442b542..6ec6d05ec 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -270,7 +270,7 @@ static uint16_t gen_bss_supported_amr_s15_s0(const struct bsc_msc_data *msc, con static int match_amr_s15_s0(struct channel_mode_and_rate *ch_mode_rate, const struct bsc_msc_data *msc, const struct gsm_bts *bts, const struct gsm0808_speech_codec *sc_match, uint8_t perm_spch) { uint16_t amr_s15_s0_supported; - + /* Normally the MSC should never try to advertise an AMR codec * configuration that we did not previously advertised as supported. * However, to ensure that no unsupported AMR codec configuration @@ -278,7 +278,7 @@ static int match_amr_s15_s0(struct channel_mode_and_rate *ch_mode_rate, const st * and generate an intersection. All further processing is then done * with this intersection result. At the same time we will make sure * that the intersection contains at least one rate setting. */ - + amr_s15_s0_supported = gen_bss_supported_amr_s15_s0(msc, bts, (perm_spch == GSM0808_PERM_HR3)); /* NOTE: The sc_match pointer points to a speech codec from the speech diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index e9333ec85..a418aa7ac 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -175,4 +175,3 @@ void ho_vty_init() ho_vty_init_cmds(BTS_NODE); } - diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index a1bf85701..68eef4b8b 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1015,7 +1015,7 @@ static void lchan_fsm_wait_rll_rtp_released(struct osmo_fsm_inst *fi, uint32_t e * TODO: that's how the code was before lchan FSM, is this correct/useful? */ handle_rll_rel_ind_or_conf(fi, event, data); break; - + case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: break; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index e75c2d498..3e0b7bf79 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -716,4 +716,3 @@ void pcu_sock_exit(struct gsm_bts *bts) talloc_free(state); bts->pcu_state = NULL; } - -- cgit v1.2.3