# HG changeset patch
# User jlarmour
# Date 1164306121 0
# Node ID daa709b6d81945252a7e297ac556057af1964172
# Parent  a22de7f91661aac3d98940a6f7cc8b2b77124856
        * src/ds17887.cxx (defines): Added check for some defines being done
          in INL file.

diff --git a/packages/devs/wallclock/dallas/ds12887/current/ChangeLog b/packages/devs/wallclock/dallas/ds12887/current/ChangeLog
--- a/packages/devs/wallclock/dallas/ds12887/current/ChangeLog
+++ b/packages/devs/wallclock/dallas/ds12887/current/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-23  David Fernandez  <dfernandez@cct.co.uk>
+
+	* src/ds17887.cxx (defines): Added check for some defines being done
+	  in INL file.
+
 2001-07-27  Jesper Skov  <jskov@redhat.com>
 
 	* src/ds12887.cxx (init_ds_hwclock): Use BCD mode since Century is
diff --git a/packages/devs/wallclock/dallas/ds12887/current/src/ds12887.cxx b/packages/devs/wallclock/dallas/ds12887/current/src/ds12887.cxx
--- a/packages/devs/wallclock/dallas/ds12887/current/src/ds12887.cxx
+++ b/packages/devs/wallclock/dallas/ds12887/current/src/ds12887.cxx
@@ -70,6 +70,7 @@
 # define DS_WRITE_UINT8(x,y) HAL_WRITE_UINT8(x,y)
 #endif
 
+#if !defined(DS_READ) && !defined(DS_WRITE) //  Allow for INL to define this
 #ifdef DS_LINEAR
 # ifndef DS_STEP
 #  define DS_STEP 0
@@ -77,9 +78,11 @@
 # ifndef DS_BASE
 #  error "Need to know base of DS12887 part"
 # endif
-# define DS_READ(offset, data) DS_READ_UINT8(DS_BASE + ((offset) << DS_STEP), (data))
-# define DS_WRITE(offset, data) DS_WRITE_UINT8(DS_BASE + ((offset) << DS_STEP), (data))
-#else
+#define DS_READ( offset, data)  \
+    DS_READ_UINT8( DS_BASE + ((offset) << DS_STEP), (data))
+#define DS_WRITE(offset, data)  \
+    DS_WRITE_UINT8(DS_BASE + ((offset) << DS_STEP), (data))
+#else   //  !DS_LINEAR
 # if !defined(DS_ADDR) || !defined(DS_DATA)
 #  error "Need to know addr/data locations of DS12887 part"
 # endif
@@ -94,6 +97,7 @@
   DS_WRITE_UINT8(DS_DATA, (data));             \
   CYG_MACRO_END
 #endif
+#endif  //  ! DS_READ && ! DS_WRITE
 
 // Registers
 #define DS_SECONDS         0x00