[xserver-commit] xserver/hw/kdrive/vesa vesa.h,1.16.2.2,1.16.2.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/vesa
In directory pdx:/tmp/cvs-serv23305/hw/kdrive/vesa

Modified Files:
      Tag: xfixes_2_branch
	vesa.h 
Log Message:
	* Xext/bigreq.c: (BigReqExtensionInit):
	* Xext/mitmisc.c: (MITMiscExtensionInit):
	* Xext/saver.c: (ScreenSaverExtensionInit):
	* Xext/shm.c: (ShmExtensionInit), (ShmRegisterFuncs),
	(ShmSetPixmapFormat):
	* Xext/shmint.h:
	* Xext/sleepuntil.c: (ClientSleepUntil):
	* Xext/sleepuntil.h:
	* Xext/sync.c: (SyncCreateSystemCounter), (SyncExtensionInit):
	* Xext/syncint.h:
	* Xext/xcmisc.c: (XCMiscExtensionInit):
	* Xext/xext.h:
	* Xext/xres.c:
	* Xext/xtest.c: (XTestExtensionInit):
	* Xext/xtest1di.c: (XTestExtension1Init):
	* Xext/xvmc.c: (XvMCFindXvImage):
	* Xext/xvmcext.h:
	* configure.ac:
	* dix/dispatch.c:
	* dix/extension.c: (CloseDownExtensions):
	* dix/property.c: (NullPropertyReply):
	* dix/xpstubs.c: (XpClientIsBitmapClient), (XpClientIsPrintClient),
	(XprintOptions):
	* hw/kdrive/fbdev/fbdev.c: (fbdevUnmapFramebuffer),
	(fbdevRandRSetConfig):
	* hw/kdrive/fbdev/fbdev.h:
	* hw/kdrive/linux/agp.c: (GARTInit):
	* hw/kdrive/linux/bus.c:
	* hw/kdrive/linux/keyboard.c: (readKernelMapping):
	* hw/kdrive/linux/linux.c: (LinuxInit):
	* hw/kdrive/linux/mouse.c:
	* hw/kdrive/linux/ms.c:
	* hw/kdrive/linux/ps2.c:
	* hw/kdrive/mach64/mach64.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/mga/mga.c:
	* hw/kdrive/mga/mgadraw.c: (mgaPrepareSolid), (mgaPrepareCopy):
	* hw/kdrive/nvidia/nvidia.c: (nvidiaLockUnlock):
	* hw/kdrive/nvidia/nvidia.h:
	* hw/kdrive/nvidia/nvidiadraw.c: (nvidiaPrepareSolid),
	(nvidiaPrepareCopy), (nvidiaDrawInit), (nvidiaDrawEnable):
	* hw/kdrive/r128/r128.c: (r128ScreenInit), (r128Preserve),
	(r128DPMS):
	* hw/kdrive/r128/r128draw.c: (r128WaitAvail), (r128Setup),
	(r128DrawInit):
	* hw/kdrive/r128/r128stub.c:
	* hw/kdrive/smi/smi.c: (smiRandRSetConfig), (smiPreserve),
	(smiDPMS), (smiRestore):
	* hw/kdrive/smi/smi.h:
	* hw/kdrive/smi/smidraw.c: (smiPrepareSolid), (smiPrepareCopy),
	(smiDrawInit):
	* hw/kdrive/smi/smistub.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kcmap.c:
	* hw/kdrive/src/kcurscol.c:
	* hw/kdrive/src/kdrive.c: (KdCreateScreenResources):
	* hw/kdrive/src/kdrive.h:
	* hw/kdrive/src/kinput.c:
	* hw/kdrive/src/knoop.c:
	* hw/kdrive/src/vga.c:
	* hw/kdrive/src/vga.h:
	* hw/kdrive/vesa/vesa.h:
	* hw/xnest/Color.c: (xnestCreateColormap), (xnestDestroyColormap),
	(xnestCountInstalledColormapWindows),
	(xnestGetInstalledColormapWindows),
	(xnestSameInstalledColormapWindows),
	(xnestSetInstalledColormapWindows),
	(xnestSetScreenSaverColormapWindow), (xnestDirectInstallColormaps),
	(xnestDirectUninstallColormaps), (xnestInstallColormap),
	(xnestUninstallColormap), (xnestListInstalledColormaps),
	(xnestStoreColors), (xnestResolveColor),
	(xnestCreateDefaultColormap):
	* hw/xnest/Color.h:
	* hw/xnest/Cursor.c: (xnestConstrainCursor), (xnestCursorLimits),
	(xnestDisplayCursor), (xnestRealizeCursor), (xnestUnrealizeCursor),
	(xnestRecolorCursor), (xnestSetCursorPosition):
	* hw/xnest/Display.c: (xnestOpenDisplay):
	* hw/xnest/Display.h:
	* hw/xnest/Events.c: (xnestExposurePredicate),
	(xnestNotExposurePredicate), (xnestCollectExposures),
	(xnestCollectEvents):
	* hw/xnest/Events.h:
	* hw/xnest/Font.c: (xnestRealizeFont), (xnestUnrealizeFont):
	* hw/xnest/GC.c: (xnestValidateGC), (xnestChangeGC), (xnestCopyGC),
	(xnestDestroyGC), (xnestDestroyClipHelper), (xnestChangeClip),
	(xnestDestroyClip), (xnestCopyClip), (xnestCreateGC):
	* hw/xnest/GCOps.c: (xnestFillSpans), (xnestSetSpans),
	(xnestGetSpans), (xnestQueryBestSize), (xnestPutImage),
	(xnestGetImage), (xnestBitBlitPredicate), (xnestBitBlitHelper),
	(xnestCopyArea), (xnestCopyPlane), (xnestPolyPoint),
	(xnestPolylines), (xnestPolySegment), (xnestPolyRectangle),
	(xnestPolyArc), (xnestFillPolygon), (xnestPolyFillRect),
	(xnestPolyFillArc), (xnestPolyText8), (xnestPolyText16),
	(xnestImageText8), (xnestImageText16), (xnestImageGlyphBlt),
	(xnestPolyGlyphBlt), (xnestPushPixels):
	* hw/xnest/GCOps.h:
	* hw/xnest/Keyboard.h:
	* hw/xnest/Screen.c: (xnestScreen):
	* hw/xnest/Screen.h:
	* hw/xnest/Visual.c: (xnestVisual), (xnestVisualFromID):
	* hw/xnest/Visual.h:
	* hw/xnest/Window.c: (xnestWindowPtr):
	* hw/xnest/XNCursor.h:
	* hw/xnest/XNFont.h:
	* hw/xnest/XNGC.h:
	* hw/xnest/XNPixmap.h:
	* hw/xnest/XNWindow.h:
	* include/extnsionst.h:
	* mi/Makefile.am:
	* mi/miinitext.c:
	* os/Makefile.am:
	* os/connection.c: (ClientAuthorized):
	* os/hpsocket.c: (set_socket_option), (unset_socket_option):
	* os/xdmauth.c: (XdmCheckCookie), (XdmToID):
	Prototype fixes (various)
	Add GCC warnings (including -Werror.  clean up your code)
	Other warning fixes (unused variables, etc)
	Get rid of unused extension interfaces (aux screen procs)
	Make lots of functions in kdrive static
	Eliminate unused code from os library


Index: vesa.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/vesa/vesa.h,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- vesa.h	24 Oct 2003 09:34:33 -0000	1.16.2.2
+++ vesa.h	29 Oct 2003 16:26:49 -0000	1.16.2.3
@@ -108,6 +108,82 @@
 extern Bool vesa_force_mode;
 
 void
+vesaReportMode (VesaModePtr mode);
+
+VesaModePtr
+vesaGetModes (Vm86InfoPtr vi, int *ret_nmode);
+
+void
+vesaTestMode (void);
+
+void *
+vesaSetWindowPlanar(ScreenPtr pScreen,
+		  CARD32    row,
+		  CARD32    offset,
+		  int	    mode,
+		  CARD32    *size);
+
+void *
+vesaSetWindowLinear (ScreenPtr	pScreen,
+		     CARD32	row,
+		     CARD32	offset,
+		     int	mode,
+		     CARD32	*size);
+
+void *
+vesaSetWindowWindowed (ScreenPtr    pScreen,
+		       CARD32	    row,
+		       CARD32	    offset,
+		       int	    mode,
+		       CARD32	    *size);
+
+void *
+vesaWindowPlanar (ScreenPtr pScreen,
+		  CARD32    row,
+		  CARD32    offset,
+		  int	    mode,
+		  CARD32    *size,
+		  void	    *closure);
+
+void *
+vesaWindowLinear (ScreenPtr pScreen,
+		  CARD32    row,
+		  CARD32    offset,
+		  int	    mode,
+		  CARD32    *size,
+		  void	    *closure);
+
+void *
+vesaWindowWindowed (ScreenPtr	pScreen,
+		    CARD32	row,
+		    CARD32	offset,
+		    int		mode,
+		    CARD32	*size,
+		    void	*closure);
+
+void *
+vesaWindowCga (ScreenPtr    pScreen,
+	       CARD32	    row,
+	       CARD32	    offset,
+	       int	    mode,
+	       CARD32	    *size,
+	       void	    *closure);
+
+void
+vesaUpdateMono (ScreenPtr	pScreen,
+		shadowBufPtr	pBuf);
+
+Bool
+vesaCreateColormap16 (ColormapPtr pmap);
+
+void
+vesaSetScreenSizes (ScreenPtr pScreen);
+
+Bool
+vesaSetShadow (ScreenPtr pScreen);
+
+
+void
 vesaListModes(void);
 
 Bool
@@ -150,6 +226,9 @@
 Bool
 vesaMapFramebuffer (KdScreenInfo    *screen);
 
+void
+vesaUnmapFramebuffer (KdScreenInfo  *screen);
+
 Bool
 vesaInitScreen(ScreenPtr pScreen);
 
@@ -184,6 +263,12 @@
 void
 vesaScreenFini(KdScreenInfo *screen);
 
+int 
+vesaSetPalette(VesaCardPrivPtr priv, int first, int number, U8 *entries);
+
+int 
+vesaGetPalette(VesaCardPrivPtr priv, int first, int number, U8 *entries);
+
 void
 vesaPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
 
@@ -195,10 +280,19 @@
 
 #ifdef RANDR
 Bool
+vesaRandRGetInfo (ScreenPtr pScreen, Rotation *rotations);
+
+Bool
 vesaRandRSetConfig (ScreenPtr		pScreen,
 		    Rotation		randr,
 		    int			rate,
 		    RRScreenSizePtr	pSize);
+Bool
+vesaRandRInit (ScreenPtr pScreen);
+
 #endif
 
+Bool
+toshibaDPMS (ScreenPtr pScreen, int mode);
+
 #endif /* _VESA_H_ */