[tuxdroid-svn] r558 - in firmware: fuxrf/trunk fuxrf/trunk/default tuxrf/trunk
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r558 - in firmware: fuxrf/trunk fuxrf/trunk/default tuxrf/trunk
|
From: jaguarondi <c2m...@c2...> - 2007-10-01 10:29:38
|
Author: jaguarondi Date: 2007-10-01 12:29:33 +0200 (Mon, 01 Oct 2007) New Revision: 558 Added: firmware/fuxrf/trunk/version.h firmware/tuxrf/trunk/version.h Modified: firmware/fuxrf/trunk/ firmware/fuxrf/trunk/default/Makefile firmware/fuxrf/trunk/device.c firmware/tuxrf/trunk/ firmware/tuxrf/trunk/device.aps firmware/tuxrf/trunk/device.c Log: * Fixed the version numbers section. Now fuxrf exceeds the flash space so it doesn't compile anymore, that's why Pascal removed the version section probably. Property changes on: firmware/fuxrf/trunk ___________________________________________________________________ Name: svn:externals + common http://svn.tuxisalive.com/firmware/tuxdefs Modified: firmware/fuxrf/trunk/default/Makefile =================================================================== --- firmware/fuxrf/trunk/default/Makefile 2007-10-01 09:49:25 UTC (rev 557) +++ firmware/fuxrf/trunk/default/Makefile 2007-10-01 10:29:33 UTC (rev 558) @@ -22,7 +22,7 @@ ## Linker flags LDFLAGS = $(COMMON) -LDFLAGS += -Wl,--section-start=.bootloader=0x0F00 -Wl,--section-start=.version=0x0EF0 -Wl,-Map=device.map +LDFLAGS += -Wl,--section-start=.bootloader=0x0F00 -Wl,--section-start=.version=0x0EF0 -Wl,-Map=device.map LDFLAGS += -Wl,-section-start=.buffer_tx1=0x800100 LDFLAGS += -Wl,-section-start=.buffer_rx1=0x800140 LDFLAGS += -Wl,-section-start=.sof=0x8001e6 Modified: firmware/fuxrf/trunk/device.c =================================================================== --- firmware/fuxrf/trunk/device.c 2007-10-01 09:49:25 UTC (rev 557) +++ firmware/fuxrf/trunk/device.c 2007-10-01 10:29:33 UTC (rev 558) @@ -7,19 +7,30 @@ #include "prot.h" #include "rf_ctrl.h" #include "spi.h" -#include "commands.h" +#include "common/commands.h" #include "version.h" /* * Version number */ -#define CPU_NUMBER DONGLERF_CPU_NUM /* sound CPU */ -const author_t author __attribute__((section(".version"))) = {AUTHOR_CMD, AUTHOR_ID, 0}; -const revision_t svn_revision __attribute__((section(".version"))) = {REVISION_CMD, REVISION_NUMBER, 0}; -const version_t tag_version __attribute__((section(".version"))) = {VERSION_CMD, CPU_NUMBER, VER_MAJOR, VER_MINOR, VER_UPDATE}; +#define CPU_NUMBER FUXRF_CPU_NUM /* sound CPU */ +/* XXX Add the linker script to have fixed version positions once the project will compile with latest gcc under linux. */ +const author_t author __attribute__ ((section("version"))) = +{ + AUTHOR_CMD, AUTHOR_ID, 0, +}; +const revision_t svn_revision __attribute__ ((section("version"))) = +{ + REVISION_CMD, SVN_REV, SVN_STATUS, +}; +const version_t tag_version __attribute__ ((section("version"))) = +{ + VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE, +}; + /* Bootloader can be included with the program */ #define BOOTLOADER 1 Added: firmware/fuxrf/trunk/version.h =================================================================== --- firmware/fuxrf/trunk/version.h (rev 0) +++ firmware/fuxrf/trunk/version.h 2007-10-01 10:29:33 UTC (rev 558) @@ -0,0 +1,24 @@ +/* KySoH iTux agent + * + * Behavioural source code + * created on 2005/10/20 David Bourgeois + * -------------------------------------------------------- + * + */ + +#ifndef _VERSION_H_ +#define _VERSION_H_ + +/* + * Version number + */ + +#define VER_MAJOR 0 +#define VER_MINOR 2 +#define VER_UPDATE 0 + +#define AUTHOR_ID 0 /* official release */ +#define SVN_REV 0xFFEE /* XXX find a way to define this automatically in the Makefile from SVN */ +#define SVN_STATUS 0 /* XXX also fix this in the Makefile */ + +#endif /* _VERSION_H_ */ Property changes on: firmware/tuxrf/trunk ___________________________________________________________________ Name: svn:externals + common http://svn.tuxisalive.com/firmware/tuxdefs Modified: firmware/tuxrf/trunk/device.aps =================================================================== --- firmware/tuxrf/trunk/device.aps 2007-10-01 09:49:25 UTC (rev 557) +++ firmware/tuxrf/trunk/device.aps 2007-10-01 10:29:33 UTC (rev 558) @@ -1 +1 @@ -<AVRStudio><MANAGEMENT><ProjectName>device</ProjectName><Created>10-Nov-2005 15:17:29</Created><LastEdit>03-Jul-2007 17:14:47</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>10-Nov-2005 15:17:29</Created><Version>4</Version><Build>4, 12, 0, 454</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>default\device.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><Item>580</Item><Item>51</Item><Item>584</Item><Item>634</Item><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>1</WATCHNUM><WATCHNAMES><Pane0><Variables>ts</Variables><Variables>i</Variables><Variables>rf_rx_state</Variables><Variables>checksum</Variables><Variables>protocol_flags</Variables><Variables>rf_buffer_tx</Variables><Variables>channel</Variables><Variables>FHAState</Variables><Variables>frequencyTable</Variables><Variables>commandStatus</Variables></Pane0><Pane1><Variables>sof_ary</Variables><Variables>rf_buffer_rx1</Variables><Variables>rf_buffer_rx2</Variables><Variables>rf_buffer_tx1</Variables><Variables>rf_buffer_tx2</Variables><Variables>headerb</Variables><Variables>commandBuffer</Variables><Variables>sleepMode</Variables></Pane1><Pane2><Variables>spi_count</Variables><Variables>spi_lenght</Variables><Variables>Test</Variables><Variables>sinus</Variables></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module><map private="C:\Documents and Settings\Pascal\Desktop\TUX\MainBoard\RF\branches\New_timing\" public=""/><map private="C:\Documents and Settings\Pascal\Desktop\TUX\MainBoard\RF\branches\RF_test\Branches\" public=""/></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>init.c</SOURCEFILE><SOURCEFILE>misc.c</SOURCEFILE><SOURCEFILE>prot.c</SOURCEFILE><SOURCEFILE>rf_ctrl.c</SOURCEFILE><SOURCEFILE>varis.c</SOURCEFILE><SOURCEFILE>sleep.c</SOURCEFILE><SOURCEFILE>spi.c</SOURCEFILE><SOURCEFILE>bootloader.c</SOURCEFILE><HEADERFILE>varis.h</HEADERFILE><HEADERFILE>init.h</HEADERFILE><HEADERFILE>misc.h</HEADERFILE><HEADERFILE>prot.h</HEADERFILE><HEADERFILE>rf_ctrl.h</HEADERFILE><HEADERFILE>defines.h</HEADERFILE><HEADERFILE>bootloader.h</HEADERFILE><HEADERFILE>spi.h</HEADERFILE><HEADERFILE>sleep.h</HEADERFILE><HEADERFILE>commands.h</HEADERFILE><HEADERFILE>version.h</HEADERFILE><OTHERFILE>default\device.map</OTHERFILE><OTHERFILE>default\device.lss</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>NO</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE></EXTERNALMAKEFILE><PART>atmega48</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>device.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>1</ISDIRTY><OPTIONS><OPTION><FILE>bootloader.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>device.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>init.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>misc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>prot.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rf_ctrl.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>sleep.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>spi.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>varis.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -DF_CPU=13824000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS>-Wl,--section-start=.bootloader=0x0F00 -Wl,--section-start=.version=0x0EF0</LINKEROPTIONS><SEGMENTS><SEGMENT><NAME>.buffer_tx1</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x100</ADDRESS></SEGMENT><SEGMENT><NAME>.buffer_rx1</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x140</ADDRESS></SEGMENT><SEGMENT><NAME>.sof</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x1e6</ADDRESS></SEGMENT><SEGMENT><NAME>.globals</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x1ea</ADDRESS></SEGMENT><SEGMENT><NAME>.buffer_tx2</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x173</ADDRESS></SEGMENT><SEGMENT><NAME>.buffer_rx2</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x1b3</ADDRESS></SEGMENT></SEGMENTS></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20060421\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20060421\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><IOView><usergroups/></IOView><Files><File00000><FileId>00000</FileId><FileName>device.c</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>rf_ctrl.c</FileName><Status>258</Status></File00001><File00002><FileId>00002</FileId><FileName>init.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>misc.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>sleep.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>spi.c</FileName><Status>258</Status></File00005></Files><Workspace><File00000><Position>303 72 1381 502</Position><LineCol>0 0</LineCol><State>Maximized</State></File00000></Workspace><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio> +<AVRStudio><MANAGEMENT><ProjectName>device</ProjectName><Created>10-Nov-2005 15:17:29</Created><LastEdit>01-Oct-2007 12:29:22</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>10-Nov-2005 15:17:29</Created><Version>4</Version><Build>4, 12, 0, 454</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>default\device.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><Item>580</Item><Item>51</Item><Item>584</Item><Item>634</Item><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>1</WATCHNUM><WATCHNAMES><Pane0><Variables>ts</Variables><Variables>i</Variables><Variables>rf_rx_state</Variables><Variables>checksum</Variables><Variables>protocol_flags</Variables><Variables>rf_buffer_tx</Variables><Variables>channel</Variables><Variables>FHAState</Variables><Variables>frequencyTable</Variables><Variables>commandStatus</Variables></Pane0><Pane1><Variables>sof_ary</Variables><Variables>rf_buffer_rx1</Variables><Variables>rf_buffer_rx2</Variables><Variables>rf_buffer_tx1</Variables><Variables>rf_buffer_tx2</Variables><Variables>headerb</Variables><Variables>commandBuffer</Variables><Variables>sleepMode</Variables></Pane1><Pane2><Variables>spi_count</Variables><Variables>spi_lenght</Variables><Variables>Test</Variables><Variables>sinus</Variables></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module><map private="C:\Documents and Settings\Pascal\Desktop\TUX\MainBoard\RF\branches\New_timing\" public=""/><map private="C:\Documents and Settings\Pascal\Desktop\TUX\MainBoard\RF\branches\RF_test\Branches\" public=""/></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>init.c</SOURCEFILE><SOURCEFILE>misc.c</SOURCEFILE><SOURCEFILE>prot.c</SOURCEFILE><SOURCEFILE>rf_ctrl.c</SOURCEFILE><SOURCEFILE>varis.c</SOURCEFILE><SOURCEFILE>sleep.c</SOURCEFILE><SOURCEFILE>spi.c</SOURCEFILE><SOURCEFILE>bootloader.c</SOURCEFILE><HEADERFILE>varis.h</HEADERFILE><HEADERFILE>init.h</HEADERFILE><HEADERFILE>misc.h</HEADERFILE><HEADERFILE>prot.h</HEADERFILE><HEADERFILE>rf_ctrl.h</HEADERFILE><HEADERFILE>defines.h</HEADERFILE><HEADERFILE>bootloader.h</HEADERFILE><HEADERFILE>spi.h</HEADERFILE><HEADERFILE>sleep.h</HEADERFILE><HEADERFILE>version.h</HEADERFILE><HEADERFILE>common\commands.h</HEADERFILE><OTHERFILE>default\device.map</OTHERFILE><OTHERFILE>default\device.lss</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>NO</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE></EXTERNALMAKEFILE><PART>atmega48</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>device.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>1</ISDIRTY><OPTIONS><OPTION><FILE>bootloader.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>device.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>init.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>misc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>prot.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rf_ctrl.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>sleep.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>spi.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>varis.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -DF_CPU=13824000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS>-Wl,--section-start=.bootloader=0x0F00 -Wl,--section-start=.version=0x0EF0</LINKEROPTIONS><SEGMENTS><SEGMENT><NAME>.buffer_tx1</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x100</ADDRESS></SEGMENT><SEGMENT><NAME>.buffer_rx1</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x140</ADDRESS></SEGMENT><SEGMENT><NAME>.sof</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x1e6</ADDRESS></SEGMENT><SEGMENT><NAME>.globals</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x1ea</ADDRESS></SEGMENT><SEGMENT><NAME>.buffer_tx2</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x173</ADDRESS></SEGMENT><SEGMENT><NAME>.buffer_rx2</NAME><SEGMENT>SRAM</SEGMENT><ADDRESS>0x1b3</ADDRESS></SEGMENT></SEGMENTS></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20060421\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20060421\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><IOView><usergroups/></IOView><ProjectFiles><Files><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\varis.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\init.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\misc.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\prot.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\rf_ctrl.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\defines.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\bootloader.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\spi.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\sleep.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\version.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\common\commands.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\device.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\init.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\misc.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\prot.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\rf_ctrl.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\varis.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\sleep.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\spi.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\tuxrf\trunk\bootloader.c</Name></Files></ProjectFiles><Files><File00000><FileId>00000</FileId><FileName>device.c</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>rf_ctrl.c</FileName><Status>258</Status></File00001><File00002><FileId>00002</FileId><FileName>init.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>misc.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>sleep.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>spi.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>version.h</FileName><Status>1</Status></File00006></Files><Workspace><File00000><Position>303 73 1381 503</Position><LineCol>39 2</LineCol></File00000><File00006><Position>303 72 1391 507</Position><LineCol>21 60</LineCol><State>Maximized</State></File00006></Workspace><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio> Modified: firmware/tuxrf/trunk/device.c =================================================================== --- firmware/tuxrf/trunk/device.c 2007-10-01 09:49:25 UTC (rev 557) +++ firmware/tuxrf/trunk/device.c 2007-10-01 10:29:33 UTC (rev 558) @@ -9,7 +9,7 @@ #include "rf_ctrl.h" #include "spi.h" #include "sleep.h" -#include "commands.h" +#include "common/commands.h" #include "version.h" /* Bootloader can be included with the program */ @@ -24,10 +24,21 @@ */ #define CPU_NUMBER TUXRF_CPU_NUM /* sound CPU */ -const author_t author __attribute__((section(".version"))) = {AUTHOR_CMD, AUTHOR_ID, 0}; -const revision_t svn_revision __attribute__((section(".version"))) = {REVISION_CMD, REVISION_NUMBER, 0}; -const version_t tag_version __attribute__((section(".version"))) = {VERSION_CMD, CPU_NUMBER, VER_MAJOR, VER_MINOR, VER_UPDATE}; +/* XXX Add the linker script to have fixed version positions once the project will compile with latest gcc under linux. */ +const author_t author __attribute__ ((section("version"))) = +{ + AUTHOR_CMD, AUTHOR_ID, 0, +}; +const revision_t svn_revision __attribute__ ((section("version"))) = +{ + REVISION_CMD, SVN_REV, SVN_STATUS, +}; +const version_t tag_version __attribute__ ((section("version"))) = +{ + VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE, +}; + //***************************************************************************** //* Project: RF-Firmware for ISM * //* Function: main * Added: firmware/tuxrf/trunk/version.h =================================================================== --- firmware/tuxrf/trunk/version.h (rev 0) +++ firmware/tuxrf/trunk/version.h 2007-10-01 10:29:33 UTC (rev 558) @@ -0,0 +1,24 @@ +/* KySoH iTux agent + * + * Behavioural source code + * created on 2005/10/20 David Bourgeois + * -------------------------------------------------------- + * + */ + +#ifndef _VERSION_H_ +#define _VERSION_H_ + +/* + * Version number + */ + +#define VER_MAJOR 0 +#define VER_MINOR 2 +#define VER_UPDATE 0 + +#define AUTHOR_ID 0 /* official release */ +#define SVN_REV 0xFFEE /* XXX find a way to define this automatically in the Makefile from SVN */ +#define SVN_STATUS 0 /* XXX also fix this in the Makefile */ + +#endif /* _VERSION_H_ */ |
