Use bitfield type in GNSS HAL.
Test: mma
Change-Id: I92acf537a489fb06d942d3aa19ec9f40ffe26c23
diff --git a/gnss/1.0/default/AGnssRil.cpp b/gnss/1.0/default/AGnssRil.cpp
index 87abad7..480571d 100644
--- a/gnss/1.0/default/AGnssRil.cpp
+++ b/gnss/1.0/default/AGnssRil.cpp
@@ -50,7 +50,7 @@
return;
}
- sAGnssRilCbIface->requestSetIdCb(static_cast<IAGnssRilCallback::ID>(flags));
+ sAGnssRilCbIface->requestSetIdCb(flags);
}
void AGnssRil::requestRefLoc(uint32_t /*flags*/) {
diff --git a/gnss/1.0/default/GnssMeasurement.cpp b/gnss/1.0/default/GnssMeasurement.cpp
index 9f8d7b5..0d11636 100644
--- a/gnss/1.0/default/GnssMeasurement.cpp
+++ b/gnss/1.0/default/GnssMeasurement.cpp
@@ -52,18 +52,17 @@
for (size_t i = 0; i < gnssData.measurementCount; i++) {
auto entry = legacyGnssData->measurements[i];
gnssData.measurements[i] = {
- .flags = static_cast<IGnssMeasurementCallback::GnssMeasurementFlags>(entry.flags),
+ .flags = entry.flags,
.svid = entry.svid,
.constellation = static_cast<GnssConstellationType>(entry.constellation),
.timeOffsetNs = entry.time_offset_ns,
- .state = static_cast<IGnssMeasurementCallback::GnssMeasurementState>(entry.state),
+ .state = entry.state,
.receivedSvTimeInNs = entry.received_sv_time_in_ns,
.receivedSvTimeUncertaintyInNs = entry.received_sv_time_uncertainty_in_ns,
.cN0DbHz = entry.c_n0_dbhz,
.pseudorangeRateMps = entry.pseudorange_rate_mps,
.pseudorangeRateUncertaintyMps = entry.pseudorange_rate_uncertainty_mps,
- .accumulatedDeltaRangeState = static_cast<IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState>(
- entry.accumulated_delta_range_state),
+ .accumulatedDeltaRangeState = entry.accumulated_delta_range_state,
.accumulatedDeltaRangeM = entry.accumulated_delta_range_m,
.accumulatedDeltaRangeUncertaintyM = entry.accumulated_delta_range_uncertainty_m,
.carrierFrequencyHz = entry.carrier_frequency_hz,
@@ -78,7 +77,7 @@
auto clockVal = legacyGnssData->clock;
gnssData.clock = {
- .gnssClockFlags = static_cast<IGnssMeasurementCallback::GnssClockFlags>(clockVal.flags),
+ .gnssClockFlags = clockVal.flags,
.leapSecond = clockVal.leap_second,
.timeNs = clockVal.time_ns,
.timeUncertaintyNs = clockVal.time_uncertainty_ns,
@@ -117,9 +116,7 @@
for (size_t i = 0; i < gnssData.measurementCount; i++) {
auto entry = gpsData->measurements[i];
- gnssData.measurements[i].flags =
- static_cast<IGnssMeasurementCallback::GnssMeasurementFlags>(
- entry.flags);
+ gnssData.measurements[i].flags = entry.flags;
gnssData.measurements[i].svid = static_cast<int32_t>(entry.prn);
if (entry.prn >= 1 && entry.prn <= 32) {
gnssData.measurements[i].constellation = GnssConstellationType::GPS;
@@ -129,9 +126,7 @@
}
gnssData.measurements[i].timeOffsetNs = entry.time_offset_ns;
- gnssData.measurements[i].state =
- static_cast<IGnssMeasurementCallback::GnssMeasurementState>(
- entry.state);
+ gnssData.measurements[i].state = entry.state;
gnssData.measurements[i].receivedSvTimeInNs = entry.received_gps_tow_ns;
gnssData.measurements[i].receivedSvTimeUncertaintyInNs =
entry.received_gps_tow_uncertainty_ns;
@@ -140,8 +135,7 @@
gnssData.measurements[i].pseudorangeRateUncertaintyMps =
entry.pseudorange_rate_uncertainty_mps;
gnssData.measurements[i].accumulatedDeltaRangeState =
- static_cast<IGnssMeasurementCallback::GnssAccumulatedDeltaRangeState>(
- entry.accumulated_delta_range_state);
+ entry.accumulated_delta_range_state;
gnssData.measurements[i].accumulatedDeltaRangeM =
entry.accumulated_delta_range_m;
gnssData.measurements[i].accumulatedDeltaRangeUncertaintyM =
@@ -220,8 +214,7 @@
gnssData.clock.biasUncertaintyNs = clockVal.bias_uncertainty_ns;
gnssData.clock.driftNsps = clockVal.drift_nsps;
gnssData.clock.driftUncertaintyNsps = clockVal.drift_uncertainty_nsps;
- gnssData.clock.gnssClockFlags =
- static_cast<IGnssMeasurementCallback::GnssClockFlags>(clockVal.flags);
+ gnssData.clock.gnssClockFlags = clockVal.flags;
sGnssMeasureCbIface->GnssMeasurementCb(gnssData);
}
diff --git a/gnss/1.0/default/GnssNavigationMessage.cpp b/gnss/1.0/default/GnssNavigationMessage.cpp
index f2c69a7..ef78ff4 100644
--- a/gnss/1.0/default/GnssNavigationMessage.cpp
+++ b/gnss/1.0/default/GnssNavigationMessage.cpp
@@ -53,8 +53,7 @@
navigationMsg.svid = message->svid;
navigationMsg.type =
static_cast<IGnssNavigationMessageCallback::GnssNavigationMessageType>(message->type);
- navigationMsg.status =
- static_cast<IGnssNavigationMessageCallback::NavigationMessageStatus>(message->status);
+ navigationMsg.status = message->status;
navigationMsg.messageId = message->message_id;
navigationMsg.submessageId = message->submessage_id;
navigationMsg.data.setToExternal(message->data, message->data_length);
diff --git a/gnss/1.0/default/GnssNi.cpp b/gnss/1.0/default/GnssNi.cpp
index 10af1f4..ec57e8c 100644
--- a/gnss/1.0/default/GnssNi.cpp
+++ b/gnss/1.0/default/GnssNi.cpp
@@ -61,8 +61,7 @@
IGnssNiCallback::GnssNiNotification notificationGnss = {
.notificationId = notification->notification_id,
.niType = static_cast<IGnssNiCallback::GnssNiType>(notification->ni_type),
- .notifyFlags =
- static_cast<IGnssNiCallback::GnssNiNotifyFlags>(notification->notify_flags),
+ .notifyFlags = notification->notify_flags,
.timeoutSec = static_cast<uint32_t>(notification->timeout),
.defaultResponse =
static_cast<IGnssNiCallback::GnssUserResponseType>(notification->default_response),