[PATCH] Merge atii2c.c in atimach64i2c.c, part #2.

Move I2CBus functions.

5 files changed, 338 insertions, 403 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 512d889..af7f3e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ mach64_drv_ladir = @moduledir@/drivers
 mach64_drv_la_SOURCES = \
 	atividmem.c atiadjust.c \
 	atiaudio.c aticlock.c aticonfig.c aticonsole.c atidac.c \
-	atidecoder.c atidsp.c atii2c.c atilock.c atimach64.c atimach64accel.c \
+	atidecoder.c atidsp.c atilock.c atimach64.c atimach64accel.c \
 	atimach64cursor.c atimach64i2c.c atimach64io.c atimach64xv.c \
 	atimode.c atipreinit.c atiprint.c atirgb514.c atiscreen.c \
 	atituner.c atiutil.c ativalid.c atiload.c ati.c \
@@ -73,7 +73,6 @@ EXTRA_DIST = \
 	atidripriv.h \
 	atidsp.h \
 	ati.h \
-	atii2c.h \
 	atiio.h \
 	atiload.h \
 	atilock.h \
diff --git a/src/atii2c.c b/src/atii2c.c
deleted file mode 100644
index 13a9f37..0000000
--- a/src/atii2c.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atii2c.c,v 1.3 2003/11/10 18:41:20 tsi Exp $ */
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atii2c.h"
-#include "atistruct.h"
-
-#include "xf86.h"
-
-/* This is derived from GATOS code, with a liberal sprinkling of bug fixes */
-
-/*
- * Some local macros for use by the mid-level I2C functions.
- */
-
-#define ATII2CDelay                                            \
-    (*pI2CBus->I2CUDelay)(pI2CBus, pI2CBus->HoldTime)
-
-
-#define ATII2CSCLDirOff                                        \
-    if (pATII2C->SCLDir != 0)                                  \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur & ~pATII2C->SCLDir)
-
-#define ATII2CSCLDirOn                                         \
-    if (pATII2C->SCLDir != 0)                                  \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur | pATII2C->SCLDir)
-
-#define ATII2CSDADirOff                                        \
-    if (pATII2C->SDADir != 0)                                  \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur & ~pATII2C->SDADir)
-
-#define ATII2CSDADirOn                                         \
-    if (pATII2C->SDADir != 0)                                  \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur | pATII2C->SDADir)
-
-
-#define ATII2CSCLBitGet                                        \
-    ((*pATII2C->I2CGetBits)(pATI) & pATII2C->SCLGet)
-
-#define ATII2CSCLBitOff                                        \
-    do                                                         \
-    {                                                          \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur & ~pATII2C->SCLSet);               \
-        ATII2CDelay;                                           \
-    } while (0)
-
-#define ATII2CSCLBitOn                                         \
-    do                                                         \
-    {                                                          \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur | pATII2C->SCLSet);                \
-        do      /* Wait until all devices have released SCL */ \
-        {                                                      \
-            ATII2CDelay;                                       \
-        } while (ATII2CSCLBitGet == 0);                        \
-    } while (0)
-
-
-#define ATII2CSDABitGet                                        \
-    ((*pATII2C->I2CGetBits)(pATI) & pATII2C->SDAGet)
-
-#define ATII2CSDABitOff                                        \
-    do                                                         \
-    {                                                          \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur & ~pATII2C->SDASet);               \
-        ATII2CDelay;                                           \
-    } while (0)
-
-#define ATII2CSDABitOn                                         \
-    do                                                         \
-    {                                                          \
-        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
-            pATII2C->I2CCur | pATII2C->SDASet);                \
-        ATII2CDelay;                                           \
-    } while (0)
-
-#define ATII2CSDABitSet(_flag)                                 \
-    do                                                         \
-    {                                                          \
-        if (_flag)                                             \
-            ATII2CSDABitOn;                                    \
-        else                                                   \
-            ATII2CSDABitOff;                                   \
-    } while (0)
-
-
-/*
- * ATII2CStart --
- *
- * This function puts a start signal on the I2C bus.
- */
-static Bool
-ATII2CStart
-(
-    I2CBusPtr pI2CBus,
-    int       timeout
-)
-{
-    ATII2CPtr pATII2C = pI2CBus->DriverPrivate.ptr;
-    ATIPtr    pATI    = pATII2C->pATI;
-
-    (void)timeout;
-
-    /*
-     * Set I2C line directions to out-bound.  SCL will remain out-bound until
-     * next I2C Stop.
-     */
-    ATII2CSCLDirOn;
-    ATII2CSDADirOn;
-
-    /*
-     * Send Start bit.  This is a pull-down of the data line while the clock
-     * line is pulled up.
-     */
-    ATII2CSDABitOn;
-    ATII2CSCLBitOn;
-    ATII2CSDABitOff;
-    ATII2CSCLBitOff;
-
-    return TRUE;
-}
-
-/*
- * ATII2CAddress --
- *
- * This function puts an 8-bit address on the I2C bus.
- */
-static Bool
-ATII2CAddress
-(
-    I2CDevPtr    pI2CDev,
-    I2CSlaveAddr Address
-)
-{
-    I2CBusPtr pI2CBus = pI2CDev->pI2CBus;
-
-    /* Send low byte of device address */
-    if ((*pI2CBus->I2CPutByte)(pI2CDev, (I2CByte)Address))
-    {
-        /* Send top byte of address, if appropriate */
-        if (((Address & 0x00F8U) != 0x00F0U) &&
-            ((Address & 0x00FEU) != 0x0000U))
-            return TRUE;
-
-        if ((*pI2CBus->I2CPutByte)(pI2CDev, (I2CByte)(Address >> 8)))
-            return TRUE;
-    }
-
-    /* Kill I2C transaction on failure */
-    (*pI2CBus->I2CStop)(pI2CDev);
-    return FALSE;
-}
-
-/*
- * ATII2CStop --
- *
- * This function puts a stop signal on the I2C bus.
- */
-static void
-ATII2CStop
-(
-    I2CDevPtr pI2CDev
-)
-{
-    I2CBusPtr pI2CBus = pI2CDev->pI2CBus;
-    ATII2CPtr pATII2C = pI2CBus->DriverPrivate.ptr;
-    ATIPtr    pATI    = pATII2C->pATI;
-
-    ATII2CSDADirOn;             /* Set data line direction to out-bound */
-
-    /*
-     * Send Stop bit.  This is a pull-up of the data line while the clock line
-     * is pulled up.
-     */
-    ATII2CSDABitOff;
-    ATII2CSCLBitOn;
-    ATII2CSDABitOn;
-    ATII2CSCLBitOff;
-
-    /* Reset I2C line directions to in-bound */
-    ATII2CSCLDirOff;
-    ATII2CSDADirOff;
-}
-
-/*
- * ATII2CPutByte --
- *
- * This function puts an 8-bit value on the I2C bus, starting with its MSB.
- */
-static Bool
-ATII2CPutByte
-(
-    I2CDevPtr pI2CDev,
-    I2CByte   Data
-)
-{
-    I2CBusPtr pI2CBus = pI2CDev->pI2CBus;
-    ATII2CPtr pATII2C = pI2CBus->DriverPrivate.ptr;
-    ATIPtr    pATI    = pATII2C->pATI;
-    int       i;
-    Bool      Result;
-
-    ATII2CSDADirOn;             /* Set data line direction to out-bound */
-
-    /* Send data byte */
-    for (i = 0;  i < 8;  i++)
-    {
-        ATII2CSDABitSet(Data & 0x80U);
-        ATII2CSCLBitOn;
-        ATII2CSCLBitOff;
-
-        Data <<= 1;
-    }
-
-    ATII2CSDABitOn;             /* Release data line */
-
-    ATII2CSDADirOff;            /* Set data line direction to in-bound */
-
-    ATII2CSCLBitOn;             /* Start bit-read clock pulse */
-
-    /* Get [N]ACK bit */
-    if (ATII2CSDABitGet)
-        Result = FALSE;
-    else
-        Result = TRUE;
-
-    ATII2CSCLBitOff;            /* End clock pulse */
-
-    return Result;
-}
-
-/*
- * ATII2CGetByte --
- *
- * This function retrieves an 8-bit value from the I2C bus.
- */
-static Bool
-ATII2CGetByte
-(
-    I2CDevPtr pI2CDev,
-    I2CByte   *pData,
-    Bool      Last
-)
-{
-    I2CBusPtr     pI2CBus = pI2CDev->pI2CBus;
-    ATII2CPtr     pATII2C = pI2CBus->DriverPrivate.ptr;
-    ATIPtr        pATI    = pATII2C->pATI;
-    unsigned long Value   = 1;
-
-    do
-    {
-        ATII2CSCLBitOn;         /* Start bit-read clock pulse */
-
-        /* Accumulate bit into byte value */
-        Value <<= 1;
-        if (ATII2CSDABitGet)
-            Value++;
-
-        ATII2CSCLBitOff;        /* End clock pulse */
-    } while (Value <= (unsigned long)((I2CByte)(-1)));
-
-    *pData = (I2CByte)Value;
-
-    ATII2CSDADirOn;             /* Set data line direction to out-bound */
-
-    /* Send [N]ACK bit */
-    ATII2CSDABitSet(Last);
-    ATII2CSCLBitOn;
-    ATII2CSCLBitOff;
-
-    if (!Last)
-        ATII2CSDABitOn;         /* Release data line */
-
-    ATII2CSDADirOff;            /* Set data line direction to in-bound */
-
-    return TRUE;
-}
-
-/*
- * ATICreateI2CBusRec --
- *
- * This function is called to initialise an I2CBusRec.
- */
-I2CBusPtr
-ATICreateI2CBusRec
-(
-    int    iScreen,
-    ATIPtr pATI,
-    char   *BusName
-)
-{
-    I2CBusPtr pI2CBus;
-    ATII2CPtr pATII2C = xnfcalloc(1, SizeOf(ATII2CRec));
-
-    if (!(pI2CBus = xf86CreateI2CBusRec()))
-    {
-        xf86DrvMsg(iScreen, X_WARNING, "Unable to allocate I2C Bus record.\n");
-        xfree(pATII2C);
-        return NULL;
-    }
-
-    /* Fill in generic structure fields */
-    pI2CBus->BusName           = BusName;
-    pI2CBus->scrnIndex         = iScreen;
-
-    pI2CBus->I2CAddress        = ATII2CAddress;
-    pI2CBus->I2CStart          = ATII2CStart;
-    pI2CBus->I2CStop           = ATII2CStop;
-    pI2CBus->I2CPutByte        = ATII2CPutByte;
-    pI2CBus->I2CGetByte        = ATII2CGetByte;
-
-    pI2CBus->DriverPrivate.ptr = pATII2C;
-
-    pATII2C->pATI              = pATI;
-
-    if (xf86I2CBusInit(pI2CBus))
-        return pI2CBus;
-
-    xf86DrvMsg(iScreen, X_WARNING,
-        "I2C bus %s initialisation failure.\n", BusName);
-    xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
-    xfree(pATII2C);
-    return NULL;
-}
diff --git a/src/atii2c.h b/src/atii2c.h
deleted file mode 100644
index 49708c4..0000000
--- a/src/atii2c.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atii2c.h,v 1.1 2003/07/24 22:08:28 tsi Exp $ */
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATII2C_H___
-#define ___ATII2C_H___ 1
-
-#include "atipriv.h"
-
-#include "xf86str.h"
-
-#include "xf86i2c.h"
-
-typedef struct _ATII2CRec ATII2CRec, *ATII2CPtr;
-
-struct _ATII2CRec
-{
-    ATIPtr pATI;
-    void   (*I2CSetBits) (ATII2CPtr, ATIPtr, CARD32);
-    CARD32 (*I2CGetBits) (ATIPtr);
-    CARD32 SCLDir, SCLGet, SCLSet;
-    CARD32 SDADir, SDAGet, SDASet;
-    CARD32 I2CCur;
-};
-
-extern I2CBusPtr ATICreateI2CBusRec(int, ATIPtr, char *);
-
-#endif /* ___ATII2C_H___ */
diff --git a/src/atimach64i2c.c b/src/atimach64i2c.c
index fe372e0..85a1b1e 100644
--- a/src/atimach64i2c.c
+++ b/src/atimach64i2c.c
@@ -28,12 +28,334 @@
 #include <unistd.h>
 
 #include "atichip.h"
-#include "atii2c.h"
 #include "atiload.h"
 #include "atimach64i2c.h"
 #include "atimach64io.h"
 #include "atituner.h"
 
+/* This is derived from GATOS code, with a liberal sprinkling of bug fixes */
+
+/*
+ * Some local macros for use by the mid-level I2C functions.
+ */
+
+#define ATII2CDelay                                            \
+    (*pI2CBus->I2CUDelay)(pI2CBus, pI2CBus->HoldTime)
+
+
+#define ATII2CSCLDirOff                                        \
+    if (pATII2C->SCLDir != 0)                                  \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur & ~pATII2C->SCLDir)
+
+#define ATII2CSCLDirOn                                         \
+    if (pATII2C->SCLDir != 0)                                  \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur | pATII2C->SCLDir)
+
+#define ATII2CSDADirOff                                        \
+    if (pATII2C->SDADir != 0)                                  \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur & ~pATII2C->SDADir)
+
+#define ATII2CSDADirOn                                         \
+    if (pATII2C->SDADir != 0)                                  \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur | pATII2C->SDADir)
+
+
+#define ATII2CSCLBitGet                                        \
+    ((*pATII2C->I2CGetBits)(pATI) & pATII2C->SCLGet)
+
+#define ATII2CSCLBitOff                                        \
+    do                                                         \
+    {                                                          \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur & ~pATII2C->SCLSet);               \
+        ATII2CDelay;                                           \
+    } while (0)
+
+#define ATII2CSCLBitOn                                         \
+    do                                                         \
+    {                                                          \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur | pATII2C->SCLSet);                \
+        do      /* Wait until all devices have released SCL */ \
+        {                                                      \
+            ATII2CDelay;                                       \
+        } while (ATII2CSCLBitGet == 0);                        \
+    } while (0)
+
+
+#define ATII2CSDABitGet                                        \
+    ((*pATII2C->I2CGetBits)(pATI) & pATII2C->SDAGet)
+
+#define ATII2CSDABitOff                                        \
+    do                                                         \
+    {                                                          \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur & ~pATII2C->SDASet);               \
+        ATII2CDelay;                                           \
+    } while (0)
+
+#define ATII2CSDABitOn                                         \
+    do                                                         \
+    {                                                          \
+        (*pATII2C->I2CSetBits)(pATII2C, pATI,                  \
+            pATII2C->I2CCur | pATII2C->SDASet);                \
+        ATII2CDelay;                                           \
+    } while (0)
+
+#define ATII2CSDABitSet(_flag)                                 \
+    do                                                         \
+    {                                                          \
+        if (_flag)                                             \
+            ATII2CSDABitOn;                                    \
+        else                                                   \
+            ATII2CSDABitOff;                                   \
+    } while (0)
+
+
+/*
+ * ATII2CStart --
+ *
+ * This function puts a start signal on the I2C bus.
+ */
+static Bool
+ATII2CStart
+(
+    I2CBusPtr pI2CBus,
+    int       timeout
+)
+{
+    ATII2CPtr pATII2C = pI2CBus->DriverPrivate.ptr;
+    ATIPtr    pATI    = pATII2C->pATI;
+
+    (void)timeout;
+
+    /*
+     * Set I2C line directions to out-bound.  SCL will remain out-bound until
+     * next I2C Stop.
+     */
+    ATII2CSCLDirOn;
+    ATII2CSDADirOn;
+
+    /*
+     * Send Start bit.  This is a pull-down of the data line while the clock
+     * line is pulled up.
+     */
+    ATII2CSDABitOn;
+    ATII2CSCLBitOn;
+    ATII2CSDABitOff;
+    ATII2CSCLBitOff;
+
+    return TRUE;
+}
+
+/*
+ * ATII2CAddress --
+ *
+ * This function puts an 8-bit address on the I2C bus.
+ */
+static Bool
+ATII2CAddress
+(
+    I2CDevPtr    pI2CDev,
+    I2CSlaveAddr Address
+)
+{
+    I2CBusPtr pI2CBus = pI2CDev->pI2CBus;
+
+    /* Send low byte of device address */
+    if ((*pI2CBus->I2CPutByte)(pI2CDev, (I2CByte)Address))
+    {
+        /* Send top byte of address, if appropriate */
+        if (((Address & 0x00F8U) != 0x00F0U) &&
+            ((Address & 0x00FEU) != 0x0000U))
+            return TRUE;
+
+        if ((*pI2CBus->I2CPutByte)(pI2CDev, (I2CByte)(Address >> 8)))
+            return TRUE;
+    }
+
+    /* Kill I2C transaction on failure */
+    (*pI2CBus->I2CStop)(pI2CDev);
+    return FALSE;
+}
+
+/*
+ * ATII2CStop --
+ *
+ * This function puts a stop signal on the I2C bus.
+ */
+static void
+ATII2CStop
+(
+    I2CDevPtr pI2CDev
+)
+{
+    I2CBusPtr pI2CBus = pI2CDev->pI2CBus;
+    ATII2CPtr pATII2C = pI2CBus->DriverPrivate.ptr;
+    ATIPtr    pATI    = pATII2C->pATI;
+
+    ATII2CSDADirOn;             /* Set data line direction to out-bound */
+
+    /*
+     * Send Stop bit.  This is a pull-up of the data line while the clock line
+     * is pulled up.
+     */
+    ATII2CSDABitOff;
+    ATII2CSCLBitOn;
+    ATII2CSDABitOn;
+    ATII2CSCLBitOff;
+
+    /* Reset I2C line directions to in-bound */
+    ATII2CSCLDirOff;
+    ATII2CSDADirOff;
+}
+
+/*
+ * ATII2CPutByte --
+ *
+ * This function puts an 8-bit value on the I2C bus, starting with its MSB.
+ */
+static Bool
+ATII2CPutByte
+(
+    I2CDevPtr pI2CDev,
+    I2CByte   Data
+)
+{
+    I2CBusPtr pI2CBus = pI2CDev->pI2CBus;
+    ATII2CPtr pATII2C = pI2CBus->DriverPrivate.ptr;
+    ATIPtr    pATI    = pATII2C->pATI;
+    int       i;
+    Bool      Result;
+
+    ATII2CSDADirOn;             /* Set data line direction to out-bound */
+
+    /* Send data byte */
+    for (i = 0;  i < 8;  i++)
+    {
+        ATII2CSDABitSet(Data & 0x80U);
+        ATII2CSCLBitOn;
+        ATII2CSCLBitOff;
+
+        Data <<= 1;
+    }
+
+    ATII2CSDABitOn;             /* Release data line */
+
+    ATII2CSDADirOff;            /* Set data line direction to in-bound */
+
+    ATII2CSCLBitOn;             /* Start bit-read clock pulse */
+
+    /* Get [N]ACK bit */
+    if (ATII2CSDABitGet)
+        Result = FALSE;
+    else
+        Result = TRUE;
+
+    ATII2CSCLBitOff;            /* End clock pulse */
+
+    return Result;
+}
+
+/*
+ * ATII2CGetByte --
+ *
+ * This function retrieves an 8-bit value from the I2C bus.
+ */
+static Bool
+ATII2CGetByte
+(
+    I2CDevPtr pI2CDev,
+    I2CByte   *pData,
+    Bool      Last
+)
+{
+    I2CBusPtr     pI2CBus = pI2CDev->pI2CBus;
+    ATII2CPtr     pATII2C = pI2CBus->DriverPrivate.ptr;
+    ATIPtr        pATI    = pATII2C->pATI;
+    unsigned long Value   = 1;
+
+    do
+    {
+        ATII2CSCLBitOn;         /* Start bit-read clock pulse */
+
+        /* Accumulate bit into byte value */
+        Value <<= 1;
+        if (ATII2CSDABitGet)
+            Value++;
+
+        ATII2CSCLBitOff;        /* End clock pulse */
+    } while (Value <= (unsigned long)((I2CByte)(-1)));
+
+    *pData = (I2CByte)Value;
+
+    ATII2CSDADirOn;             /* Set data line direction to out-bound */
+
+    /* Send [N]ACK bit */
+    ATII2CSDABitSet(Last);
+    ATII2CSCLBitOn;
+    ATII2CSCLBitOff;
+
+    if (!Last)
+        ATII2CSDABitOn;         /* Release data line */
+
+    ATII2CSDADirOff;            /* Set data line direction to in-bound */
+
+    return TRUE;
+}
+
+/*
+ * ATICreateI2CBusRec --
+ *
+ * This function is called to initialise an I2CBusRec.
+ */
+static I2CBusPtr
+ATICreateI2CBusRec
+(
+    int    iScreen,
+    ATIPtr pATI,
+    char   *BusName
+)
+{
+    I2CBusPtr pI2CBus;
+    ATII2CPtr pATII2C = xnfcalloc(1, SizeOf(ATII2CRec));
+
+    if (!(pI2CBus = xf86CreateI2CBusRec()))
+    {
+        xf86DrvMsg(iScreen, X_WARNING, "Unable to allocate I2C Bus record.\n");
+        xfree(pATII2C);
+        return NULL;
+    }
+
+    /* Fill in generic structure fields */
+    pI2CBus->BusName           = BusName;
+    pI2CBus->scrnIndex         = iScreen;
+
+    pI2CBus->I2CAddress        = ATII2CAddress;
+    pI2CBus->I2CStart          = ATII2CStart;
+    pI2CBus->I2CStop           = ATII2CStop;
+    pI2CBus->I2CPutByte        = ATII2CPutByte;
+    pI2CBus->I2CGetByte        = ATII2CGetByte;
+
+    pI2CBus->DriverPrivate.ptr = pATII2C;
+
+    pATII2C->pATI              = pATI;
+
+    if (xf86I2CBusInit(pI2CBus))
+        return pI2CBus;
+
+    xf86DrvMsg(iScreen, X_WARNING,
+        "I2C bus %s initialisation failure.\n", BusName);
+    xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
+    xfree(pATII2C);
+    return NULL;
+}
+
+
 /* MPP_CONFIG register values */
 #define MPP_INIT     pATI->NewHW.mpp_config
 
diff --git a/src/atimach64i2c.h b/src/atimach64i2c.h
index d9f56f8..45dcdbc 100644
--- a/src/atimach64i2c.h
+++ b/src/atimach64i2c.h
@@ -27,6 +27,20 @@
 
 #include "xf86str.h"
 
+#include "xf86i2c.h"
+
+typedef struct _ATII2CRec ATII2CRec, *ATII2CPtr;
+
+struct _ATII2CRec
+{
+    ATIPtr pATI;
+    void   (*I2CSetBits) (ATII2CPtr, ATIPtr, CARD32);
+    CARD32 (*I2CGetBits) (ATIPtr);
+    CARD32 SCLDir, SCLGet, SCLSet;
+    CARD32 SDADir, SDAGet, SDASet;
+    CARD32 I2CCur;
+};
+
 extern void Mach64I2CPreInit(ScrnInfoPtr, ATIPtr);
 extern void Mach64I2CFreeScreen(int);