28c28
< __FBSDID("$FreeBSD: head/sys/dev/iicbus/iicbb.c 188461 2009-02-10 22:50:23Z imp $");
---
> __FBSDID("$FreeBSD: head/sys/dev/iicbus/iicbb.c 228728 2011-12-20 02:49:01Z adrian $");
63a64
> int udelay; /* signal toggle delay in usec */
125a127
> sc->udelay = 10; /* 10 uS default */
187,189c189
< #define IIC_DELAY 10
<
< #define I2C_SETSDA(dev,val) do { \
---
> #define I2C_SETSDA(sc,dev,val) do { \
191c191
< DELAY(IIC_DELAY); \
---
> DELAY(sc->udelay); \
198c198
< #define I2C_SET(dev,ctrl,data) do { \
---
> #define I2C_SET(sc,dev,ctrl,data) do { \
200c200
< I2C_SETSDA(dev, data); \
---
> I2C_SETSDA(sc, dev, data); \
218a219
> struct iicbb_softc *sc = device_get_softc(dev);
222c223
< DELAY(IIC_DELAY);
---
> DELAY(sc->udelay);
226c227
< DELAY(IIC_DELAY);
---
> DELAY(sc->udelay);
228c229
<
---
>
235,237c236,240
< I2C_SET(dev,0,1);
< I2C_SET(dev,1,1);
< I2C_SET(dev,0,1);
---
> struct iicbb_softc *sc = device_get_softc(dev);
>
> I2C_SET(sc,dev,0,1);
> I2C_SET(sc,dev,1,1);
> I2C_SET(sc,dev,0,1);
244,246c247,251
< I2C_SET(dev,0,0);
< I2C_SET(dev,1,0);
< I2C_SET(dev,0,0);
---
> struct iicbb_softc *sc = device_get_softc(dev);
>
> I2C_SET(sc,dev,0,0);
> I2C_SET(sc,dev,1,0);
> I2C_SET(sc,dev,0,0);
266a272
> struct iicbb_softc *sc = device_get_softc(dev);
269,271c275,277
<
< I2C_SET(dev,0,1);
< I2C_SET(dev,1,1);
---
>
> I2C_SET(sc,dev,0,1);
> I2C_SET(sc,dev,1,1);
276,277c282,283
< DELAY(10);
< k += 10;
---
> DELAY(1);
> k++;
280c286
< I2C_SET(dev,0,1);
---
> I2C_SET(sc,dev,0,1);
304a311
> struct iicbb_softc *sc = device_get_softc(dev);
307,308c314,315
<
< I2C_SET(dev,0,1);
---
>
> I2C_SET(sc,dev,0,1);
311c318
< I2C_SET(dev,1,1);
---
> I2C_SET(sc,dev,1,1);
314c321
< I2C_SET(dev,0,1);
---
> I2C_SET(sc,dev,0,1);
339a347
> struct iicbb_softc *sc = device_get_softc(dev);
344,346c352,354
< I2C_SET(dev,1,1);
< I2C_SET(dev,1,0);
< I2C_SET(dev,0,0);
---
> I2C_SET(sc,dev,1,1);
> I2C_SET(sc,dev,1,0);
> I2C_SET(sc,dev,0,0);
367,369c375,379
< I2C_SET(dev,0,0);
< I2C_SET(dev,1,0);
< I2C_SET(dev,1,1);
---
> struct iicbb_softc *sc = device_get_softc(dev);
>
> I2C_SET(sc,dev,0,0);
> I2C_SET(sc,dev,1,0);
> I2C_SET(sc,dev,1,1);
370a381
> I2C_DEBUG(printf("\n"));