[tuxdroid-svn] r673 - in firmware: tuxaudio/trunk tuxcore/trunk

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

Author: jaguarondi
Date: 2007-11-09 16:19:03 +0100 (Fri, 09 Nov 2007)
New Revision: 673

Modified:
   firmware/tuxaudio/trunk/main.c
   firmware/tuxaudio/trunk/version.h
   firmware/tuxcore/trunk/global.c
   firmware/tuxcore/trunk/global.h
   firmware/tuxcore/trunk/version.h
Log:
* Added VARIATION and RELEASE_TYPE to versioning of tuxcore and tuxaudio.


Modified: firmware/tuxaudio/trunk/main.c
===================================================================
--- firmware/tuxaudio/trunk/main.c	2007-11-09 14:39:27 UTC (rev 672)
+++ firmware/tuxaudio/trunk/main.c	2007-11-09 15:19:03 UTC (rev 673)
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: */
+/* $Id: $*/
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
@@ -26,6 +26,7 @@
 #include <avr/sleep.h>
 
 #include "common/defines.h"
+#include "common/api.h"
 #include "init.h"
 #include "varis.h"
 #include "spi.h"
@@ -48,14 +49,11 @@
 
 #define CPU_NUMBER      TUXAUDIO_CPU_NUM /* audio CPU */
 const author_t author __attribute__ ((section("version.3"))) =
-{
-    AUTHOR_CMD, AUTHOR_ID, 0};
+{AUTHOR_CMD, AUTHOR_ID, VARIATION};
 const revision_t svn_revision __attribute__ ((section("version.2"))) =
-{
-    REVISION_CMD, SVN_REV, SVN_STATUS};
+{REVISION_CMD, SVN_REV, RELEASE_TYPE};
 const version_t tag_version __attribute__ ((section("version.1"))) =
-{
-    VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE};
+{VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE};
 static uint8_t info_flg = 0;           /* indicates if version information should be sent */
 static uint8_t pre_sleep_delay = 0;           /* set when sleep should be entered */
 

Modified: firmware/tuxaudio/trunk/version.h
===================================================================
--- firmware/tuxaudio/trunk/version.h	2007-11-09 14:39:27 UTC (rev 672)
+++ firmware/tuxaudio/trunk/version.h	2007-11-09 15:19:03 UTC (rev 673)
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: */
+/* $Id: $*/
 
 #ifndef VERSION_H
 #define VERSION_H
@@ -31,7 +31,14 @@
 #define VER_MAJOR           0
 #define VER_MINOR           3
 #define VER_UPDATE          1
+/** RELEASE should be set to '1' prior to tagging a release, and reset
+ * immediately after. It's like appending (SVN_UNRELEASED) to a version number
+ * when equal to '0'. */
+#define RELEASE             0
 
-#define AUTHOR_ID           0   /* official release */
+#define AUTHOR_ID           0 /* official release */
+#define VARIATION           0 /* generic firmware */
 
+#define RELEASE_TYPE (SVN_STATUS | (RELEASE << 2))
+
 #endif /* VERSION_H */

Modified: firmware/tuxcore/trunk/global.c
===================================================================
--- firmware/tuxcore/trunk/global.c	2007-11-09 14:39:27 UTC (rev 672)
+++ firmware/tuxcore/trunk/global.c	2007-11-09 15:19:03 UTC (rev 673)
@@ -53,11 +53,8 @@
 
 #define CPU_NUMBER      TUXCORE_CPU_NUM /* tuxcore CPU */
 const author_t author __attribute__ ((section("version.3"))) =
-{
-AUTHOR_CMD, AUTHOR_ID, 0};
+{AUTHOR_CMD, AUTHOR_ID, VARIATION};
 const revision_t svn_revision __attribute__ ((section("version.2"))) =
-{
-REVISION_CMD, SVN_REV, SVN_STATUS};
+{REVISION_CMD, SVN_REV, RELEASE_TYPE};
 const version_t tag_version __attribute__ ((section("version.1"))) =
-{
-VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE};
+{VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE};

Modified: firmware/tuxcore/trunk/global.h
===================================================================
--- firmware/tuxcore/trunk/global.h	2007-11-09 14:39:27 UTC (rev 672)
+++ firmware/tuxcore/trunk/global.h	2007-11-09 15:19:03 UTC (rev 673)
@@ -233,4 +233,12 @@
 
 extern struct condition_table cond_flags;
 
+/*
+ * Version number
+ */
+
+extern const author_t author;
+extern const revision_t svn_revision;
+extern const version_t tag_version;
+
 #endif /* _GLOBAL_H_ */

Modified: firmware/tuxcore/trunk/version.h
===================================================================
--- firmware/tuxcore/trunk/version.h	2007-11-09 14:39:27 UTC (rev 672)
+++ firmware/tuxcore/trunk/version.h	2007-11-09 15:19:03 UTC (rev 673)
@@ -31,11 +31,14 @@
 #define VER_MAJOR           0
 #define VER_MINOR           3
 #define VER_UPDATE          1
+/** RELEASE should be set to '1' prior to tagging a release, and reset
+ * immediately after. It's like appending (SVN_UNRELEASED) to a version number
+ * when equal to '0'. */
+#define RELEASE             0
 
-#define AUTHOR_ID           0   /* official release */
+#define AUTHOR_ID           0 /* official release */
+#define VARIATION           0 /* generic firmware */
 
-extern const author_t author;
-extern const revision_t svn_revision;
-extern const version_t tag_version;
+#define RELEASE_TYPE (SVN_STATUS | (RELEASE << 2))
 
 #endif /* VERSION_H */