summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2011-11-11 00:06:11 +0100
committerSylvain Munaut <tnt@246tNt.com>2011-11-13 20:25:19 +0100
commit9311c0025f70df98e4b47940e1398b8de5518668 (patch)
treeda999fa1d884d1b067f772d645e9314ec8c31d41
parent8f77cbecb4df9a8ce1a695ca24799d5c02da4ec1 (diff)
host/mobile: Whitespace fixes, no functional changes
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--src/host/layer23/src/mobile/gsm48_cc.c16
-rw-r--r--src/host/layer23/src/mobile/gsm48_mm.c42
-rw-r--r--src/host/layer23/src/mobile/gsm48_rr.c34
-rw-r--r--src/host/layer23/src/mobile/mnccms.c4
-rw-r--r--src/host/layer23/src/mobile/settings.c2
-rw-r--r--src/host/layer23/src/mobile/transaction.c2
6 files changed, 50 insertions, 50 deletions
diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c
index aa99ee2..da47874 100644
--- a/src/host/layer23/src/mobile/gsm48_cc.c
+++ b/src/host/layer23/src/mobile/gsm48_cc.c
@@ -215,7 +215,7 @@ int mncc_dequeue(struct osmocom_ms *ms)
struct gsm_mncc *mncc;
struct msgb *msg;
int work = 0;
-
+
while ((msg = msgb_dequeue(&cc->mncc_upqueue))) {
mncc = (struct gsm_mncc *)msg->data;
if (ms->mncc_entity.mncc_recv)
@@ -223,7 +223,7 @@ int mncc_dequeue(struct osmocom_ms *ms)
work = 1; /* work done */
msgb_free(msg);
}
-
+
return work;
}
@@ -556,7 +556,7 @@ static int gsm48_cc_tx_setup(struct gsm_trans *trans)
trans_free(trans);
return rc;
}
-
+
/* Get free transaction_id */
transaction_id = trans_assign_trans_id(trans->ms, GSM48_PDISC_CC, 0);
if (transaction_id < 0) {
@@ -712,7 +712,7 @@ static int gsm48_cc_rx_alerting(struct gsm_trans *trans, struct msgb *msg)
unsigned int payload_len = msgb_l3len(msg) - sizeof(*gh);
struct tlv_parsed tp;
struct gsm_mncc alerting;
-
+
LOGP(DCC, LOGL_INFO, "received ALERTING\n");
gsm48_stop_cc_timer(trans);
@@ -945,7 +945,7 @@ static int gsm48_cc_tx_alerting(struct gsm_trans *trans, void *arg)
gsm48_encode_ssversion(nmsg, &alerting->ssversion);
new_cc_state(trans, GSM_CSTATE_CALL_RECEIVED);
-
+
return gsm48_cc_to_mm(nmsg, trans, GSM48_MMCC_DATA_REQ);
}
@@ -993,7 +993,7 @@ static int gsm48_cc_rx_connect_ack(struct gsm_trans *trans, struct msgb *msg)
gsm48_stop_cc_timer(trans);
new_cc_state(trans, GSM_CSTATE_ACTIVE);
-
+
memset(&connect_ack, 0, sizeof(struct gsm_mncc));
connect_ack.callref = trans->callref;
return mncc_recvmsg(trans->ms, trans, MNCC_SETUP_COMPL_IND,
@@ -1996,7 +1996,7 @@ int mncc_tx_to_cc(void *inst, int msg_type, void *arg)
msg_type, trans->cc.state);
return 0;
}
-
+
rc = downstatelist[i].rout(trans, arg);
return rc;
@@ -2021,7 +2021,7 @@ static struct datastate {
GSM48_MT_CC_ALERTING, gsm48_cc_rx_alerting},
{SBIT(GSM_CSTATE_INITIATED) | SBIT(GSM_CSTATE_MO_CALL_PROC) |
- SBIT(GSM_CSTATE_CALL_DELIVERED), /* 5.2.1.6 */
+ SBIT(GSM_CSTATE_CALL_DELIVERED), /* 5.2.1.6 */
GSM48_MT_CC_CONNECT, gsm48_cc_rx_connect},
/* mobile terminating call establishment */
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c
index cace17c..4b435ac 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -748,7 +748,7 @@ int gsm48_mmxx_dequeue(struct osmocom_ms *ms)
struct msgb *msg;
struct gsm48_mmxx_hdr *mmh;
int work = 0;
-
+
while ((msg = msgb_dequeue(&mm->mmxx_upqueue))) {
mmh = (struct gsm48_mmxx_hdr *) msg->data;
switch (mmh->msg_type & GSM48_MMXX_MASK) {
@@ -767,7 +767,7 @@ int gsm48_mmxx_dequeue(struct osmocom_ms *ms)
msgb_free(msg);
work = 1; /* work done */
}
-
+
return work;
}
@@ -778,14 +778,14 @@ int gsm48_mmr_dequeue(struct osmocom_ms *ms)
struct msgb *msg;
struct gsm48_mmr *mmr;
int work = 0;
-
+
while ((msg = msgb_dequeue(&mm->mmr_downqueue))) {
mmr = (struct gsm48_mmr *) msg->data;
gsm48_rcv_mmr(ms, msg);
msgb_free(msg);
work = 1; /* work done */
}
-
+
return work;
}
@@ -795,13 +795,13 @@ int gsm48_rr_dequeue(struct osmocom_ms *ms)
struct gsm48_mmlayer *mm = &ms->mmlayer;
struct msgb *msg;
int work = 0;
-
+
while ((msg = msgb_dequeue(&mm->rr_upqueue))) {
/* msg is freed there */
gsm48_rcv_rr(ms, msg);
work = 1; /* work done */
}
-
+
return work;
}
@@ -812,14 +812,14 @@ int gsm48_mmevent_dequeue(struct osmocom_ms *ms)
struct gsm48_mm_event *mme;
struct msgb *msg;
int work = 0;
-
+
while ((msg = msgb_dequeue(&mm->event_queue))) {
mme = (struct gsm48_mm_event *) msg->data;
gsm48_mm_ev(ms, mme->msg_type, msg);
msgb_free(msg);
work = 1; /* work done */
}
-
+
return work;
}
@@ -927,7 +927,7 @@ static void new_mm_state(struct gsm48_mmlayer *mm, int state, int substate)
switch (substate) {
case GSM48_MM_SST_NORMAL_SERVICE:
vty_notify(ms, NULL);
- vty_notify(ms, "On Network, normal service: %s, %s\n",
+ vty_notify(ms, "On Network, normal service: %s, %s\n",
gsm_get_mcc(plmn->mcc),
gsm_get_mnc(plmn->mcc, plmn->mnc));
break;
@@ -1337,7 +1337,7 @@ int gsm48_mm_exit(struct osmocom_ms *ms)
/* flush lists */
while (!llist_empty(&mm->mm_conn)) {
- conn = llist_entry(mm->mm_conn.next,
+ conn = llist_entry(mm->mm_conn.next,
struct gsm48_mm_conn, list);
mm_conn_free(conn);
}
@@ -1349,7 +1349,7 @@ int gsm48_mm_exit(struct osmocom_ms *ms)
msgb_free(msg);
while ((msg = msgb_dequeue(&mm->event_queue)))
msgb_free(msg);
-
+
/* stop timers */
stop_mm_t3210(mm);
stop_mm_t3211(mm);
@@ -1892,7 +1892,7 @@ static int gsm48_mm_imsi_detach_sent(struct osmocom_ms *ms, struct msgb *msg)
return 0;
}
-
+
/* release MM connection and proceed with IMSI detach */
static int gsm48_mm_imsi_detach_release(struct osmocom_ms *ms, struct msgb *msg)
{
@@ -1976,7 +1976,7 @@ static int gsm48_mm_rx_abort(struct osmocom_ms *ms, struct msgb *msg)
gsm48_mm_release_mm_conn(ms, 1, 16, 0);
}
- if (reject_cause == GSM48_REJECT_ILLEGAL_ME) {
+ if (reject_cause == GSM48_REJECT_ILLEGAL_ME) {
/* SIM invalid */
subscr->sim_valid = 0;
@@ -2039,7 +2039,7 @@ static int gsm48_mm_sysinfo(struct osmocom_ms *ms, struct msgb *msg)
struct gsm48_mmlayer *mm = &ms->mmlayer;
struct gsm48_sysinfo *s = &ms->cellsel.sel_si;
- /* t3212 not changed in these states */
+ /* t3212 not changed in these states */
if (mm->state == GSM48_MM_ST_MM_IDLE
&& (mm->substate == GSM48_MM_SST_NO_CELL_AVAIL
|| mm->substate == GSM48_MM_SST_LIMITED_SERVICE
@@ -2075,7 +2075,7 @@ static int gsm48_mm_sysinfo(struct osmocom_ms *ms, struct msgb *msg)
}
mm->t3212_value = s->t3212;
}
-
+
return 0;
}
@@ -2096,7 +2096,7 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg)
struct gsm_settings *set = &ms->settings;
struct msgb *nmsg;
int msg_type;
-
+
/* (re)start only if we still require location update */
if (!mm->lupd_pending) {
LOGP(DMM, LOGL_INFO, "No loc. upd. pending.\n");
@@ -2512,7 +2512,7 @@ static int gsm48_mm_rx_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg)
start_mm_t3240(mm);
new_mm_state(mm, GSM48_MM_ST_LOC_UPD_REJ, 0);
-
+
return 0;
}
@@ -2523,7 +2523,7 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg)
struct gsm_subscriber *subscr = &ms->subscr;
struct msgb *nmsg;
struct gsm322_msg *ngm;
-
+
LOGP(DMM, LOGL_INFO, "Loc. upd. rejected (cause %d)\n",
mm->lupd_rej_cause);
@@ -3199,7 +3199,7 @@ static int gsm48_mm_init_mm_reject(struct osmocom_ms *ms, struct msgb *msg)
*
* this function is called:
* - when ciphering command is received
- * - when cm service is accepted
+ * - when cm service is accepted
*/
static int gsm48_mm_conn_go_dedic(struct osmocom_ms *ms)
{
@@ -3398,7 +3398,7 @@ static int gsm48_mm_data(struct osmocom_ms *ms, struct msgb *msg)
/* mirror message with REL_IND + cause */
return gsm48_mmxx_upmsg(ms, msg);
}
-
+
/* pull MM header */
msgb_pull(msg, sizeof(struct gsm48_mmxx_hdr));
@@ -3821,7 +3821,7 @@ static int gsm48_rcv_rr(struct osmocom_ms *ms, struct msgb *msg)
}
rc = rrdatastatelist[i].rout(ms, msg);
-
+
if (rrdatastatelist[i].rout != gsm48_mm_data_ind)
msgb_free(msg);
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c
index fef0ab7..547fd18 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -145,7 +145,7 @@ static int gsm48_decode_ba_range(const uint8_t *ba, uint8_t ba_len,
*/
uint16_t lower, higher;
int i, n, required_octets;
-
+
/* find out how much ba ranges will be decoded */
n = *ba++;
ba_len --;
@@ -351,7 +351,7 @@ const char *gsm48_rr_state_names[] = {
static void new_rr_state(struct gsm48_rrlayer *rr, int state)
{
- if (state < 0 || state >=
+ if (state < 0 || state >=
(sizeof(gsm48_rr_state_names) / sizeof(char *)))
return;
@@ -547,13 +547,13 @@ int gsm48_rsl_dequeue(struct osmocom_ms *ms)
struct gsm48_rrlayer *rr = &ms->rrlayer;
struct msgb *msg;
int work = 0;
-
+
while ((msg = msgb_dequeue(&rr->rsl_upqueue))) {
/* msg is freed there */
gsm48_rcv_rsl(ms, msg);
work = 1; /* work done */
}
-
+
return work;
}
@@ -598,7 +598,7 @@ static void timeout_rr_meas(void *arg)
snr = (meas->snr + meas->frames / 2) / meas->frames;
sprintf(text, "MON: f=%d lev=%s snr=%2d ber=%3d "
"LAI=%s %s %04x ID=%04x", cs->sel_arfcn,
- gsm_print_rxlev(rxlev), berr, snr,
+ gsm_print_rxlev(rxlev), berr, snr,
gsm_print_mcc(cs->sel_mcc),
gsm_print_mnc(cs->sel_mnc), cs->sel_lac, cs->sel_id);
if (rr->state == GSM48_RR_ST_DEDICATED) {
@@ -2428,7 +2428,7 @@ static int gsm48_rr_rx_imm_ass(struct osmocom_ms *ms, struct msgb *msg)
/* timing advance */
rr->cd_now.ind_ta = ia->timing_advance;
/* mobile allocation */
- memcpy(&rr->cd_now.mob_alloc_lv, &ia->mob_alloc_len,
+ memcpy(&rr->cd_now.mob_alloc_lv, &ia->mob_alloc_len,
ia->mob_alloc_len + 1);
rr->wait_assign = 2;
/* reset scheduler */
@@ -3004,7 +3004,7 @@ static int gsm48_rr_render_ma(struct osmocom_ms *ms, struct gsm48_rr_cd *cd,
/* decode mobile allocation */
if (cd->mob_alloc_lv[0]) {
struct gsm_sysinfo_freq *freq = s->freq;
-
+
LOGP(DRR, LOGL_INFO, "decoding mobile allocation\n");
if (cd->cell_desc_lv[0]) {
@@ -3425,7 +3425,7 @@ static int gsm48_rr_rx_frq_redef(struct osmocom_ms *ms, struct msgb *msg)
}
/* mobile allocation */
- memcpy(rr->cd_now.mob_alloc_lv, &fr->mob_alloc_len,
+ memcpy(rr->cd_now.mob_alloc_lv, &fr->mob_alloc_len,
fr->mob_alloc_len + 1);
/* starting time */
@@ -3677,8 +3677,8 @@ static int gsm48_rr_rx_ass_cmd(struct osmocom_ms *ms, struct msgb *msg)
cda->start_tm.fn = (ms->meas.last_fn + TEST_STARTING_TIMER) % 42432;
LOGP(DRR, LOGL_INFO, " TESTING: starting time ahead\n");
#else
- if (TLVP_PRESENT(&tp, GSM48_IE_START_TIME)) {
- gsm48_decode_start_time(cda, (struct gsm48_start_time *)
+ if (TLVP_PRESENT(&tp, GSM48_IE_START_TIME)) {
+ gsm48_decode_start_time(cda, (struct gsm48_start_time *)
TLVP_VAL(&tp, GSM48_IE_START_TIME));
/* 9.1.2.5 "... before time IE is not present..." */
if (!before_time) {
@@ -3998,8 +3998,8 @@ static int gsm48_rr_rx_hando_cmd(struct osmocom_ms *ms, struct msgb *msg)
tlv_parse(&tp, &gsm48_rr_att_tlvdef, ho->data, payload_len, 0, 0);
/* sync ind */
- if (TLVP_PRESENT(&tp, GSM48_IE_SYNC_IND)) {
- gsm48_decode_sync_ind(rr, (struct gsm48_sync_ind *)
+ if (TLVP_PRESENT(&tp, GSM48_IE_SYNC_IND)) {
+ gsm48_decode_sync_ind(rr, (struct gsm48_sync_ind *)
TLVP_VAL(&tp, GSM48_IE_SYNC_IND));
LOGP(DRR, LOGL_INFO, " (sync_ind=%d rot=%d nci=%d)\n",
rr->hando_sync_ind, rr->hando_rot, rr->hando_nci);
@@ -4057,8 +4057,8 @@ static int gsm48_rr_rx_hando_cmd(struct osmocom_ms *ms, struct msgb *msg)
cda->start_tm.fn = (ms->meas.last_fn + TEST_STARTING_TIMER) % 42432;
LOGP(DRR, LOGL_INFO, " TESTING: starting time ahead\n");
#else
- if (TLVP_PRESENT(&tp, GSM48_IE_START_TIME)) {
- gsm48_decode_start_time(cda, (struct gsm48_start_time *)
+ if (TLVP_PRESENT(&tp, GSM48_IE_START_TIME)) {
+ gsm48_decode_start_time(cda, (struct gsm48_start_time *)
TLVP_VAL(&tp, GSM48_IE_START_TIME));
/* 9.1.2.5 "... before time IE is not present..." */
if (!before_time) {
@@ -4384,7 +4384,7 @@ static int gsm48_rr_susp_cnf_dedicated(struct osmocom_ms *ms, struct msgb *msg)
}
/*
- * radio ressource requests
+ * radio ressource requests
*/
/* establish request for dedicated mode */
@@ -4501,7 +4501,7 @@ static int gsm48_rr_data_req(struct osmocom_ms *ms, struct msgb *msg)
msgb_free(msg);
return -EINVAL;
}
-
+
/* pull RR header */
msgb_pull(msg, sizeof(struct gsm48_rr_hdr));
@@ -4698,7 +4698,7 @@ static int gsm48_rr_unit_data_ind(struct osmocom_ms *ms, struct msgb *msg)
struct abis_rsl_rll_hdr *rllh = msgb_l2(msg);
struct tlv_parsed tv;
uint8_t ch_type, ch_subch, ch_ts;
-
+
DEBUGP(DRSL, "RSLms UNIT DATA IND chan_nr=0x%02x link_id=0x%02x\n",
rllh->chan_nr, rllh->link_id);
diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c
index c6db1ab..9fdc45f 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -187,7 +187,7 @@ static void mncc_set_bearer(struct osmocom_ms *ms, int8_t speech_ver,
LOGP(DMNCC, LOGL_INFO, " support half rate v1\n");
}
/* if specific speech_ver is given (it must be supported) */
- } else
+ } else
mncc->bearer_cap.speech_ver[i++] = speech_ver;
mncc->bearer_cap.speech_ver[i] = -1; /* end of list */
mncc->bearer_cap.transfer = 0;
@@ -579,7 +579,7 @@ int mncc_call(struct osmocom_ms *ms, char *number)
setup.called.plan = 1; /* ISDN */
strncpy(setup.called.number, number,
sizeof(setup.called.number) - 1);
-
+
/* bearer capability (mandatory) */
mncc_set_bearer(ms, -1, &setup);
if (ms->settings.clir)
diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c
index 592f8a8..b2dc436 100644
--- a/src/host/layer23/src/mobile/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
@@ -183,7 +183,7 @@ int gsm_random_imei(struct gsm_settings *set)
strcpy(set->imei + 15 - digits, rand + 15 - digits);
strncpy(set->imeisv, set->imei, 15);
-
+
return 0;
}
diff --git a/src/host/layer23/src/mobile/transaction.c b/src/host/layer23/src/mobile/transaction.c
index 4b66050..35db0ee 100644
--- a/src/host/layer23/src/mobile/transaction.c
+++ b/src/host/layer23/src/mobile/transaction.c
@@ -108,7 +108,7 @@ void trans_free(struct gsm_trans *trans)
talloc_free(trans);
}
-/* allocate an unused transaction ID
+/* allocate an unused transaction ID
* in the given protocol using the ti_flag specified */
int trans_assign_trans_id(struct osmocom_ms *ms,
uint8_t protocol, uint8_t ti_flag)