diff options
| author | Eric Anholt <eric@anholt.net> | 2008-03-11 11:27:10 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-03-11 11:27:10 -0700 |
| commit | 15f17aa682129c57d3864a355834edff06e91540 (patch) | |
| tree | f6453ad9c26ac57a0f96c70e60254d5bf4ce2b75 /src/tfp410 | |
| parent | 642ba6278876ec945ad687c2b9624e532cd3f629 (diff) | |
Cleanse DVO drivers of CARD* types.
Diffstat (limited to 'src/tfp410')
| -rw-r--r-- | src/tfp410/tfp410.c | 21 | ||||
| -rw-r--r-- | src/tfp410/tfp410_reg.h | 15 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c index bb038cdb..81a6d0a7 100644 --- a/src/tfp410/tfp410.c +++ b/src/tfp410/tfp410.c @@ -44,8 +44,23 @@ #include "tfp410.h" #include "tfp410_reg.h" +typedef struct _TFP410SaveRec { + uint8_t ctl1; + uint8_t ctl2; +} TFP410SaveRec; + +typedef struct { + I2CDevRec d; + Bool quiet; + + TFP410SaveRec SavedReg; + TFP410SaveRec ModeReg; +} TFP410Rec, *TFP410Ptr; + +#define TFPPTR(d) ((TFP410Ptr)(d->DriverPrivate.ptr)) + static Bool -tfp410ReadByte(TFP410Ptr tfp, int addr, CARD8 *ch) +tfp410ReadByte(TFP410Ptr tfp, int addr, uint8_t *ch) { if (!xf86I2CReadByte(&(tfp->d), addr, ch)) { if (!tfp->quiet) { @@ -59,7 +74,7 @@ tfp410ReadByte(TFP410Ptr tfp, int addr, CARD8 *ch) } static Bool -tfp410WriteByte(TFP410Ptr tfp, int addr, CARD8 ch) +tfp410WriteByte(TFP410Ptr tfp, int addr, uint8_t ch) { if (!xf86I2CWriteByte(&(tfp->d), addr, ch)) { if (!tfp->quiet) { @@ -191,7 +206,7 @@ static void tfp410_dump_regs(I2CDevPtr d) { TFP410Ptr tfp = TFPPTR(d); - CARD8 val, val2; + uint8_t val, val2; tfp410ReadByte(tfp, TFP410_REV, &val); xf86DrvMsg(tfp->d.pI2CBus->scrnIndex, X_INFO, diff --git a/src/tfp410/tfp410_reg.h b/src/tfp410/tfp410_reg.h index c555b977..5bfe28b2 100644 --- a/src/tfp410/tfp410_reg.h +++ b/src/tfp410/tfp410_reg.h @@ -88,19 +88,4 @@ #define TFP410_V_RES_LO 0x3C #define TFP410_V_RES_HI 0x3D -typedef struct _TFP410SaveRec { - CARD8 ctl1; - CARD8 ctl2; -} TFP410SaveRec; - -typedef struct { - I2CDevRec d; - Bool quiet; - - TFP410SaveRec SavedReg; - TFP410SaveRec ModeReg; -} TFP410Rec, *TFP410Ptr; - -#define TFPPTR(d) ((TFP410Ptr)(d->DriverPrivate.ptr)) - #endif |