aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers/Flash_Memory
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2019-08-01 17:23:44 +0300
committerAvi Levkovich <avi@twine-s.com>2019-08-01 17:23:44 +0300
commit06c6cfec8af9c3b3f930da7fe4394ee885d24352 (patch)
tree2667eb76e8fb204db99608e91b49bf73d8b0ecd3 /Software/Embedded_SW/Embedded/Drivers/Flash_Memory
parent42471da0b2a19c964fc2c3df39cc2e8a6aaf5e2e (diff)
parent18c4c73f8b654dca09e1333d1f6a35e4cbdc9b17 (diff)
downloadTango-06c6cfec8af9c3b3f930da7fe4394ee885d24352.tar.gz
Tango-06c6cfec8af9c3b3f930da7fe4394ee885d24352.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/Flash_Memory')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c3
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c
index 4f644bc90..7707584c9 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/Control_File_System.c
@@ -91,6 +91,7 @@ static FATFS g_sFatFs;
//tFResultString;
//static int response ;
+extern Semaphore_Handle FFS_Sem;
char FlashReadstring [35];
char FlashReadstring1 [35];
@@ -130,6 +131,8 @@ FRESULT Init_Flash_File_System(bool Need_mkfs)
if(Need_mkfs == true)
iFResult = f_mkfs( 0, 0, 512 ); //Create File System on the Drive
+ Semaphore_post(FFS_Sem);
+
return iFResult;
}
diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c
index 79f232655..0eccc7601 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c
@@ -23,6 +23,7 @@
#include "driverlib/ssi.h"
#include "driverlib/gpio.h"
#include "inc/hw_memmap.h"
+#include <time.h>
//#include <ti/mw/fatfs/ff.h>
//#include <ti/mw/fatfs/ffcio.h>
@@ -198,8 +199,9 @@ void disk_timerproc (void)
DWORD get_fattime (void)
{
- return miliseconds / 1000;
-
+ //return miliseconds / 1000;
+ DWORD t = (DWORD)time(NULL);
+ return t;
}