device: google: contexthub: fix -Wreorder-init-listandroid-r-preview-1

am: 5c1466b97d

Change-Id: Id41838f9dfcab38decd5e747c8aecbcb359bd6a7

3 files changed, 6 insertions, 6 deletions

diff --git a/contexthubhal/nanohubhal_default.cpp b/contexthubhal/nanohubhal_default.cpp
index fb5231e3..71bdadd3 100644
--- a/contexthubhal/nanohubhal_default.cpp
+++ b/contexthubhal/nanohubhal_default.cpp
@@ -58,8 +58,8 @@ static const context_hub_t mHub = {
     .connected_sensors = mSensors,
     .num_connected_sensors = sizeof(mSensors) / sizeof(*mSensors),
 
-    .max_supported_msg_len = MAX_RX_PACKET,
     .os_app_name = { .id = 0 },
+    .max_supported_msg_len = MAX_RX_PACKET,
 };
 
 const char *get_devnode_path(void)
diff --git a/contexthubhal/system_comms.cpp b/contexthubhal/system_comms.cpp
index 358e2f54..87e5feef 100644
--- a/contexthubhal/system_comms.cpp
+++ b/contexthubhal/system_comms.cpp
@@ -267,33 +267,33 @@ int SystemComm::MemInfoSession::handleRx(MessageBuf &buf, uint32_t transactionId
         if (mi.sharedSz != NANOHUB_MEM_SZ_UNKNOWN &&
             mi.sharedUse != NANOHUB_MEM_SZ_UNKNOWN)
             ranges.push_back({
-                .type = HUB_MEM_TYPE_MAIN,
                 .total_bytes = mi.sharedSz,
                 .free_bytes = mi.sharedSz - mi.sharedUse,
+                .type = HUB_MEM_TYPE_MAIN,
             });
 
         if (mi.osSz != NANOHUB_MEM_SZ_UNKNOWN &&
             mi.osUse != NANOHUB_MEM_SZ_UNKNOWN)
             ranges.push_back({
-                .type = HUB_MEM_TYPE_OS,
                 .total_bytes = mi.osSz,
                 .free_bytes = mi.osSz - mi.osUse,
+                .type = HUB_MEM_TYPE_OS,
             });
 
         if (mi.eeSz != NANOHUB_MEM_SZ_UNKNOWN &&
             mi.eeUse != NANOHUB_MEM_SZ_UNKNOWN)
             ranges.push_back({
-                .type = HUB_MEM_TYPE_EEDATA,
                 .total_bytes = mi.eeSz,
                 .free_bytes = mi.eeSz - mi.eeUse,
+                .type = HUB_MEM_TYPE_EEDATA,
             });
 
         if (mi.ramSz != NANOHUB_MEM_SZ_UNKNOWN &&
             mi.ramUse != NANOHUB_MEM_SZ_UNKNOWN)
             ranges.push_back({
-                .type = HUB_MEM_TYPE_RAM,
                 .total_bytes = mi.ramSz,
                 .free_bytes = mi.ramSz - mi.ramUse,
+                .type = HUB_MEM_TYPE_RAM,
             });
     }
 
diff --git a/contexthubhal/test/main.cpp b/contexthubhal/test/main.cpp
index f8399cef..53c94ad4 100644
--- a/contexthubhal/test/main.cpp
+++ b/contexthubhal/test/main.cpp
@@ -142,8 +142,8 @@ private:
         hub_message_t msg = {
             .app_name = app,
             .message_type = typ,
-            .message = data,
             .message_len = len,
+            .message = data,
         };
         return sendMessage(id, msg);
     }