Rename various "rxlev" variable to "rxlev_dbm" and correct their signess

All levels in range of 0..63 are now uint8_t and use "rxlev" as
variable name. All levels in range of -110..-47 are now int8_t and use
"rxlev_dbm" as variable name.

5 files changed, 22 insertions, 22 deletions

diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c
index f56fbdac..9166089a 100644
--- a/src/host/layer23/src/mobile/gsm322.c
+++ b/src/host/layer23/src/mobile/gsm322.c
@@ -476,7 +476,7 @@ static int gsm322_sync_to_cell(struct gsm322_cellsel *cs,
 	}
 
 	meas->frames = meas->snr = meas->berr = meas->rxlev = 0;
-	cs->rxlev_dbm = cs->rxlev_count = 0;
+	cs->rxlev_sum_dbm = cs->rxlev_count = 0;
 
 	cs->neighbour = neighbour;
 
@@ -492,7 +492,7 @@ static int gsm322_sync_to_cell(struct gsm322_cellsel *cs,
 	return l1ctl_tx_fbsb_req(ms, cs->arfcn,
 			L1CTL_FBSB_F_FB01SB, 100, 0,
 			cs->ccch_mode,
-			dbm2rxlev(cs->list[cs->arfci].rxlev));
+			cs->list[cs->arfci].rxlev);
 }
 
 /* this is called whenever the serving cell is unselectied */
@@ -876,7 +876,7 @@ static int gsm322_sort_list(struct osmocom_ms *ms)
 	struct gsm322_plmn_list *temp, *found;
 	struct llist_head *lh, *lh2;
 	int i, entries, move;
-	int8_t search = 0;
+	uint8_t search = 0;
 
 	/* flush list */
 	llist_for_each_safe(lh, lh2, &plmn->sorted_plmn) {
@@ -2901,7 +2901,7 @@ int gsm322_l1_signal(unsigned int subsys, unsigned int signal,
 		cs->list[i].flags |= GSM322_CS_FLAG_POWER;
 		cs->list[i].flags &= ~GSM322_CS_FLAG_SIGNAL;
 		/* if minimum level is reached or if we stick to a cell */
-		if (rxlev2dbm(rxlev) >= ms->settings.min_rxlev_db
+		if (rxlev2dbm(rxlev) >= ms->settings.min_rxlev_dbm
 		 || ms->settings.stick) {
 			cs->list[i].flags |= GSM322_CS_FLAG_SIGNAL;
 			LOGP(DCS, LOGL_INFO, "Found signal (ARFCN %s "
@@ -4546,7 +4546,7 @@ static int gsm322_nb_trigger_event(struct gsm322_cellsel *cs)
 
 	/* check the list for reading neighbour cell's BCCH */
 	llist_for_each_entry(nb, &cs->nb_list, entry) {
-		if (nb->rla_c_dbm >= cs->ms->settings.min_rxlev_db) {
+		if (nb->rla_c_dbm >= cs->ms->settings.min_rxlev_dbm) {
 			/* select the strongest unsynced cell */
 			if (nb->state == GSM322_NB_RLA_C) {
 				nb_sync = nb;
@@ -4696,9 +4696,9 @@ static int gsm322_nb_new_rxlev(struct gsm322_cellsel *cs)
 
 	/* calculate the RAL_C of serving cell */
 	if (cs->rxlev_count) {
-		cs->rla_c_dbm = (cs->rxlev_dbm + (cs->rxlev_count / 2))
+		cs->rla_c_dbm = (cs->rxlev_sum_dbm + (cs->rxlev_count / 2))
 					/ cs->rxlev_count;
-		cs->rxlev_dbm = 0;
+		cs->rxlev_sum_dbm = 0;
 		cs->rxlev_count = 0;
 	}
 
@@ -4730,10 +4730,10 @@ static int gsm322_nb_new_rxlev(struct gsm322_cellsel *cs)
 			}
 		}
 		nb->rla_c_dbm =
-			(nb->rxlev_dbm + (nb->rxlev_count / 2))
+			(nb->rxlev_sum_dbm + (nb->rxlev_count / 2))
 				/ nb->rxlev_count;
 		nb->rxlev_count = 0;
-		nb->rxlev_dbm = 0;
+		nb->rxlev_sum_dbm = 0;
 		if (nb->state == GSM322_NB_NEW)
 			nb->state = GSM322_NB_RLA_C;
 	}
@@ -4791,7 +4791,7 @@ static int gsm322_nb_meas_ind(struct osmocom_ms *ms, uint16_t arfcn,
 				enough_results = 0;
 			continue;
 		}
-		nb->rxlev_dbm += rx_lev - 110;
+		nb->rxlev_sum_dbm += rx_lev - 110;
 		nb->rxlev_count++;
 		LOGP(DNB, LOGL_INFO, "Measurement result for ARFCN %s: %d\n",
 			gsm_print_arfcn(arfcn), rx_lev - 110);
@@ -4819,7 +4819,7 @@ int gsm322_meas(struct osmocom_ms *ms, uint8_t rx_lev)
 	if (cs->neighbour)
 		return -EINVAL;
 
-	cs->rxlev_dbm += rx_lev - 110;
+	cs->rxlev_sum_dbm += rx_lev - 110;
 	cs->rxlev_count++;
 
 	return 0;
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c
index 36488606..3d15494a 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -1736,7 +1736,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type)
 					rrmeas->nc_arfcn[n] = i | ARFCN_PCS;
 				else
 					rrmeas->nc_arfcn[n] = i & 1023;
-				rrmeas->nc_rxlev[n] = -128;
+				rrmeas->nc_rxlev_dbm[n] = -128;
 				LOGP(DRR, LOGL_NOTICE, "SI5* report arfcn %s\n",
 					gsm_print_arfcn(rrmeas->nc_arfcn[n]));
 				n++;
@@ -2782,15 +2782,15 @@ static int gsm48_rr_tx_meas_rep(struct osmocom_ms *ms)
 				/* only check if NCC is permitted */
 				ncc = rrmeas->nc_bsic[i] >> 3;
 				if ((s->nb_ncc_permitted_si6 & (1 << ncc))
-				 && rrmeas->nc_rxlev[i] > current
-				 && rrmeas->nc_rxlev[i] < strongest) {
-					current = rrmeas->nc_rxlev[i];
+				 && rrmeas->nc_rxlev_dbm[i] > current
+				 && rrmeas->nc_rxlev_dbm[i] < strongest) {
+					current = rrmeas->nc_rxlev_dbm[i];
 					index = i;
 				}
 			}
 			if (current == -128) /* no more found */
 				break;
-			rxlev_nc[n] = rrmeas->nc_rxlev[index] + 110;
+			rxlev_nc[n] = rrmeas->nc_rxlev_dbm[index] + 110;
 			bsic_nc[n] = rrmeas->nc_bsic[index];
 			bcch_f_nc[n] = index;
 		}
diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c
index e34db7e1..2b518379 100644
--- a/src/host/layer23/src/mobile/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
@@ -79,7 +79,7 @@ int gsm_settings_init(struct osmocom_ms *ms)
 	set->half_v1 = sup->half_v1;
 	set->half_v3 = sup->half_v3;
 	set->ch_cap = sup->ch_cap;
-	set->min_rxlev_db = sup->min_rxlev_db;
+	set->min_rxlev_dbm = sup->min_rxlev_dbm;
 	set->dsc_max = sup->dsc_max;
 
 	if (sup->half_v1 || sup->half_v3)
diff --git a/src/host/layer23/src/mobile/support.c b/src/host/layer23/src/mobile/support.c
index bfc61805..99a01221 100644
--- a/src/host/layer23/src/mobile/support.c
+++ b/src/host/layer23/src/mobile/support.c
@@ -89,7 +89,7 @@ void gsm_support_init(struct osmocom_ms *ms)
 
 	/* radio */
 	sup->ch_cap = GSM_CAP_SDCCH_TCHF_TCHH;
-	sup->min_rxlev_db = -106; // TODO
+	sup->min_rxlev_dbm = -106; // TODO
 	sup->sync_to = 6; /* how long to wait sync (0.9 s) */
 	sup->scan_to = 4; /* how long to wait for all sysinfos (>=4 s) */
 	sup->dsc_max = 90; /* the specs defines 90 */
@@ -177,6 +177,6 @@ void gsm_support_dump(struct osmocom_ms *ms,
 	print(priv, " Full-Rate V3 : %s\n", SUP_SET(full_v3));
 	print(priv, " Half-Rate V1 : %s\n", SUP_SET(half_v1));
 	print(priv, " Half-Rate V3 : %s\n", SUP_SET(half_v3));
-	print(priv, " Min RXLEV    : %d\n", set->min_rxlev_db);
+	print(priv, " Min RXLEV    : %d\n", set->min_rxlev_dbm);
 }
 
diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c
index dc9e09d9..4d7f6a27 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -1418,8 +1418,8 @@ static void config_write_ms(struct vty *vty, struct osmocom_ms *ms)
 	SUP_WRITE(full_v3, "full-speech-v3");
 	SUP_WRITE(half_v1, "half-speech-v1");
 	SUP_WRITE(half_v3, "half-speech-v3");
-	if (!hide_default || sup->min_rxlev_db != set->min_rxlev_db)
-		vty_out(vty, "  min-rxlev %d%s", set->min_rxlev_db,
+	if (!hide_default || sup->min_rxlev_dbm != set->min_rxlev_dbm)
+		vty_out(vty, "  min-rxlev %d%s", set->min_rxlev_dbm,
 			VTY_NEWLINE);
 	if (!hide_default || sup->dsc_max != set->dsc_max)
 		vty_out(vty, "  dsc-max %d%s", set->dsc_max, VTY_NEWLINE);
@@ -2378,7 +2378,7 @@ DEFUN(cfg_ms_sup_min_rxlev, cfg_ms_sup_min_rxlev_cmd, "min-rxlev <-110--47>",
 	struct osmocom_ms *ms = vty->index;
 	struct gsm_settings *set = &ms->settings;
 
-	set->min_rxlev_db = atoi(argv[0]);
+	set->min_rxlev_dbm = atoi(argv[0]);
 
 	return CMD_SUCCESS;
 }