[tuxdroid-svn] r563 - in firmware: fuxrf/trunk fuxrf/trunk/default tuxrf/trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: jaguarondi
Date: 2007-10-01 14:59:32 +0200 (Mon, 01 Oct 2007)
New Revision: 563

Modified:
   firmware/fuxrf/trunk/default/Makefile
   firmware/fuxrf/trunk/device.aps
   firmware/fuxrf/trunk/device.c
   firmware/tuxrf/trunk/device.c
Log:
* .version sections were wrong in the RF codes, both firmware now compile
  correctly but I still don't know whether they work. That's the next step.

Modified: firmware/fuxrf/trunk/default/Makefile
===================================================================

--- firmware/fuxrf/trunk/default/Makefile	2007-10-01 12:51:16 UTC (rev 562)
+++ firmware/fuxrf/trunk/default/Makefile	2007-10-01 12:59:32 UTC (rev 563)
@@ -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.aps
===================================================================
--- firmware/fuxrf/trunk/device.aps	2007-10-01 12:51:16 UTC (rev 562)
+++ firmware/fuxrf/trunk/device.aps	2007-10-01 12:59:32 UTC (rev 563)
@@ -1 +1 @@
-<AVRStudio><MANAGEMENT><ProjectName>device</ProjectName><Created>10-Nov-2005 15:17:29</Created><LastEdit>03-Jul-2007 17:26:25</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\fuxrf\trunk\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><Item>51</Item><Item>580</Item><Item>103</Item><Item>17</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>ACKmode</Variables><Variables>sof_ary</Variables><Variables>toy_id_h</Variables><Variables>toy_id_l</Variables><Variables>prf_buffer_tx</Variables><Variables>rf_tx_counter</Variables><Variables>tx_pac_len</Variables><Variables>rf_buffer_rx1</Variables><Variables>rf_buffer_rx2</Variables><Variables>pspi_buffer_rx</Variables><Variables>rf_buffer_tx2</Variables><Variables>rf_buffer_tx1</Variables><Variables>pspi_buffer_tx</Variables><Variables>rf_header</Variables><Variables>rf_status</Variables><Variables>watchdog</Variables><Variables>gfilter</Variables><Variables>replaceFrequency</Variables><Variables>frequencyTable</Variables><Variables>commandBuffer</Variables><Variables>spiConfigFrame</Variables></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module><map private="C:\Documents and Settings\Pascal\Desktop\TUX\Dongle\RF\Branches\RF_test\Branches\" public=""/><map private="C:\Documents and Settings\Pascal\Desktop\TUX\Dongle\RF\New_timing\" 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>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>version.h</HEADERFILE><HEADERFILE>commands.h</HEADERFILE><OTHERFILE>default\device.lss</OTHERFILE><OTHERFILE>default\device.map</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>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>258</Status></File00000><File00001><FileId>00001</FileId><FileName>prot.c</FileName><Status>258</Status></File00001><File00002><FileId>00002</FileId><FileName>rf_ctrl.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>init.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>misc.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>bootloader.c</FileName><Status>1</Status></File00005><File00006><FileId>00006</FileId><FileName>spi.c</FileName><Status>258</Status></File00006></Files><Workspace><File00005><Position>303 72 1381 502</Position><LineCol>22 13</LineCol><State>Maximized</State></File00005></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 14:04:44</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\fuxrf\trunk\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><Item>51</Item><Item>580</Item><Item>103</Item><Item>17</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>ACKmode</Variables><Variables>sof_ary</Variables><Variables>toy_id_h</Variables><Variables>toy_id_l</Variables><Variables>prf_buffer_tx</Variables><Variables>rf_tx_counter</Variables><Variables>tx_pac_len</Variables><Variables>rf_buffer_rx1</Variables><Variables>rf_buffer_rx2</Variables><Variables>pspi_buffer_rx</Variables><Variables>rf_buffer_tx2</Variables><Variables>rf_buffer_tx1</Variables><Variables>pspi_buffer_tx</Variables><Variables>rf_header</Variables><Variables>rf_status</Variables><Variables>watchdog</Variables><Variables>gfilter</Variables><Variables>replaceFrequency</Variables><Variables>frequencyTable</Variables><Variables>commandBuffer</Variables><Variables>spiConfigFrame</Variables></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module><map private="C:\Documents and Settings\Pascal\Desktop\TUX\Dongle\RF\Branches\RF_test\Branches\" public=""/><map private="C:\Documents and Settings\Pascal\Desktop\TUX\Dongle\RF\New_timing\" 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>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>version.h</HEADERFILE><HEADERFILE>common\commands.h</HEADERFILE><OTHERFILE>default\device.lss</OTHERFILE><OTHERFILE>default\device.map</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>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\fuxrf\trunk\varis.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\init.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\misc.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\prot.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\rf_ctrl.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\defines.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\bootloader.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\spi.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\version.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\common\commands.h</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\device.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\init.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\misc.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\prot.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\rf_ctrl.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\varis.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\spi.c</Name><Name>C:\Documents and Settings\david\My Documents\tux\firmware\fuxrf\trunk\bootloader.c</Name></Files></ProjectFiles><Files><File00000><FileId>00000</FileId><FileName>device.c</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>prot.c</FileName><Status>258</Status></File00001><File00002><FileId>00002</FileId><FileName>rf_ctrl.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>init.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>misc.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>spi.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>rf_ctrl.h</FileName><Status>1</Status></File00006></Files><Workspace><File00000><Position>329 132 1321 417</Position><LineCol>0 0</LineCol></File00000><File00006><Position>303 72 1391 507</Position><LineCol>48 49</LineCol><State>Maximized</State></File00006></Workspace><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>

Modified: firmware/fuxrf/trunk/device.c
===================================================================
--- firmware/fuxrf/trunk/device.c	2007-10-01 12:51:16 UTC (rev 562)
+++ firmware/fuxrf/trunk/device.c	2007-10-01 12:59:32 UTC (rev 563)
@@ -17,15 +17,15 @@
 #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"))) =
+const author_t author __attribute__ ((section(".version"))) =
 {
     AUTHOR_CMD, AUTHOR_ID, 0,
 };
-const revision_t svn_revision __attribute__ ((section("version"))) =
+const revision_t svn_revision __attribute__ ((section(".version"))) =
 {
     REVISION_CMD, SVN_REV, SVN_STATUS,
 };
-const version_t tag_version __attribute__ ((section("version"))) =
+const version_t tag_version __attribute__ ((section(".version"))) =
 {
     VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE,
 };

Modified: firmware/tuxrf/trunk/device.c
===================================================================
--- firmware/tuxrf/trunk/device.c	2007-10-01 12:51:16 UTC (rev 562)
+++ firmware/tuxrf/trunk/device.c	2007-10-01 12:59:32 UTC (rev 563)
@@ -26,15 +26,15 @@
 #define CPU_NUMBER      TUXRF_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"))) =
+const author_t author __attribute__ ((section(".version"))) =
 {
     AUTHOR_CMD, AUTHOR_ID, 0,
 };
-const revision_t svn_revision __attribute__ ((section("version"))) =
+const revision_t svn_revision __attribute__ ((section(".version"))) =
 {
     REVISION_CMD, SVN_REV, SVN_STATUS,
 };
-const version_t tag_version __attribute__ ((section("version"))) =
+const version_t tag_version __attribute__ ((section(".version"))) =
 {
     VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE,
 };



