Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Projects / TempDataLogger / Lib / DS1307.h

diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h
index 6269bb2..9d93f2c 100644 (file)
--- a/Projects/TempDataLogger/Lib/DS1307.h
+++ b/Projects/TempDataLogger/Lib/DS1307.h
@@ -30,9 +30,9 @@
                        {
                                struct
                                {
-                                       unsigned int Sec            : 4;
-                                       unsigned int TenSec         : 3;
-                                       unsigned int CH             : 1;
+                                       unsigned Sec            : 4;
+                                       unsigned TenSec         : 3;
+                                       unsigned CH             : 1;
                                } Fields;
 
                                uint8_t IntVal;
@@ -42,9 +42,9 @@
                        {
                                struct
                                {
-                                       unsigned int Min            : 4;
-                                       unsigned int TenMin         : 3;
-                                       unsigned int Reserved       : 1;
+                                       unsigned Min            : 4;
+                                       unsigned TenMin         : 3;
+                                       unsigned Reserved       : 1;
                                } Fields;
 
                                uint8_t IntVal;
@@ -54,10 +54,10 @@
                        {
                                struct
                                {
-                                       unsigned int Hour            : 4;
-                                       unsigned int TenHour         : 2;
-                                       unsigned int TwelveHourMode  : 1;
-                                       unsigned int Reserved        : 1;
+                                       unsigned Hour            : 4;
+                                       unsigned TenHour         : 2;
+                                       unsigned TwelveHourMode  : 1;
+                                       unsigned Reserved        : 1;
                                } Fields;
 
                                uint8_t IntVal;
@@ -67,8 +67,8 @@
                        {
                                struct
                                {
-                                       unsigned int DayOfWeek       : 3;
-                                       unsigned int Reserved        : 5;
+                                       unsigned DayOfWeek       : 3;
+                                       unsigned Reserved        : 5;
                                } Fields;
 
                                uint8_t IntVal;
@@ -78,9 +78,9 @@
                        {
                                struct
                                {
-                                       unsigned int Day             : 4;
-                                       unsigned int TenDay          : 2;
-                                       unsigned int Reserved        : 2;
+                                       unsigned Day             : 4;
+                                       unsigned TenDay          : 2;
+                                       unsigned Reserved        : 2;
                                } Fields;
 
                                uint8_t IntVal;
@@ -90,9 +90,9 @@
                        {
                                struct
                                {
-                                       unsigned int Month           : 4;
-                                       unsigned int TenMonth        : 1;
-                                       unsigned int Reserved        : 3;
+                                       unsigned Month           : 4;
+                                       unsigned TenMonth        : 1;
+                                       unsigned Reserved        : 3;
                                } Fields;
 
                                uint8_t IntVal;
@@ -102,8 +102,8 @@
                        {
                                struct
                                {
-                                       unsigned int Year            : 4;
-                                       unsigned int TenYear         : 4;
+                                       unsigned Year            : 4;
+                                       unsigned TenYear         : 4;
                                } Fields;
 
                                uint8_t IntVal;
@@ -111,12 +111,11 @@
                } DS1307_DateTimeRegs_t;
 
        /* Macros: */
-               #define DS1307_ADDRESS_READ   (0xD0 | TWI_ADDRESS_READ)
-               #define DS1307_ADDRESS_WRITE  (0xD0 | TWI_ADDRESS_WRITE)
+               #define DS1307_ADDRESS       0xD0
 
        /* Function Prototypes: */
-               void DS1307_SetTimeDate(const TimeDate_t* NewTimeDate);
-               void DS1307_GetTimeDate(TimeDate_t* const TimeDate);
+               bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate);
+               bool DS1307_GetTimeDate(TimeDate_t* const TimeDate);
 
 #endif