ULP: follow-up of gda5cad4

Uniformize unit display

Change-Id: Ie89ad77be81232692ee7f4f220157d2d0cab21ea
Reviewed-on: https://code.wireshark.org/review/19314
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2016-12-17 14:06:33 +01:00
parent 01c328f0f6
commit 93543464ff
2 changed files with 68 additions and 68 deletions

View File

@ -105,14 +105,14 @@ ulp_ganssDataBitInterval_fmt(gchar *s, guint32 v)
} else {
double interval = (0.1*pow(2, (double)v));
g_snprintf(s, ITEM_LABEL_LENGTH, "%g s (%u)", interval, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%gs (%u)", interval, v);
}
}
static void
ulp_ExtendedEphemeris_validity_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%u h (%u)", 4*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%uh (%u)", 4*v, v);
}
static void
@ -135,11 +135,11 @@ static void
ulp_NMRelement_rxLev_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev < -110 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev < -110dBm (0)");
} else if (v == 63) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev >= -48 dBm (63)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev >= -48dBm (63)");
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RxLev < %d dBm (%u)", -111+v, -110+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RxLev < %ddBm (%u)", -111+v, -110+v, v);
}
}
@ -147,13 +147,13 @@ static void
ulp_UTRA_CarrierRSSI_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100dBm (0)");
} else if (v == 76) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI >= -25 dBm (76)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI >= -25dBm (76)");
} else if (v > 76) {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RSSI < %d dBm (%u)", -101+v, -100+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSSI < %ddBm (%u)", -101+v, -100+v, v);
}
}
@ -161,13 +161,13 @@ static void
ulp_PrimaryCCPCH_RSCP_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP < -115 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP < -115dBm (0)");
} else if (v == 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP >= -25 dBm (91)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP >= -25dBm (91)");
} else if (v > 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RSCP < %d dBm (%u)", -116+v, -115+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSCP < %ddBm (%u)", -116+v, -115+v, v);
}
}
@ -175,13 +175,13 @@ static void
ulp_CPICH_Ec_N0_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 < -24 dB (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 < -24dB (0)");
} else if (v == 49) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 >= 0 dB (49)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 >= 0dB (49)");
} else if (v > 49) {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f dB <= CPICH Ec/N0 < %.1f dB (%u)", -24.5+((float)v/2), -24+((float)v/2), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB <= CPICH Ec/N0 < %.1fdB (%u)", -24.5+((float)v/2), -24+((float)v/2), v);
}
}
@ -189,13 +189,13 @@ static void
ulp_CPICH_RSCP_fmt(gchar *s, guint32 v)
{
if (v == 123) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP < -120 dBm (123)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP < -120dBm (123)");
} else if (v > 123) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= CPICH RSCP < %d dBm (%u)", -244+v, -243+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= CPICH RSCP < %ddBm (%u)", -244+v, -243+v, v);
} else if (v == 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP >= -25 dBm (91)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP >= -25dBm (91)");
} else if (v < 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm < CPICH RSCP <= %d dBm (%u)", -116+v, -115+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm < CPICH RSCP <= %ddBm (%u)", -116+v, -115+v, v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
}
@ -207,9 +207,9 @@ ulp_QoP_horacc_fmt(gchar *s, guint32 v)
double uncertainty = 10*(pow(1.1, (double)v)-1);
if (uncertainty < 1000) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%f m (%u)", uncertainty, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fm (%u)", uncertainty, v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%f km (%u)", uncertainty/1000, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fkm (%u)", uncertainty/1000, v);
}
}
@ -218,13 +218,13 @@ ulp_QoP_veracc_fmt(gchar *s, guint32 v)
{
double uncertainty = 45*(pow(1.025, (double)v)-1);
g_snprintf(s, ITEM_LABEL_LENGTH, "%f m (%u)", uncertainty, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fm (%u)", uncertainty, v);
}
static void
ulp_QoP_delay_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%g s (%u)", pow(2, (double)v), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%gs (%u)", pow(2, (double)v), v);
}
static const true_false_string ulp_vertical_dir_val = {
@ -235,18 +235,18 @@ static const true_false_string ulp_vertical_dir_val = {
static void
ulp_RelativeTime_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f s (%u)", 0.01*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fs (%u)", 0.01*v, v);
}
static void
ulp_RSRP_Range_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140dBm (0)");
} else if (v == 97) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP >= -44 dBm (97)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP >= -44dBm (97)");
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RSRP < %d dBm (%u)", -141+v, -140+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSRP < %ddBm (%u)", -141+v, -140+v, v);
}
}
@ -256,34 +256,34 @@ ulp_RSRQ_Range_fmt(gchar *s, guint32 v)
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRQ < -19.5dB (0)");
} else if (v == 64) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRQ >= -3 dB (34)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRQ >= -3dB (34)");
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f dB <= RSRQ < %.1f dB (%u)", -20+((float)v/2), -19.5+((float)v/2), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB <= RSRQ < %.1fdB (%u)", -20+((float)v/2), -19.5+((float)v/2), v);
}
}
static void
ulp_SignalDelta_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%s dB (%u)", v ? "0.5" : "0", v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%sdB (%u)", v ? "0.5" : "0", v);
}
static void
ulp_locationAccuracy_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f m (%u)", 0.1*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fm (%u)", 0.1*v, v);
}
static void
ulp_WimaxRTD_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f us (%u)", 0.01*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fus (%u)", 0.01*v, v);
}
static void
ulp_WimaxNMR_rssi_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f dBm (%u)", -103.75+(0.25*v), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fdBm (%u)", -103.75+(0.25*v), v);
}
static void
@ -291,7 +291,7 @@ ulp_UTRAN_gpsReferenceTimeUncertainty_fmt(gchar *s, guint32 v)
{
double uncertainty = 0.0022*(pow(1.18, (double)v)-1);
g_snprintf(s, ITEM_LABEL_LENGTH, "%f us (%u)", uncertainty, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fus (%u)", uncertainty, v);
}
static const value_string ulp_ganss_time_id_vals[] = {
@ -305,7 +305,7 @@ static const value_string ulp_ganss_time_id_vals[] = {
static void
ulp_utran_GANSSTimingOfCell_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f us (%u)", 0.25*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fus (%u)", 0.25*v, v);
}
static void

View File

@ -970,14 +970,14 @@ ulp_ganssDataBitInterval_fmt(gchar *s, guint32 v)
} else {
double interval = (0.1*pow(2, (double)v));
g_snprintf(s, ITEM_LABEL_LENGTH, "%g s (%u)", interval, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%gs (%u)", interval, v);
}
}
static void
ulp_ExtendedEphemeris_validity_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%u h (%u)", 4*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%uh (%u)", 4*v, v);
}
static void
@ -1000,11 +1000,11 @@ static void
ulp_NMRelement_rxLev_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev < -110 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev < -110dBm (0)");
} else if (v == 63) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev >= -48 dBm (63)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RxLev >= -48dBm (63)");
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RxLev < %d dBm (%u)", -111+v, -110+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RxLev < %ddBm (%u)", -111+v, -110+v, v);
}
}
@ -1012,13 +1012,13 @@ static void
ulp_UTRA_CarrierRSSI_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100dBm (0)");
} else if (v == 76) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI >= -25 dBm (76)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI >= -25dBm (76)");
} else if (v > 76) {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RSSI < %d dBm (%u)", -101+v, -100+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSSI < %ddBm (%u)", -101+v, -100+v, v);
}
}
@ -1026,13 +1026,13 @@ static void
ulp_PrimaryCCPCH_RSCP_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP < -115 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP < -115dBm (0)");
} else if (v == 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP >= -25 dBm (91)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSCP >= -25dBm (91)");
} else if (v > 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RSCP < %d dBm (%u)", -116+v, -115+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSCP < %ddBm (%u)", -116+v, -115+v, v);
}
}
@ -1040,13 +1040,13 @@ static void
ulp_CPICH_Ec_N0_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 < -24 dB (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 < -24dB (0)");
} else if (v == 49) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 >= 0 dB (49)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH Ec/N0 >= 0dB (49)");
} else if (v > 49) {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f dB <= CPICH Ec/N0 < %.1f dB (%u)", -24.5+((float)v/2), -24+((float)v/2), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB <= CPICH Ec/N0 < %.1fdB (%u)", -24.5+((float)v/2), -24+((float)v/2), v);
}
}
@ -1054,13 +1054,13 @@ static void
ulp_CPICH_RSCP_fmt(gchar *s, guint32 v)
{
if (v == 123) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP < -120 dBm (123)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP < -120dBm (123)");
} else if (v > 123) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= CPICH RSCP < %d dBm (%u)", -244+v, -243+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= CPICH RSCP < %ddBm (%u)", -244+v, -243+v, v);
} else if (v == 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP >= -25 dBm (91)");
g_snprintf(s, ITEM_LABEL_LENGTH, "CPICH RSCP >= -25dBm (91)");
} else if (v < 91) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm < CPICH RSCP <= %d dBm (%u)", -116+v, -115+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm < CPICH RSCP <= %ddBm (%u)", -116+v, -115+v, v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "Spare (%u)", v);
}
@ -1072,9 +1072,9 @@ ulp_QoP_horacc_fmt(gchar *s, guint32 v)
double uncertainty = 10*(pow(1.1, (double)v)-1);
if (uncertainty < 1000) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%f m (%u)", uncertainty, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fm (%u)", uncertainty, v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%f km (%u)", uncertainty/1000, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fkm (%u)", uncertainty/1000, v);
}
}
@ -1083,13 +1083,13 @@ ulp_QoP_veracc_fmt(gchar *s, guint32 v)
{
double uncertainty = 45*(pow(1.025, (double)v)-1);
g_snprintf(s, ITEM_LABEL_LENGTH, "%f m (%u)", uncertainty, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fm (%u)", uncertainty, v);
}
static void
ulp_QoP_delay_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%g s (%u)", pow(2, (double)v), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%gs (%u)", pow(2, (double)v), v);
}
static const true_false_string ulp_vertical_dir_val = {
@ -1100,18 +1100,18 @@ static const true_false_string ulp_vertical_dir_val = {
static void
ulp_RelativeTime_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f s (%u)", 0.01*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fs (%u)", 0.01*v, v);
}
static void
ulp_RSRP_Range_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140 dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140dBm (0)");
} else if (v == 97) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP >= -44 dBm (97)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRP >= -44dBm (97)");
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%d dBm <= RSRP < %d dBm (%u)", -141+v, -140+v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSRP < %ddBm (%u)", -141+v, -140+v, v);
}
}
@ -1121,34 +1121,34 @@ ulp_RSRQ_Range_fmt(gchar *s, guint32 v)
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRQ < -19.5dB (0)");
} else if (v == 64) {
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRQ >= -3 dB (34)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSRQ >= -3dB (34)");
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f dB <= RSRQ < %.1f dB (%u)", -20+((float)v/2), -19.5+((float)v/2), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB <= RSRQ < %.1fdB (%u)", -20+((float)v/2), -19.5+((float)v/2), v);
}
}
static void
ulp_SignalDelta_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%s dB (%u)", v ? "0.5" : "0", v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%sdB (%u)", v ? "0.5" : "0", v);
}
static void
ulp_locationAccuracy_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f m (%u)", 0.1*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fm (%u)", 0.1*v, v);
}
static void
ulp_WimaxRTD_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f us (%u)", 0.01*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fus (%u)", 0.01*v, v);
}
static void
ulp_WimaxNMR_rssi_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f dBm (%u)", -103.75+(0.25*v), v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fdBm (%u)", -103.75+(0.25*v), v);
}
static void
@ -1156,7 +1156,7 @@ ulp_UTRAN_gpsReferenceTimeUncertainty_fmt(gchar *s, guint32 v)
{
double uncertainty = 0.0022*(pow(1.18, (double)v)-1);
g_snprintf(s, ITEM_LABEL_LENGTH, "%f us (%u)", uncertainty, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%fus (%u)", uncertainty, v);
}
static const value_string ulp_ganss_time_id_vals[] = {
@ -1170,7 +1170,7 @@ static const value_string ulp_ganss_time_id_vals[] = {
static void
ulp_utran_GANSSTimingOfCell_fmt(gchar *s, guint32 v)
{
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f us (%u)", 0.25*v, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%.2fus (%u)", 0.25*v, v);
}
static void