diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c index 221111c85..1efca5907 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.2 2001/04/18 15:29:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.3 2001/05/18 23:35:33 dawes Exp $ */ #include "Xv.h" #include "dix.h" @@ -22,6 +22,8 @@ void SavageInitVideo(ScreenPtr pScreen) {} void SavageResetVideo(ScrnInfoPtr pScrn) {} #else +void myOUTREG( SavagePtr psav, unsigned long offset, unsigned long value ); + static XF86VideoAdaptorPtr SavageSetupImageVideo(ScreenPtr); static void SavageInitOffscreenImages(ScreenPtr); static void SavageStopVideo(ScrnInfoPtr, pointer, Bool); @@ -35,6 +37,10 @@ static int SavagePutImage( ScrnInfoPtr, static int SavageQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); +void SavageStreamsOn(ScrnInfoPtr pScrn, int id); +void SavageStreamsOff(ScrnInfoPtr pScrn); +void SavageResetVideo(ScrnInfoPtr pScrn); + static void SavageInitStreamsOld(ScrnInfoPtr pScrn); static void SavageInitStreamsNew(ScrnInfoPtr pScrn); static void (*SavageInitStreams)(ScrnInfoPtr pScrn) = NULL; @@ -344,9 +350,11 @@ void SavageInitStreamsOld(ScrnInfoPtr pScrn) } #undef OUTREG +#if 0 #define OUTREG(a,v) myOUTREG(psav,a,v) -#undef OUTREG +#else #define OUTREG(addr,val) MMIO_OUT32(psav->MapBase, addr, val) +#endif void SavageInitStreamsNew(ScrnInfoPtr pScrn) { |