[tuxdroid-svn] r943 - daemon/trunk

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2008-03-18 09:06:18 +0100 (Tue, 18 Mar 2008)
New Revision: 943

Modified:
   daemon/trunk/versioning.c
Log:
* Hardcoded forthcoming 0.4.0 release and now accept a mix of minor version
  numbers.



Modified: daemon/trunk/versioning.c
===================================================================
--- daemon/trunk/versioning.c	2008-03-18 07:17:52 UTC (rev 942)
+++ daemon/trunk/versioning.c	2008-03-18 08:06:18 UTC (rev 943)
@@ -224,7 +224,7 @@
 
     release = &tux_status.firmware_info[RELEASE_INDEX];
     /* We first check that all firmware are released and have the same
-     * major/minor version numbers. Also find the update number. */
+     * major version numbers. Also find the update number. */
     major = tux_status.firmware_info[LOWEST_CPU_NUM].version_major;
     minor = tux_status.firmware_info[LOWEST_CPU_NUM].version_minor;
     while (cpu_num <= HIGHEST_CPU_NUM)
@@ -232,9 +232,9 @@
         firmware = &tux_status.firmware_info[cpu_num];
         if (update < firmware->version_update)
             update = firmware->version_update;
-        if (!firmware->release
-            || (firmware->version_major != major)
-            || (firmware->version_minor != minor))
+        if (minor < firmware->version_minor)
+            minor = firmware->version_minor;
+        if (!firmware->release || (firmware->version_major != major))
             return;
         cpu_num ++;
     }
@@ -244,22 +244,47 @@
         /* release 0.3.0, all CPUs have the same version number 0.3.0. */
     {
         if ((tux_status.firmware_info[TUXCORE_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXCORE_CPU_NUM].version_minor != 3)
             || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_minor != 3)
             || (tux_status.firmware_info[TUXRF_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXRF_CPU_NUM].version_minor != 3)
             || (tux_status.firmware_info[FUXRF_CPU_NUM].version_update != 0)
-            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0))
+            || (tux_status.firmware_info[FUXRF_CPU_NUM].version_minor != 3)
+            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_minor != 3))
             return;
     }
     else if (major == 0 && minor == 3 && update == 1)
         /* release 0.3.1, tuxcore and tuxaudio updated to 0.3.1 */
     {
         if ((tux_status.firmware_info[TUXCORE_CPU_NUM].version_update != 1)
+            || (tux_status.firmware_info[TUXCORE_CPU_NUM].version_minor != 3)
             || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_update != 1)
+            || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_minor != 3)
             || (tux_status.firmware_info[TUXRF_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXRF_CPU_NUM].version_minor != 3)
             || (tux_status.firmware_info[FUXRF_CPU_NUM].version_update != 0)
-            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0))
+            || (tux_status.firmware_info[FUXRF_CPU_NUM].version_minor != 3)
+            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_minor != 3))
             return;
     }
+    else if (major == 0 && minor == 3 && update == 1)
+        /* release 0.4.0, RF is still 0.3.0 */
+    {
+        if ((tux_status.firmware_info[TUXCORE_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXCORE_CPU_NUM].version_minor != 4)
+            || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXAUDIO_CPU_NUM].version_minor != 4)
+            || (tux_status.firmware_info[TUXRF_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[TUXRF_CPU_NUM].version_minor != 3)
+            || (tux_status.firmware_info[FUXRF_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[FUXRF_CPU_NUM].version_minor != 3)
+            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_update != 0)
+            || (tux_status.firmware_info[FUXUSB_CPU_NUM].version_minor != 4))
+            return;
+    }
 
     /* It's a release. */
     release->version_major = major;