diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-13 19:14:38 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-13 19:14:38 +0000 |
| commit | 7776aa4e2e7430da6fab1712816b887d21032dd9 (patch) | |
| tree | 935e14ff32b504be415faa5f7e61aa6489797352 /Projects/TempDataLogger/Lib/FATFs/diskio.c | |
| parent | 187ccb2e15bb4ad0e277da56b04fc2ffb3865d08 (diff) | |
| download | lufa-7776aa4e2e7430da6fab1712816b887d21032dd9.tar.gz lufa-7776aa4e2e7430da6fab1712816b887d21032dd9.tar.bz2 lufa-7776aa4e2e7430da6fab1712816b887d21032dd9.zip | |
Changed TempDataLogger project's DS1307 driver to simplify the function interface and prevent a possible race condition.
Diffstat (limited to 'Projects/TempDataLogger/Lib/FATFs/diskio.c')
| -rw-r--r-- | Projects/TempDataLogger/Lib/FATFs/diskio.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Projects/TempDataLogger/Lib/FATFs/diskio.c b/Projects/TempDataLogger/Lib/FATFs/diskio.c index c18151284..400687734 100644 --- a/Projects/TempDataLogger/Lib/FATFs/diskio.c +++ b/Projects/TempDataLogger/Lib/FATFs/diskio.c @@ -83,18 +83,16 @@ DRESULT disk_ioctl ( DWORD get_fattime (void) { - uint8_t Day, Month, Year; - uint8_t Hour, Minute, Second; + TimeDate_t CurrTimeDate; - DS1307_GetDate(&Day, &Month, &Year); - DS1307_GetTime(&Hour, &Minute, &Second); + DS1307_GetTimeDate(&CurrTimeDate); - return ((DWORD)(20 + Year) << 25) | - ((DWORD)Month << 21) | - ((DWORD)Day << 16) | - ((DWORD)Hour << 11) | - ((DWORD)Minute << 5) | - (((DWORD)Second >> 1) << 0); + return ((DWORD)(20 + CurrTimeDate.Year) << 25) | + ((DWORD)CurrTimeDate.Month << 21) | + ((DWORD)CurrTimeDate.Day << 16) | + ((DWORD)CurrTimeDate.Hour << 11) | + ((DWORD)CurrTimeDate.Minute << 5) | + (((DWORD)CurrTimeDate.Second >> 1) << 0); } |