Network: Move code

Author: LeeLeahy2

Firmware/RTK_Everywhere/Network.ino

@@ -586,30 +586,6 @@ const char *networkGetNameByPriority(NetPriority_t priority)
     return "None";
 }
 
-//----------------------------------------
-// Determine if the network interface is online
-//----------------------------------------
-bool networkInterfaceHasInternet(NetIndex_t index)
-{
-    // Validate the index
-    networkValidateIndex(index);
-
-    // Return the network interface state
-    return (networkHasInternet_bm & (1 << index)) ? true : false;
-}
-
-//----------------------------------------
-// Determine if the network interface has completed its start routine
-//----------------------------------------
-bool networkIsInterfaceStarted(NetIndex_t index)
-{
-    // Validate the index
-    networkValidateIndex(index);
-
-    // Return the network started state
-    return (networkStarted & (1 << index)) ? true : false;
-}
-
 //----------------------------------------
 // Determine if any network interface is online
 //----------------------------------------
@@ -620,23 +596,23 @@ bool networkHasInternet()
 }
 
 //----------------------------------------
-// Determine if the network is present on the platform
+// Interface stop event
 //----------------------------------------
-bool networkIsPresent(NetIndex_t index)
+void networkInterfaceEventStop(NetIndex_t index)
 {
-    // Validate the index
-    networkValidateIndex(index);
-
-    // Present if nullptr or bool set to true
-    return ((!networkInterfaceTable[index].present) || *(networkInterfaceTable[index].present));
+    networkEventStop[index] = true;
 }
 
 //----------------------------------------
-// Interface stop event
+// Determine if the network interface is online
 //----------------------------------------
-void networkInterfaceEventStop(NetIndex_t index)
+bool networkInterfaceHasInternet(NetIndex_t index)
 {
-    networkEventStop[index] = true;
+    // Validate the index
+    networkValidateIndex(index);
+
+    // Return the network interface state
+    return (networkHasInternet_bm & (1 << index)) ? true : false;
 }
 
 //----------------------------------------
@@ -780,6 +756,30 @@ void networkInterfaceEventInternetAvailable(NetIndex_t index)
         networkMulticastDNSStart(previousIndex);
 }
 
+//----------------------------------------
+// Determine if the network interface has completed its start routine
+//----------------------------------------
+bool networkIsInterfaceStarted(NetIndex_t index)
+{
+    // Validate the index
+    networkValidateIndex(index);
+
+    // Return the network started state
+    return (networkStarted & (1 << index)) ? true : false;
+}
+
+//----------------------------------------
+// Determine if the network is present on the platform
+//----------------------------------------
+bool networkIsPresent(NetIndex_t index)
+{
+    // Validate the index
+    networkValidateIndex(index);
+
+    // Present if nullptr or bool set to true
+    return ((!networkInterfaceTable[index].present) || *(networkInterfaceTable[index].present));
+}
+
 //----------------------------------------
 // Change multicast DNS to a given network
 //----------------------------------------
@@ -1326,42 +1326,6 @@ void networkStartDelayed(NetIndex_t index, uintptr_t parameter, bool debug)
     }
 }
 
-//----------------------------------------
-// Validate the network index
-//----------------------------------------
-void networkValidateIndex(NetIndex_t index)
-{
-    // Validate the index
-    if (index >= NETWORK_OFFLINE)
-    {
-        systemPrintf("HALTED: Invalid index value %d, valid range (0 - %d)!\r\n", index, NETWORK_OFFLINE - 1);
-        reportFatalError("Invalid index value!");
-    }
-}
-
-//----------------------------------------
-// Validate the network priority
-//----------------------------------------
-void networkValidatePriority(NetPriority_t priority)
-{
-    // Validate the priority
-    if (priority >= NETWORK_OFFLINE)
-    {
-        systemPrintf("HALTED: Invalid priority value %d, valid range (0 - %d)!\r\n", priority, NETWORK_OFFLINE - 1);
-        reportFatalError("Invalid priority value!");
-    }
-}
-
-//----------------------------------------
-// Verify the network layer tables
-//----------------------------------------
-void networkVerifyTables()
-{
-    // Verify the table lengths
-    if (NETWORK_OFFLINE != NETWORK_MAX)
-        reportFatalError("Fix networkInterfaceTable to match NetworkType");
-}
-
 //----------------------------------------
 // Maintain the network connections
 //----------------------------------------
@@ -1570,6 +1534,42 @@ void networkUpdate()
     }
 }
 
+//----------------------------------------
+// Validate the network index
+//----------------------------------------
+void networkValidateIndex(NetIndex_t index)
+{
+    // Validate the index
+    if (index >= NETWORK_OFFLINE)
+    {
+        systemPrintf("HALTED: Invalid index value %d, valid range (0 - %d)!\r\n", index, NETWORK_OFFLINE - 1);
+        reportFatalError("Invalid index value!");
+    }
+}
+
+//----------------------------------------
+// Validate the network priority
+//----------------------------------------
+void networkValidatePriority(NetPriority_t priority)
+{
+    // Validate the priority
+    if (priority >= NETWORK_OFFLINE)
+    {
+        systemPrintf("HALTED: Invalid priority value %d, valid range (0 - %d)!\r\n", priority, NETWORK_OFFLINE - 1);
+        reportFatalError("Invalid priority value!");
+    }
+}
+
+//----------------------------------------
+// Verify the network layer tables
+//----------------------------------------
+void networkVerifyTables()
+{
+    // Verify the table lengths
+    if (NETWORK_OFFLINE != NETWORK_MAX)
+        reportFatalError("Fix networkInterfaceTable to match NetworkType");
+}
+
 // Return the bitfield containing the type of consumers currently using the network
 uint16_t networkGetConsumerTypes()
 {