diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-03-23 11:45:55 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-06-02 10:01:46 +1000 |
| commit | adf7d15da6201955f838f053635fc60219372371 (patch) | |
| tree | 969a239844f4aa163d7f23d01ca848ad1997a38c | |
| parent | 540cd6985301443011be51f2345caac72850e71f (diff) | |
| download | xorg-driver-xf86-video-intel-adf7d15da6201955f838f053635fc60219372371.tar.gz | |
make it build without server changes
| -rw-r--r-- | src/i2c_vid.h | 16 | ||||
| -rw-r--r-- | src/i830.h | 3 | ||||
| -rw-r--r-- | src/sil164/sil164.c | 3 | ||||
| -rw-r--r-- | src/sil164/sil164.h | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/src/i2c_vid.h b/src/i2c_vid.h new file mode 100644 index 00000000..088a0877 --- /dev/null +++ b/src/i2c_vid.h @@ -0,0 +1,16 @@ +/* this needs to go in the server */ +#ifndef I2C_VID_H +#define I2C_VID_H + +typedef struct _I830I2CVidOutputRec { + void *(*Detect)(I2CBusPtr b, I2CSlaveAddr addr); + Bool (*Init)(I2CDevPtr d); + ModeStatus (*ModeValid)(I2CDevPtr d, DisplayModePtr mode); + void (*Mode)(I2CDevPtr d, DisplayModePtr mode); + void (*Power)(I2CDevPtr d, DisplayModePtr mode); + void (*PrintRegs)(I2CDevPtr d); + void (*SaveRegs)(I2CDevPtr d); + void (*RestoreRegs)(I2CDevPtr d); +} I830I2CVidOutputRec, *I30I2CVidOutputPtr; + +#endif @@ -69,6 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "common.h" +#include "i2c_vid.h" /* I830 Video BIOS support */ /* @@ -245,7 +246,7 @@ struct _I830DVODriver { char *fntablename; int address; const char **symbols; - I2CVidOutputRec *vid_rec; + I830I2CVidOutputRec *vid_rec; void *devpriv; pointer modhandle; }; diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c index db3bbae4..66dc7ac3 100644 --- a/src/sil164/sil164.c +++ b/src/sil164/sil164.c @@ -177,7 +177,8 @@ static void sil164SaveRegs(I2CDevPtr d) return; } -I2CVidOutputRec SIL164VidOutput = { + +I830I2CVidOutputRec SIL164VidOutput = { sil164Detect, sil164Init, sil164ModeValid, diff --git a/src/sil164/sil164.h b/src/sil164/sil164.h index 1a12b8d5..842a4ac9 100644 --- a/src/sil164/sil164.h +++ b/src/sil164/sil164.h @@ -26,6 +26,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef SIL164_H #define SIL164_H +#include "../i2c_vid.h" + #define SIL164_VID 0x0001 #define SIL164_DID 0x0006 |