Rename xf86dga(1)str.h to xf86dga(1)proto.h for consistency with other modules

Stub *str.h headers provided to avoid breaking clients.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

5 files changed, 544 insertions, 536 deletions

diff --git a/Makefile.am b/Makefile.am
index 9c0f66f..abae9b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,9 @@ xf86dgadir = $(includedir)/X11/extensions
 xf86dga_HEADERS = \
 	xf86dga1const.h \
 	xf86dga1str.h \
+	xf86dga1proto.h \
 	xf86dgaconst.h \
+	xf86dgaproto.h \
 	xf86dgastr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/xf86dga1proto.h b/xf86dga1proto.h
new file mode 100644
index 0000000..d0f72c8
--- /dev/null
+++ b/xf86dga1proto.h
@@ -0,0 +1,193 @@
+/*
+
+Copyright (c) 1995  Jon Tombs
+Copyright (c) 1995  XFree86 Inc.
+
+*/
+
+#ifndef _XF86DGAPROTO1_H_
+#define _XF86DGAPROTO1_H_
+
+typedef struct _XF86DGAQueryVersion {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+} xXF86DGAQueryVersionReq;
+#define sz_xXF86DGAQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of DGA protocol */
+    CARD16	minorVersion B16;	/* minor version of DGA protocol */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86DGAQueryVersionReply;
+#define sz_xXF86DGAQueryVersionReply	32
+
+typedef struct _XF86DGAGetVideoLL {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGAGetVideoLL */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAGetVideoLLReq;
+#define sz_xXF86DGAGetVideoLLReq	8
+
+typedef struct _XF86DGAInstallColormap{
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad2; 
+    CARD32	id B32;  /* colormap. */
+} xXF86DGAInstallColormapReq;
+#define sz_xXF86DGAInstallColormapReq        12
+
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	offset B32;
+    CARD32	width B32;
+    CARD32	bank_size B32;
+    CARD32	ram_size B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAGetVideoLLReply;
+#define sz_xXF86DGAGetVideoLLReply	32
+
+typedef struct _XF86DGADirectVideo {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGADirectVideo */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	enable B16;
+} xXF86DGADirectVideoReq;
+#define sz_xXF86DGADirectVideoReq	8
+
+
+typedef struct _XF86DGAGetViewPortSize {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGAGetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAGetViewPortSizeReq;
+#define sz_xXF86DGAGetViewPortSizeReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	width B32;
+    CARD32	height B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAGetViewPortSizeReply;
+#define sz_xXF86DGAGetViewPortSizeReply	32
+
+typedef struct _XF86DGASetViewPort {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGASetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32      x B32;
+    CARD32	y B32;
+} xXF86DGASetViewPortReq;
+#define sz_xXF86DGASetViewPortReq	16
+
+typedef struct _XF86DGAGetVidPage {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGAGetVidPage */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAGetVidPageReq;
+#define sz_xXF86DGAGetVidPageReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	vpage B32;
+    CARD32	pad B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAGetVidPageReply;
+#define sz_xXF86DGAGetVidPageReply	32
+
+
+typedef struct _XF86DGASetVidPage {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_XF86DGASetVidPage */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      vpage B16;
+} xXF86DGASetVidPageReq;
+#define sz_xXF86DGASetVidPageReq	8
+
+
+typedef struct _XF86DGAQueryDirectVideo {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      pad B16;
+} xXF86DGAQueryDirectVideoReq;
+#define sz_xXF86DGAQueryDirectVideoReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	flags B32;
+    CARD32	pad B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAQueryDirectVideoReply;
+#define sz_xXF86DGAQueryDirectVideoReply 32
+
+
+typedef struct _XF86DGAViewPortChanged {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16      n B16;
+} xXF86DGAViewPortChangedReq;
+#define sz_xXF86DGAViewPortChangedReq	8
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	result B32;
+    CARD32	pad B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86DGAViewPortChangedReply;
+#define sz_xXF86DGAViewPortChangedReply 32
+
+#endif /* _XF86DGAPROTO1_H_ */
+
diff --git a/xf86dga1str.h b/xf86dga1str.h
index 9c6e8c8..d8e73e8 100644
--- a/xf86dga1str.h
+++ b/xf86dga1str.h
@@ -1,193 +1,3 @@
-/*
-
-Copyright (c) 1995  Jon Tombs
-Copyright (c) 1995  XFree86 Inc.
-
-*/
-
-#ifndef _XF86DGASTR1_H_
-#define _XF86DGASTR1_H_
-
-typedef struct _XF86DGAQueryVersion {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-} xXF86DGAQueryVersionReq;
-#define sz_xXF86DGAQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DGA protocol */
-    CARD16	minorVersion B16;	/* minor version of DGA protocol */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86DGAQueryVersionReply;
-#define sz_xXF86DGAQueryVersionReply	32
-
-typedef struct _XF86DGAGetVideoLL {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGAGetVideoLL */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAGetVideoLLReq;
-#define sz_xXF86DGAGetVideoLLReq	8
-
-typedef struct _XF86DGAInstallColormap{
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad2; 
-    CARD32	id B32;  /* colormap. */
-} xXF86DGAInstallColormapReq;
-#define sz_xXF86DGAInstallColormapReq        12
-
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	offset B32;
-    CARD32	width B32;
-    CARD32	bank_size B32;
-    CARD32	ram_size B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAGetVideoLLReply;
-#define sz_xXF86DGAGetVideoLLReply	32
-
-typedef struct _XF86DGADirectVideo {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGADirectVideo */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	enable B16;
-} xXF86DGADirectVideoReq;
-#define sz_xXF86DGADirectVideoReq	8
-
-
-typedef struct _XF86DGAGetViewPortSize {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGAGetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAGetViewPortSizeReq;
-#define sz_xXF86DGAGetViewPortSizeReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	width B32;
-    CARD32	height B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAGetViewPortSizeReply;
-#define sz_xXF86DGAGetViewPortSizeReply	32
-
-typedef struct _XF86DGASetViewPort {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGASetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32      x B32;
-    CARD32	y B32;
-} xXF86DGASetViewPortReq;
-#define sz_xXF86DGASetViewPortReq	16
-
-typedef struct _XF86DGAGetVidPage {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGAGetVidPage */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAGetVidPageReq;
-#define sz_xXF86DGAGetVidPageReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	vpage B32;
-    CARD32	pad B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAGetVidPageReply;
-#define sz_xXF86DGAGetVidPageReply	32
-
-
-typedef struct _XF86DGASetVidPage {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_XF86DGASetVidPage */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      vpage B16;
-} xXF86DGASetVidPageReq;
-#define sz_xXF86DGASetVidPageReq	8
-
-
-typedef struct _XF86DGAQueryDirectVideo {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      pad B16;
-} xXF86DGAQueryDirectVideoReq;
-#define sz_xXF86DGAQueryDirectVideoReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	flags B32;
-    CARD32	pad B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAQueryDirectVideoReply;
-#define sz_xXF86DGAQueryDirectVideoReply 32
-
-
-typedef struct _XF86DGAViewPortChanged {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16      n B16;
-} xXF86DGAViewPortChangedReq;
-#define sz_xXF86DGAViewPortChangedReq	8
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	result B32;
-    CARD32	pad B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86DGAViewPortChangedReply;
-#define sz_xXF86DGAViewPortChangedReply 32
-
-#endif /* _XF86DGASTR1_H_ */
-
+#warning "xf86dga1str.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86dga1proto.h> for the protocol defines."
+#include <X11/extensions/xf86dga1proto.h>
diff --git a/xf86dgaproto.h b/xf86dgaproto.h
new file mode 100644
index 0000000..8e36dce
--- /dev/null
+++ b/xf86dgaproto.h
@@ -0,0 +1,343 @@
+/*
+
+Copyright (c) 1995  Jon Tombs
+Copyright (c) 1995  XFree86 Inc.
+
+*/
+
+#ifndef _XF86DGAPROTO_H_
+#define _XF86DGAPROTO_H_
+
+#include <X11/extensions/xf86dga1proto.h>
+
+#define XF86DGANAME "XFree86-DGA"
+
+#define XDGA_MAJOR_VERSION	2	/* current version numbers */
+#define XDGA_MINOR_VERSION	0
+
+
+typedef struct _XDGAQueryVersion {
+    CARD8	reqType;		/* always DGAReqCode */
+    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
+    CARD16	length B16;
+} xXDGAQueryVersionReq;
+#define sz_xXDGAQueryVersionReq		4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of DGA protocol */
+    CARD16	minorVersion B16;	/* minor version of DGA protocol */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXDGAQueryVersionReply;
+#define sz_xXDGAQueryVersionReply	32
+
+typedef struct _XDGAQueryModes {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGAQueryModesReq;
+#define sz_xXDGAQueryModesReq		8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	number B32;		/* number of modes available */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXDGAQueryModesReply;
+#define sz_xXDGAQueryModesReply	32
+
+
+typedef struct _XDGASetMode {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	mode B32;		/* mode number to init */
+    CARD32	pid B32;		/* Pixmap descriptor */
+} xXDGASetModeReq;
+#define sz_xXDGASetModeReq		16
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	offset B32;		/* offset into framebuffer map */
+    CARD32	flags B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXDGASetModeReply;
+#define sz_xXDGASetModeReply	32
+
+typedef struct {
+   CARD8	byte_order;
+   CARD8	depth;
+   CARD16 	num B16;
+   CARD16	bpp B16;
+   CARD16	name_size B16;
+   CARD32	vsync_num B32;
+   CARD32	vsync_den B32;
+   CARD32	flags B32;
+   CARD16	image_width B16;
+   CARD16	image_height B16;
+   CARD16	pixmap_width B16;
+   CARD16	pixmap_height B16;
+   CARD32	bytes_per_scanline B32;
+   CARD32	red_mask B32;
+   CARD32	green_mask B32;
+   CARD32	blue_mask B32;
+   CARD16	visual_class B16;
+   CARD16	pad1 B16;
+   CARD16	viewport_width B16;
+   CARD16	viewport_height B16;
+   CARD16	viewport_xstep B16;
+   CARD16	viewport_ystep B16;
+   CARD16	viewport_xmax B16;
+   CARD16	viewport_ymax B16;
+   CARD32	viewport_flags B32;
+   CARD32	reserved1 B32;
+   CARD32	reserved2 B32;
+} xXDGAModeInfo;
+#define sz_xXDGAModeInfo 72
+
+typedef struct _XDGAOpenFramebuffer {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGAOpenFramebufferReq;
+#define sz_xXDGAOpenFramebufferReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;		/* device name size if there is one */
+    CARD32	mem1 B32;		/* physical memory */	
+    CARD32	mem2 B32;		/* spillover for _alpha_ */
+    CARD32	size B32;		/* size of map in bytes */
+    CARD32	offset B32;		/* optional offset into device */
+    CARD32	extra B32;		/* extra info associated with the map */
+    CARD32	pad2 B32;
+} xXDGAOpenFramebufferReply;
+#define sz_xXDGAOpenFramebufferReply	32
+
+
+typedef struct _XDGACloseFramebuffer {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGACloseFramebufferReq;
+#define sz_xXDGACloseFramebufferReq	8
+
+
+typedef struct _XDGASetViewport {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD32	flags B32;
+} xXDGASetViewportReq;
+#define sz_xXDGASetViewportReq	16
+
+
+typedef struct _XDGAInstallColormap {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	cmap B32;
+} xXDGAInstallColormapReq;
+#define sz_xXDGAInstallColormapReq	12
+
+typedef struct _XDGASelectInput {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	mask B32;
+} xXDGASelectInputReq;
+#define sz_xXDGASelectInputReq	12
+
+typedef struct _XDGAFillRectangle {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD32	color B32;
+} xXDGAFillRectangleReq;
+#define sz_xXDGAFillRectangleReq	20
+
+
+typedef struct _XDGACopyArea {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	srcx B16;
+    CARD16	srcy B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD16	dstx B16;
+    CARD16	dsty B16;
+} xXDGACopyAreaReq;
+#define sz_xXDGACopyAreaReq	20
+
+typedef struct _XDGACopyTransparentArea {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	srcx B16;
+    CARD16	srcy B16;
+    CARD16	width B16;
+    CARD16	height B16;
+    CARD16	dstx B16;
+    CARD16	dsty B16;
+    CARD32	key B32;
+} xXDGACopyTransparentAreaReq;
+#define sz_xXDGACopyTransparentAreaReq	24
+
+
+typedef struct _XDGAGetViewportStatus {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGAGetViewportStatusReq;
+#define sz_xXDGAGetViewportStatusReq	8
+
+typedef struct {
+    BYTE	type;			
+    BOOL	pad1;	
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	status B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXDGAGetViewportStatusReply;
+#define sz_xXDGAGetViewportStatusReply	32
+
+typedef struct _XDGASync {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+} xXDGASyncReq;
+#define sz_xXDGASyncReq	8
+
+typedef struct {
+    BYTE	type;			
+    BOOL	pad1;	
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xXDGASyncReply;
+#define sz_xXDGASyncReply	32
+
+typedef struct _XDGASetClientVersion {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD16	major B16;
+    CARD16	minor B16;
+} xXDGASetClientVersionReq;
+#define sz_xXDGASetClientVersionReq	8
+
+
+typedef struct {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD32	flags B32;
+} xXDGAChangePixmapModeReq;
+#define sz_xXDGAChangePixmapModeReq	16
+
+typedef struct {
+    BYTE	type;			
+    BOOL	pad1;	
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	x B16;
+    CARD16	y B16;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+} xXDGAChangePixmapModeReply;
+#define sz_xXDGAChangePixmapModeReply	32
+
+typedef struct _XDGACreateColormap {
+    CARD8	reqType;
+    CARD8	dgaReqType;
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	id B32;
+    CARD32	mode B32;
+    CARD8	alloc;
+    CARD8	pad1;
+    CARD16	pad2;
+} xXDGACreateColormapReq;
+#define sz_xXDGACreateColormapReq	20
+
+
+typedef struct {
+  union {
+    struct {
+      BYTE type;
+      BYTE detail;
+      CARD16 sequenceNumber B16;
+    } u;
+    struct {
+      CARD32 pad0 B32;
+      CARD32 time B32;
+      INT16 dx B16;
+      INT16 dy B16;
+      INT16 screen B16;
+      CARD16 state B16;
+      CARD32 pad1 B32;
+      CARD32 pad2 B32;
+      CARD32 pad3 B32;
+      CARD32 pad4 B32;
+    } event;
+  } u;
+} dgaEvent;
+
+
+#endif /* _XF86DGAPROTO_H_ */
+
diff --git a/xf86dgastr.h b/xf86dgastr.h
index fd15fa7..f4809d1 100644
--- a/xf86dgastr.h
+++ b/xf86dgastr.h
@@ -1,343 +1,3 @@
-/*
-
-Copyright (c) 1995  Jon Tombs
-Copyright (c) 1995  XFree86 Inc.
-
-*/
-
-#ifndef _XF86DGASTR_H_
-#define _XF86DGASTR_H_
-
-#include <X11/extensions/xf86dga1str.h>
-
-#define XF86DGANAME "XFree86-DGA"
-
-#define XDGA_MAJOR_VERSION	2	/* current version numbers */
-#define XDGA_MINOR_VERSION	0
-
-
-typedef struct _XDGAQueryVersion {
-    CARD8	reqType;		/* always DGAReqCode */
-    CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
-} xXDGAQueryVersionReq;
-#define sz_xXDGAQueryVersionReq		4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DGA protocol */
-    CARD16	minorVersion B16;	/* minor version of DGA protocol */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXDGAQueryVersionReply;
-#define sz_xXDGAQueryVersionReply	32
-
-typedef struct _XDGAQueryModes {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGAQueryModesReq;
-#define sz_xXDGAQueryModesReq		8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	number B32;		/* number of modes available */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXDGAQueryModesReply;
-#define sz_xXDGAQueryModesReply	32
-
-
-typedef struct _XDGASetMode {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	mode B32;		/* mode number to init */
-    CARD32	pid B32;		/* Pixmap descriptor */
-} xXDGASetModeReq;
-#define sz_xXDGASetModeReq		16
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	offset B32;		/* offset into framebuffer map */
-    CARD32	flags B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXDGASetModeReply;
-#define sz_xXDGASetModeReply	32
-
-typedef struct {
-   CARD8	byte_order;
-   CARD8	depth;
-   CARD16 	num B16;
-   CARD16	bpp B16;
-   CARD16	name_size B16;
-   CARD32	vsync_num B32;
-   CARD32	vsync_den B32;
-   CARD32	flags B32;
-   CARD16	image_width B16;
-   CARD16	image_height B16;
-   CARD16	pixmap_width B16;
-   CARD16	pixmap_height B16;
-   CARD32	bytes_per_scanline B32;
-   CARD32	red_mask B32;
-   CARD32	green_mask B32;
-   CARD32	blue_mask B32;
-   CARD16	visual_class B16;
-   CARD16	pad1 B16;
-   CARD16	viewport_width B16;
-   CARD16	viewport_height B16;
-   CARD16	viewport_xstep B16;
-   CARD16	viewport_ystep B16;
-   CARD16	viewport_xmax B16;
-   CARD16	viewport_ymax B16;
-   CARD32	viewport_flags B32;
-   CARD32	reserved1 B32;
-   CARD32	reserved2 B32;
-} xXDGAModeInfo;
-#define sz_xXDGAModeInfo 72
-
-typedef struct _XDGAOpenFramebuffer {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGAOpenFramebufferReq;
-#define sz_xXDGAOpenFramebufferReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;		/* device name size if there is one */
-    CARD32	mem1 B32;		/* physical memory */	
-    CARD32	mem2 B32;		/* spillover for _alpha_ */
-    CARD32	size B32;		/* size of map in bytes */
-    CARD32	offset B32;		/* optional offset into device */
-    CARD32	extra B32;		/* extra info associated with the map */
-    CARD32	pad2 B32;
-} xXDGAOpenFramebufferReply;
-#define sz_xXDGAOpenFramebufferReply	32
-
-
-typedef struct _XDGACloseFramebuffer {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGACloseFramebufferReq;
-#define sz_xXDGACloseFramebufferReq	8
-
-
-typedef struct _XDGASetViewport {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	flags B32;
-} xXDGASetViewportReq;
-#define sz_xXDGASetViewportReq	16
-
-
-typedef struct _XDGAInstallColormap {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	cmap B32;
-} xXDGAInstallColormapReq;
-#define sz_xXDGAInstallColormapReq	12
-
-typedef struct _XDGASelectInput {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	mask B32;
-} xXDGASelectInputReq;
-#define sz_xXDGASelectInputReq	12
-
-typedef struct _XDGAFillRectangle {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD32	color B32;
-} xXDGAFillRectangleReq;
-#define sz_xXDGAFillRectangleReq	20
-
-
-typedef struct _XDGACopyArea {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	srcx B16;
-    CARD16	srcy B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	dstx B16;
-    CARD16	dsty B16;
-} xXDGACopyAreaReq;
-#define sz_xXDGACopyAreaReq	20
-
-typedef struct _XDGACopyTransparentArea {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	srcx B16;
-    CARD16	srcy B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	dstx B16;
-    CARD16	dsty B16;
-    CARD32	key B32;
-} xXDGACopyTransparentAreaReq;
-#define sz_xXDGACopyTransparentAreaReq	24
-
-
-typedef struct _XDGAGetViewportStatus {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGAGetViewportStatusReq;
-#define sz_xXDGAGetViewportStatusReq	8
-
-typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	status B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXDGAGetViewportStatusReply;
-#define sz_xXDGAGetViewportStatusReply	32
-
-typedef struct _XDGASync {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xXDGASyncReq;
-#define sz_xXDGASyncReq	8
-
-typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-} xXDGASyncReply;
-#define sz_xXDGASyncReply	32
-
-typedef struct _XDGASetClientVersion {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
-} xXDGASetClientVersionReq;
-#define sz_xXDGASetClientVersionReq	8
-
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	flags B32;
-} xXDGAChangePixmapModeReq;
-#define sz_xXDGAChangePixmapModeReq	16
-
-typedef struct {
-    BYTE	type;			
-    BOOL	pad1;	
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-} xXDGAChangePixmapModeReply;
-#define sz_xXDGAChangePixmapModeReply	32
-
-typedef struct _XDGACreateColormap {
-    CARD8	reqType;
-    CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	id B32;
-    CARD32	mode B32;
-    CARD8	alloc;
-    CARD8	pad1;
-    CARD16	pad2;
-} xXDGACreateColormapReq;
-#define sz_xXDGACreateColormapReq	20
-
-
-typedef struct {
-  union {
-    struct {
-      BYTE type;
-      BYTE detail;
-      CARD16 sequenceNumber B16;
-    } u;
-    struct {
-      CARD32 pad0 B32;
-      CARD32 time B32;
-      INT16 dx B16;
-      INT16 dy B16;
-      INT16 screen B16;
-      CARD16 state B16;
-      CARD32 pad1 B32;
-      CARD32 pad2 B32;
-      CARD32 pad3 B32;
-      CARD32 pad4 B32;
-    } event;
-  } u;
-} dgaEvent;
-
-
-#endif /* _XF86DGASTR_H_ */
-
+#warning "xf86dgastr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86dgaproto.h> for the protocol defines."
+#include <X11/extensions/xf86dgaproto.h>