diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/i2c/xf86i2c.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/i2c/xf86i2c.c')
| -rw-r--r-- | xorg-server/hw/xfree86/i2c/xf86i2c.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.c b/xorg-server/hw/xfree86/i2c/xf86i2c.c index 5cc83faa3..59832d6f9 100644 --- a/xorg-server/hw/xfree86/i2c/xf86i2c.c +++ b/xorg-server/hw/xfree86/i2c/xf86i2c.c @@ -35,12 +35,6 @@ #define I2C_TIMEOUT(x) /*(x)*/ /* Report timeouts */ #define I2C_TRACE(x) /*(x)*/ /* Report progress */ -/* Set which OSs have bad gettimeofday resolution. */ -#if defined(SVR4) && !defined(sun) -#define BAD_GETTIMEOFDAY_RESOLUTION -#endif - - /* This is the default I2CUDelay function if not supplied by the driver. * High level I2C interfaces implementing the bus protocol in hardware * should supply this function too. @@ -49,23 +43,6 @@ * All values 0 to 1e6 inclusive must be expected. */ -#ifdef BAD_GETTIMEOFDAY_RESOLUTION -/* - * This is temporary until a better, portable - * way is found. Adjust bogo_usec to match CPU speed. - */ -static int bogo_usec = 500; - -static void -I2CUDelay(I2CBusPtr b, int usec) -{ - volatile long i; - - if (usec > 0) - for (i = usec * bogo_usec; i > 0; i--) - /* (perhaps hw delay action) */; -} -#else static void I2CUDelay(I2CBusPtr b, int usec) { @@ -86,7 +63,6 @@ I2CUDelay(I2CBusPtr b, int usec) } while (diff>=0 && diff< (usec + 1)); } } -#endif /* Most drivers will register just with GetBits/PutBits functions. * The following functions implement a software I2C protocol |