can-svn Mailing List for CAN bus network drivers and utilities (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 866
          http://can.svn.sourceforge.net/can/?rev=866&view=rev
Author:   akhe
Date:     2008-03-01 05:09:07 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
Added bug fixes to CAN libraries and to USB libraries

Modified Paths:
--------------
    trunk/firmware/arm/str/cantest_str75x_iar/cantest.dep
    trunk/firmware/arm/str/cantest_str75x_iar/main.c
    trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.dbgdt
    trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.wsdt
    trunk/firmware/arm/str/cantest_str75x_iar/str75x_lib/src/75x_can.c
    trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c
    trunk/firmware/arm/str/common/str75x_lib/include/75x_can.h
    trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c
    trunk/firmware/arm/str/common/usblib/library/src/usb_core.c

Modified: trunk/firmware/arm/str/cantest_str75x_iar/cantest.dep
===================================================================

--- trunk/firmware/arm/str/cantest_str75x_iar/cantest.dep	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/cantest_str75x_iar/cantest.dep	2008-03-01 13:09:07 UTC (rev 866)
@@ -6,106 +6,109 @@
   <configuration>
     <name>Debug</name>
     <outputs>
-      <file>$PROJ_DIR$\str75x_lib\inc\75x_gpio.h</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_can.pbi</file>
+      <file>$PROJ_DIR$\str75x_lib\inc\75x_can.h</file>
       <file>$TOOLKIT_DIR$\lib\dl4t_tl_in.a</file>
-      <file>$PROJ_DIR$\linker\STR75x_FLASH.icf</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_eic.o</file>
+      <file>$PROJ_DIR$\Debug\Obj\main.o</file>
+      <file>$PROJ_DIR$\Debug\Exe\cantest.hex</file>
+      <file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
       <file>$PROJ_DIR$\str75x_lib\inc\75x_type.h</file>
-      <file>$PROJ_DIR$\str75x_lib\inc\75x_map.h</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_gpio.pbi</file>
       <file>$PROJ_DIR$\Debug\Obj\75x_mrcc.pbi</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_vect.o</file>
-      <file>$PROJ_DIR$\str75x_lib\src\75x_gpio.c</file>
-      <file>$PROJ_DIR$\str75x_lib\src\75x_eic.c</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_eic.pbi</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_mrcc.o</file>
-      <file>$TOOLKIT_DIR$\lib\rt4t_al.a</file>
       <file>$TOOLKIT_DIR$\lib\shs_l.a</file>
-      <file>$PROJ_DIR$\Debug\Exe\cantest.hex</file>
-      <file>$PROJ_DIR$\str75x_lib\inc\75x_eic.h</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_can.o</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_it.o</file>
-      <file>$PROJ_DIR$\Debug\Obj\main.o</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_init.o</file>
       <file>$PROJ_DIR$\Debug\Obj\75x_it.pbi</file>
-      <file>$PROJ_DIR$\str75x_lib\inc\75x_mrcc.h</file>
-      <file>$PROJ_DIR$\Debug\Exe\cantest.out</file>
       <file>$PROJ_DIR$\Debug\Obj\cantest.pbd</file>
-      <file>$PROJ_DIR$\str75x_lib\inc\75x_lib.h</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_gpio.o</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_mrcc.o</file>
       <file>$PROJ_DIR$\Debug\Obj\75x_lib.o</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_gpio.pbi</file>
+      <file>$PROJ_DIR$\linker\STR75x_FLASH.icf</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_can.pbi</file>
+      <file>$PROJ_DIR$\str75x_lib\src\75x_can.c</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_can.o</file>
       <file>$PROJ_DIR$\Debug\Obj\75x_lib.pbi</file>
-      <file>$PROJ_DIR$\Startup\75x_init.s</file>
-      <file>$PROJ_DIR$\75x_it.c</file>
-      <file>$PROJ_DIR$\Startup\75x_vect.s</file>
-      <file>$PROJ_DIR$\75x_conf.h</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_eic.pbi</file>
+      <file>$PROJ_DIR$\str75x_lib\src\75x_gpio.c</file>
+      <file>$PROJ_DIR$\Debug\Exe\cantest.out</file>
+      <file>$PROJ_DIR$\str75x_lib\inc\75x_eic.h</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_eic.o</file>
+      <file>$PROJ_DIR$\str75x_lib\inc\75x_lib.h</file>
+      <file>$PROJ_DIR$\str75x_lib\inc\75x_gpio.h</file>
+      <file>$PROJ_DIR$\str75x_lib\inc\75x_map.h</file>
+      <file>$PROJ_DIR$\str75x_lib\inc\75x_mrcc.h</file>
+      <file>$TOOLKIT_DIR$\lib\rt4t_al.a</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_it.o</file>
+      <file>$PROJ_DIR$\str75x_lib\src\75x_eic.c</file>
       <file>$PROJ_DIR$\main.c</file>
-      <file>$PROJ_DIR$\Debug\Obj\75x_init.o</file>
-      <file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
-      <file>$PROJ_DIR$\str75x_lib\inc\75x_can.h</file>
-      <file>$PROJ_DIR$\str75x_lib\src\75x_can.c</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_vect.o</file>
+      <file>$PROJ_DIR$\75x_conf.h</file>
+      <file>$PROJ_DIR$\Startup\75x_vect.s</file>
       <file>$PROJ_DIR$\str75x_lib\src\75x_lib.c</file>
+      <file>$PROJ_DIR$\Startup\75x_init.s</file>
       <file>$PROJ_DIR$\str75x_lib\src\75x_mrcc.c</file>
-      <file>$PROJ_DIR$\..\..\..\common\vscp_serial.h</file>
+      <file>$PROJ_DIR$\75x_it.c</file>
       <file>$PROJ_DIR$\..\..\..\common\vscp_serial.c</file>
-      <file>$PROJ_DIR$\..\..\..\common\vscp_class.h</file>
-      <file>$PROJ_DIR$\..\..\..\common\crc.c</file>
-      <file>$PROJ_DIR$\..\..\..\pic\can4vscp_232\project\main.c</file>
-      <file>$PROJ_DIR$\..\..\..\pic\can4vscp_232\project\serint.c</file>
-      <file>$PROJ_DIR$\..\..\..\common\crc.h</file>
+      <file>$PROJ_DIR$\Debug\Obj\75x_gpio.o</file>
     </outputs>
     <file>
       <name>[ROOT_NODE]</name>
       <outputs>
         <tool>
           <name>ILINK</name>
-          <file> 23</file>
+          <file> 21</file>
         </tool>
       </outputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\str75x_lib\src\75x_gpio.c</name>
+      <name>$PROJ_DIR$\Debug\Obj\cantest.pbd</name>
+      <inputs>
+        <tool>
+          <name>BILINK</name>
+          <file> 15 19 13 9 18 6 4</file>
+        </tool>
+      </inputs>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\str75x_lib\src\75x_can.c</name>
       <outputs>
         <tool>
           <name>BICOMP</name>
-          <file> 7</file>
+          <file> 15</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 26</file>
+          <file> 17</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>BICOMP</name>
-          <file> 0 6 32 5 22</file>
+          <file> 0 26 33 5 27</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 0 6 32 5 22</file>
+          <file> 0 26 33 5 27</file>
         </tool>
       </inputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\str75x_lib\src\75x_eic.c</name>
+      <name>$PROJ_DIR$\str75x_lib\src\75x_gpio.c</name>
       <outputs>
         <tool>
           <name>BICOMP</name>
-          <file> 12</file>
+          <file> 13</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 4</file>
+          <file> 40</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>BICOMP</name>
-          <file> 17 6 32 5</file>
+          <file> 25 26 33 5 27</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 17 6 32 5</file>
+          <file> 25 26 33 5 27</file>
         </tool>
       </inputs>
     </file>
@@ -114,54 +117,59 @@
       <outputs>
         <tool>
           <name>OBJCOPY</name>
-          <file> 16</file>
+          <file> 3</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>ILINK</name>
-          <file> 3 18 4 26 34 19 27 13 9 20 15 14 2</file>
+          <file> 14 17 23 40 8 29 12 11 32 2 7 28 1</file>
         </tool>
       </inputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\Debug\Obj\cantest.pbd</name>
-      <inputs>
+      <name>$PROJ_DIR$\str75x_lib\src\75x_eic.c</name>
+      <outputs>
         <tool>
-          <name>BILINK</name>
-          <file> 1 12 7 21 28 8 35</file>
+          <name>BICOMP</name>
+          <file> 19</file>
         </tool>
-      </inputs>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\Startup\75x_init.s</name>
-      <outputs>
         <tool>
-          <name>AARM</name>
-          <file> 34</file>
+          <name>ICCARM</name>
+          <file> 23</file>
         </tool>
       </outputs>
+      <inputs>
+        <tool>
+          <name>BICOMP</name>
+          <file> 22 26 33 5</file>
+        </tool>
+        <tool>
+          <name>ICCARM</name>
+          <file> 22 26 33 5</file>
+        </tool>
+      </inputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\75x_it.c</name>
+      <name>$PROJ_DIR$\main.c</name>
       <outputs>
         <tool>
           <name>BICOMP</name>
-          <file> 21</file>
+          <file> 4</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 19</file>
+          <file> 2</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>BICOMP</name>
-          <file> 25 6 32 5 22 36 0 17</file>
+          <file> 24 26 33 5 27 0 25 22</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 25 6 32 5 22 36 0 17</file>
+          <file> 24 26 33 5 27 0 25 22</file>
         </tool>
       </inputs>
     </file>
@@ -170,99 +178,85 @@
       <outputs>
         <tool>
           <name>AARM</name>
-          <file> 9</file>
+          <file> 32</file>
         </tool>
       </outputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\main.c</name>
+      <name>$PROJ_DIR$\str75x_lib\src\75x_lib.c</name>
       <outputs>
         <tool>
           <name>BICOMP</name>
-          <file> 35</file>
+          <file> 18</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 20</file>
+          <file> 12</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>BICOMP</name>
-          <file> 25 6 32 5 22 36 0 17</file>
+          <file> 24 26 33 5 27 0 25 22</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 25 6 32 5 22 36 0 17</file>
+          <file> 24 26 33 5 27 0 25 22</file>
         </tool>
       </inputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\str75x_lib\src\75x_can.c</name>
+      <name>$PROJ_DIR$\Startup\75x_init.s</name>
       <outputs>
         <tool>
-          <name>BICOMP</name>
-          <file> 1</file>
+          <name>AARM</name>
+          <file> 8</file>
         </tool>
-        <tool>
-          <name>ICCARM</name>
-          <file> 18</file>
-        </tool>
       </outputs>
-      <inputs>
-        <tool>
-          <name>BICOMP</name>
-          <file> 36 6 32 5 22</file>
-        </tool>
-        <tool>
-          <name>ICCARM</name>
-          <file> 36 6 32 5 22</file>
-        </tool>
-      </inputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\str75x_lib\src\75x_lib.c</name>
+      <name>$PROJ_DIR$\str75x_lib\src\75x_mrcc.c</name>
       <outputs>
         <tool>
           <name>BICOMP</name>
-          <file> 28</file>
+          <file> 6</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 27</file>
+          <file> 11</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>BICOMP</name>
-          <file> 25 6 32 5 22 36 0 17</file>
+          <file> 27 26 33 5</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 25 6 32 5 22 36 0 17</file>
+          <file> 27 26 33 5</file>
         </tool>
       </inputs>
     </file>
     <file>
-      <name>$PROJ_DIR$\str75x_lib\src\75x_mrcc.c</name>
+      <name>$PROJ_DIR$\75x_it.c</name>
       <outputs>
         <tool>
           <name>BICOMP</name>
-          <file> 8</file>
+          <file> 9</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 13</file>
+          <file> 29</file>
         </tool>
       </outputs>
       <inputs>
         <tool>
           <name>BICOMP</name>
-          <file> 22 6 32 5</file>
+          <file> 24 26 33 5 27 0 25 22</file>
         </tool>
         <tool>
           <name>ICCARM</name>
-          <file> 22 6 32 5</file>
+          <file> 24 26 33 5 27 0 25 22</file>
         </tool>
       </inputs>
     </file>

Modified: trunk/firmware/arm/str/cantest_str75x_iar/main.c
===================================================================
--- trunk/firmware/arm/str/cantest_str75x_iar/main.c	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/cantest_str75x_iar/main.c	2008-03-01 13:09:07 UTC (rev 866)
@@ -113,7 +113,7 @@
     MRCC_PCLKConfig( MRCC_CKTIM_Div2 );
   
     // Set CKSYS to 64 MHz
-    MRCC_CKSYSConfig( MRCC_CKSYS_OSC4MPLL, MRCC_PLL_Mul_16 );
+    MRCC_CKSYSConfig( MRCC_CKSYS_OSC4MPLL, MRCC_PLL_Mul_16 ); // 64 MHz
 
   }
   

Modified: trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.dbgdt
===================================================================
--- trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.dbgdt	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.dbgdt	2008-03-01 13:09:07 UTC (rev 866)
@@ -27,7 +27,7 @@
       
       
       
-    <Wnd0>
+    <Wnd3>
         <Tabs>
           <Tab>
             <Identity>TabID-14394-3889</Identity>
@@ -43,7 +43,7 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
+      <SelectedTab>0</SelectedTab></Wnd3><Wnd4>
         <Tabs>
           <Tab>
             <Identity>TabID-25142-3892</Identity>
@@ -55,7 +55,7 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd1><Wnd2>
+      <SelectedTab>0</SelectedTab></Wnd4><Wnd5>
         <Tabs>
           <Tab>
             <Identity>TabID-3123-3895</Identity>
@@ -65,20 +65,20 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd2></Windows>
+      <SelectedTab>0</SelectedTab></Wnd5></Windows>
     <Editor>
       
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>2173</SelStart><SelEnd>2173</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\main.c</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>1620</SelStart><SelEnd>1620</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\str75x_lib\src\75x_can.c</Filename><XPos>0</XPos><YPos>443</YPos><SelStart>21143</SelStart><SelEnd>21143</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\Startup\75x_init.s</Filename><XPos>0</XPos><YPos>91</YPos><SelStart>4272</SelStart><SelEnd>4272</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.h</Filename><XPos>0</XPos><YPos>139</YPos><SelStart>3033</SelStart><SelEnd>3033</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.c</Filename><XPos>0</XPos><YPos>302</YPos><SelStart>9128</SelStart><SelEnd>9128</SelEnd></Tab><ActiveTab>5</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\main.c</Filename><XPos>0</XPos><YPos>449</YPos><SelStart>10491</SelStart><SelEnd>10727</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\serint.c</Filename><XPos>0</XPos><YPos>252</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\main.c</Filename><XPos>0</XPos><YPos>287</YPos><SelStart>7812</SelStart><SelEnd>7812</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\main.c</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>1620</SelStart><SelEnd>1620</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\str75x_lib\src\75x_can.c</Filename><XPos>0</XPos><YPos>443</YPos><SelStart>21143</SelStart><SelEnd>21143</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\Startup\75x_init.s</Filename><XPos>0</XPos><YPos>91</YPos><SelStart>4272</SelStart><SelEnd>4272</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.h</Filename><XPos>0</XPos><YPos>139</YPos><SelStart>3033</SelStart><SelEnd>3033</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.c</Filename><XPos>0</XPos><YPos>110</YPos><SelStart>8871</SelStart><SelEnd>8871</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\main.c</Filename><XPos>0</XPos><YPos>449</YPos><SelStart>10491</SelStart><SelEnd>10727</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\serint.c</Filename><XPos>0</XPos><YPos>252</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
     <Positions>
       
       
       
       
       
-    <Top><Row0><Sizes><Toolbar-01353ab8><key>iaridepm.enu1</key></Toolbar-01353ab8></Sizes></Row0><Row1><Sizes><Toolbar-0761bb20><key>debuggergui.enu1</key></Toolbar-0761bb20></Sizes></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>498</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>195313</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>726744</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>498</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>195313</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>726744</sizeVertCY></Rect></Wnd2></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>122</Bottom><Right>1026</Right><x>-2</x><y>-2</y><xscreen>1028</xscreen><yscreen>124</yscreen><sizeHorzCX>1003906</sizeHorzCX><sizeHorzCY>180233</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>290698</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-01353cd8><key>iaridepm.enu1</key></Toolbar-01353cd8></Sizes></Row0><Row1><Sizes><Toolbar-09daed18><key>debuggergui.enu1</key></Toolbar-09daed18></Sizes></Row1></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>498</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>195313</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>726744</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>498</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>195313</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>726744</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>122</Bottom><Right>1026</Right><x>-2</x><y>-2</y><xscreen>1028</xscreen><yscreen>124</yscreen><sizeHorzCX>1003906</sizeHorzCX><sizeHorzCY>180233</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>290698</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Project>
 

Modified: trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.wsdt
===================================================================
--- trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.wsdt	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/cantest_str75x_iar/settings/cantest.wsdt	2008-03-01 13:09:07 UTC (rev 866)
@@ -25,7 +25,7 @@
     <Windows>
       
       
-    <Wnd0>
+    <Wnd2>
         <Tabs>
           <Tab>
             <Identity>TabID-32711-27921</Identity>
@@ -37,7 +37,7 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>
         <Tabs>
           <Tab>
             <Identity>TabID-18303-27987</Identity>
@@ -47,20 +47,20 @@
           </Tab>
         <Tab><Identity>TabID-7248-23799</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd1></Windows>
+      <SelectedTab>0</SelectedTab></Wnd3></Windows>
     <Editor>
       
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>2173</SelStart><SelEnd>2173</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\main.c</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>1620</SelStart><SelEnd>1620</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\str75x_lib\src\75x_can.c</Filename><XPos>0</XPos><YPos>443</YPos><SelStart>21143</SelStart><SelEnd>21143</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\Startup\75x_init.s</Filename><XPos>0</XPos><YPos>91</YPos><SelStart>4272</SelStart><SelEnd>4272</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.h</Filename><XPos>0</XPos><YPos>139</YPos><SelStart>3033</SelStart><SelEnd>3033</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.c</Filename><XPos>0</XPos><YPos>110</YPos><SelStart>8871</SelStart><SelEnd>8871</SelEnd></Tab><ActiveTab>5</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\main.c</Filename><XPos>0</XPos><YPos>449</YPos><SelStart>10491</SelStart><SelEnd>10727</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\serint.c</Filename><XPos>0</XPos><YPos>252</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\main.c</Filename><XPos>0</XPos><YPos>287</YPos><SelStart>7812</SelStart><SelEnd>7812</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str73x_iar\main.c</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>1620</SelStart><SelEnd>1620</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\str75x_lib\src\75x_can.c</Filename><XPos>0</XPos><YPos>443</YPos><SelStart>21143</SelStart><SelEnd>21143</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\arm\str\cantest_str75x_iar\Startup\75x_init.s</Filename><XPos>0</XPos><YPos>91</YPos><SelStart>4272</SelStart><SelEnd>4272</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.h</Filename><XPos>0</XPos><YPos>139</YPos><SelStart>3033</SelStart><SelEnd>3033</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\common\vscp_serial.c</Filename><XPos>0</XPos><YPos>110</YPos><SelStart>8871</SelStart><SelEnd>8871</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\main.c</Filename><XPos>0</XPos><YPos>449</YPos><SelStart>10491</SelStart><SelEnd>10727</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>D:\development\vscp\firmware\pic\can4vscp_232\project\serint.c</Filename><XPos>0</XPos><YPos>252</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
     <Positions>
       
       
       
       
       
-    <Top><Row0><Sizes><Toolbar-01353ab8><key>iaridepm.enu1</key></Toolbar-01353ab8></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>446</Bottom><Right>282</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>195313</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>277344</sizeVertCX><sizeVertCY>651163</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1026</Right><x>-2</x><y>-2</y><xscreen>1028</xscreen><yscreen>200</yscreen><sizeHorzCX>1003906</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>290698</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-01353cd8><key>iaridepm.enu1</key></Toolbar-01353cd8></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>446</Bottom><Right>282</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>195313</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>277344</sizeVertCX><sizeVertCY>651163</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1026</Right><x>-2</x><y>-2</y><xscreen>1028</xscreen><yscreen>200</yscreen><sizeHorzCX>1003906</sizeHorzCX><sizeHorzCY>290698</sizeHorzCY><sizeVertCX>195313</sizeVertCX><sizeVertCY>290698</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Workspace>
 

Modified: trunk/firmware/arm/str/cantest_str75x_iar/str75x_lib/src/75x_can.c
===================================================================
--- trunk/firmware/arm/str/cantest_str75x_iar/str75x_lib/src/75x_can.c	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/cantest_str75x_iar/str75x_lib/src/75x_can.c	2008-03-01 13:09:07 UTC (rev 866)
@@ -515,12 +515,16 @@
 *******************************************************************************/
 ErrorStatus CAN_WaitEndOfTx(void)
 {
+  // Changed by AKHE
+  while ( 0 == ( CAN->SR & CAN_SR_TXOK ) );
+  CAN->SR &= ~CAN_SR_TXOK;
+/*        
   if ((CAN->SR & CAN_SR_TXOK) == 0)
   {
     return ERROR;
   }
   CAN->SR &= ~CAN_SR_TXOK;
-  
+*/  
   return SUCCESS;
 }
 

Modified: trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c
===================================================================
--- trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/common/str73x_lib/src/73x_can.c	2008-03-01 13:09:07 UTC (rev 866)
@@ -340,11 +340,11 @@
 /*********************************************************************************/
 void CAN_ReleaseMessage(CAN_TypeDef *CANx, u32 msgobj)
 {
-	u32 i;
+    u32 i;
     while ((i = CAN_GetFreeIF(CANx)) == 2);
 
-	CANx->sMsgObj[i].CMR = CAN_CMR_CLRINTPND | CAN_CMR_TXRQSTNEWDAT;
-	CANx->sMsgObj[i].CRR = 1 + msgobj;
+    CANx->sMsgObj[i].CMR = CAN_CMR_CLRINTPND | CAN_CMR_TXRQSTNEWDAT;
+    CANx->sMsgObj[i].CRR = 1 + msgobj;
 }
 
 /**********************************************************************************/
@@ -387,8 +387,8 @@
   	/* extended ID      AKHE Fixed bug */    
 	//CANx->sMsgObj[0].A1R = EXT_FIXED_ID_ARB_L(pCanMsg->Id);
 	//CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | EXT_FIXED_ID_ARB_H(pCanMsg->Id);
-		CANx->sMsgObj[0].A1R = pCanMsg->Id & 0xffff;
-		CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | ( ( pCanMsg->Id >> 16 ) & 0xffff);
+	CANx->sMsgObj[0].A1R = pCanMsg->Id & 0xffff;
+	CANx->sMsgObj[0].A2R = (CANx->sMsgObj[0].A2R & 0xE000) | ( ( pCanMsg->Id >> 16 ) & 0xffff);
   }
 
   CANx->sMsgObj[0].MCR = (CANx->sMsgObj[0].MCR & 0xFEF0) | CAN_MCR_NEWDAT | CAN_MCR_TXRQST | pCanMsg->Dlc;

Modified: trunk/firmware/arm/str/common/str75x_lib/include/75x_can.h
===================================================================
--- trunk/firmware/arm/str/common/str75x_lib/include/75x_can.h	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/common/str75x_lib/include/75x_can.h	2008-03-01 13:09:07 UTC (rev 866)
@@ -147,6 +147,7 @@
 ErrorStatus CAN_SendMessage(u32 msgobj, canmsg* pCanMsg);
 ErrorStatus CAN_ReceiveMessage(u32 msgobj, bool release, canmsg* pCanMsg);
 ErrorStatus CAN_WaitEndOfTx(void);
+ErrorStatus CAN_CheckEndOfTx( void ); // AKHE
 ErrorStatus CAN_BasicSendMessage(canmsg* pCanMsg);
 ErrorStatus CAN_BasicReceiveMessage(canmsg* pCanMsg);
 void CAN_EnterTestMode(u8 TestMask);

Modified: trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c
===================================================================
--- trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/common/str75x_lib/src/75x_can.c	2008-03-01 13:09:07 UTC (rev 866)
@@ -518,11 +518,35 @@
 *******************************************************************************/
 ErrorStatus CAN_WaitEndOfTx(void)
 {
+  // Changed by AKHE
+  while ( 0 == ( CAN->SR & CAN_SR_TXOK ) );
+  CAN->SR &= ~CAN_SR_TXOK;
+/* 
   if ((CAN->SR & CAN_SR_TXOK) == 0)
   {
     return ERROR;
   }
   CAN->SR &= ~CAN_SR_TXOK;
+*/  
+  return SUCCESS;
+}
+
+/*******************************************************************************
+* Function Name  : CAN_CheckEndOfTx                                           
+* Description    : Check if the current transmission is finished.               
+* Input          : None                                                      
+* Output         : None                                                      
+* Return         : An ErrorStatus enumuration value:
+*                         - SUCCESS: Transmission ended
+*                         - ERROR: Transmission did not occur yet
+*******************************************************************************/
+ErrorStatus CAN_CheckEndOfTx( void )
+{
+  if ( 0 == ( CAN->SR & CAN_SR_TXOK ) )
+  {
+    return ERROR;
+  }
+  CAN->SR &= ~CAN_SR_TXOK;
   
   return SUCCESS;
 }

Modified: trunk/firmware/arm/str/common/usblib/library/src/usb_core.c
===================================================================
--- trunk/firmware/arm/str/common/usblib/library/src/usb_core.c	2008-02-29 14:23:25 UTC (rev 865)
+++ trunk/firmware/arm/str/common/usblib/library/src/usb_core.c	2008-03-01 13:09:07 UTC (rev 866)
@@ -755,6 +755,7 @@
 	
 	if(ControlState == OUT_DATA || ControlState == LAST_OUT_DATA)
 		DataStageOut();
+		ControlState = pInformation->ControlState;	// AKHE
 
 	else if (ControlState == WAIT_STATUS_OUT) {
 		(*pProperty->Process_Status_OUT)();	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




can-svn Mailing List for CAN bus network drivers and utilities (Page 2)

can-svn — svn Checkins