using uint32_t as return type for get_fattime()

ErichStyger · Apr 28, 2014 · d604c39 · d604c39
1 parent a88ecb7
commit d604c39
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/Beans/FAT_FileSystem/FAT_FileSystem.bean b/Beans/FAT_FileSystem/FAT_FileSystem.bean
@@ -4,7 +4,7 @@
     <Name>FAT_FileSystem</Name>
     <Description>FAT file system module</Description>
     <Author>ChaN, adopted by Erich Styger for Processor Expert</Author>
-    <Version>01.150</Version>
+    <Version>01.152</Version>
     <Icon>FAT_FileSystem</Icon>
     <TypesFiles>PE,FAT_FileSystem\FAT_FileSystem</TypesFiles>
     <FileVersion>6</FileVersion>
@@ -17,7 +17,7 @@
     <BW_AutoSaveDriver>yes</BW_AutoSaveDriver>
     <BW_DetailedHelp>yes</BW_DetailedHelp>
     <BW_NeedTps>yes</BW_NeedTps>
-    <BW_NeedUst>4</BW_NeedUst>
+    <BW_NeedUst>6</BW_NeedUst>
     <BW_NeedCns>0</BW_NeedCns>
     <BeanStatus>PROPOSAL</BeanStatus>
     <Copyright>License   :  Open Source (LGPL)\nCopyright : (c) Copyright Erich Styger, 2014, all rights reserved.\nFatFS: Copyright (C) 2014, ChaN, all right reserved. (see copyright notice and license in the FatFS implementation).\n\nThis an open source software implementing an interface to the ChaN FatFS using Processor Expert.\nThis is a free software and is opened for education,  research and commercial developments under license policy of following terms:\n* This is a free software and there is NO WARRANTY.\n* No restriction on use. You can use, modify and redistribute it for personal, non-profit or commercial product UNDER YOUR RESPONSIBILITY.\n* Redistributions of source code must retain the above copyright notice.</Copyright>
@@ -2036,12 +2036,12 @@ The truncate() function truncates the file size to the current file read/write p
         <PublicMethod>true</PublicMethod>
         <IsAssembler>false</IsAssembler>
         <InDefinition>true</InDefinition>
-        <ReturnType>32bit unsigned</ReturnType>
+        <ReturnType>uint32_t</ReturnType>
         <RetHint>Error code</RetHint>
         <ParamCount>0</ParamCount>
         <Scope>PRIVATE</Scope>
         <Declarations>
-          <ANSIC>dword #M#_#C#(void)</ANSIC>
+          <ANSIC>uint32_t #M#_#C#(void)</ANSIC>
         </Declarations>
       </TMthdItem>
     </Method>

diff --git a/Beans/FAT_FileSystem/FAT_FileSystem.uis b/Beans/FAT_FileSystem/FAT_FileSystem.uis
@@ -1,6 +1,6 @@
 
 [USED_FACES]
-BeanVersion=01.150
+BeanVersion=01.152
 
 InterfacesCount=5
 

diff --git a/Beans/FAT_FileSystem/FAT_FileSystem.ust b/Beans/FAT_FileSystem/FAT_FileSystem.ust
@@ -49,4 +49,26 @@
     <Type/>
     <HWTestType/>
   </Type>
+  <Type>
+    <UsrType>TRetypeType</UsrType>
+    <Name>uint32_t</Name>
+    <Hint/>
+    <Generate>no</Generate>
+    <Unique>no</Unique>
+    <GenerateHelp>no</GenerateHelp>
+    <PreparedHint>  typedef dword uint32_t ;\n
+</PreparedHint>
+    <Type>32bit unsigned</Type>
+  </Type>
+  <Type>
+    <UsrType>TRetypeType</UsrType>
+    <Name>int32_t</Name>
+    <Hint/>
+    <Generate>no</Generate>
+    <Unique>no</Unique>
+    <GenerateHelp>no</GenerateHelp>
+    <PreparedHint>  typedef long int32_t ;\n
+</PreparedHint>
+    <Type>32bit signed</Type>
+  </Type>
 </UserTypes>
diff --git a/Beans/FAT_FileSystem/FAT_FileSystemMethods.html b/Beans/FAT_FileSystem/FAT_FileSystemMethods.html
@@ -668,9 +668,9 @@
  - Returns the current time
 <ul>
 <!---VER_SPEC #ANSIC#  DON'T CHANGE THIS LINE-->
-<br /><i>ANSIC prototype:</i> dword get_fattime(void)<br />
+<br /><i>ANSIC prototype:</i> uint32_t get_fattime(void)<br />
 <!---VER_SPEC_END  DON'T CHANGE THIS LINE-->
-<li><i>Return value:dword</i> - Error code
+<li><i>Return value:uint32_t</i> - Error code
 </li>
 </ul><br />
 </li>

diff --git a/Drivers/sw/FAT_FileSystem.drv b/Drivers/sw/FAT_FileSystem.drv
@@ -588,7 +588,7 @@ void %'ModuleName'%.%Deinit(void);
 %-************************************************************************************************************
 %-BW_METHOD_BEGIN get_fattime
 %ifdef get_fattime
-dword %'ModuleName'%.%get_fattime(void);
+uint32_t %'ModuleName'%.%get_fattime(void);
 %define! RetVal
 %include Common\FAT_FileSystemget_fattime.Inc
 
@@ -2065,7 +2065,7 @@ void %'ModuleName'%.%Deinit(void)
 #if !_FS_READONLY
 %define! RetVal
 %include Common\FAT_FileSystemget_fattime.Inc
-dword %'ModuleName'%.%get_fattime(void)
+uint32_t %'ModuleName'%.%get_fattime(void)
 {
   /* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20-16: Day(1-31) */
   /* 15-11: Hour(0-23), 10-5: Minute(0-59), 4-0: Second(0-29 *2) */