.gitignore | 3 ChangeLog | 93 ++++++++++++++ Makefile.am | 19 ++- configure.ac | 8 - debian/changelog | 14 +- debian/control | 3 debian/copyright | 4 xf86dga.h | 269 +----------------------------------------- xf86dga1.h | 140 ---------------------- xf86dga1const.h | 36 +++++ xf86dga1proto.h | 195 ++++++++++++++++++++++++++++++ xf86dga1str.h | 197 ------------------------------- xf86dgaconst.h | 96 +++++++++++++++ xf86dgaproto.h | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ xf86dgastr.h | 347 ------------------------------------------------------- 15 files changed, 822 insertions(+), 946 deletions(-)
New commits: commit 1792fdc8f1c3a4775b6fe241dfd35ae0e46b3470 Author: Timo Aaltonen <[email protected]> Date: Sat Nov 21 11:20:59 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 8fdc8d3..21f6777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +commit 743fb528f6ef9d29edcb841fc0effbbf9a4837c4 +Author: Peter Hutterer <[email protected]> +Date: Thu Oct 1 19:51:43 2009 +1000 + + xf86dgaproto 2.1 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 647fbb2493d16248d37fbd864ae48a4f18c01644 +Author: Peter Hutterer <[email protected]> +Date: Thu Oct 1 19:48:07 2009 +1000 + + Require macros 1.3 for XORG_DEFAULT_OPTIONS + + Signed-off-by: Peter Hutterer <[email protected]> + +commit db4cb300dec74c9198a4f04aafd20042fe2d1fd9 +Author: Carl Worth <[email protected]> +Date: Wed Sep 16 17:03:30 2009 -0700 + + Change xf86dga.h to only conditionally include server's header file. + + The recent re-addition of the xf86dga.h file introduced an + incompatibility with a recent, but unreleased version of libXxf86dga + which also wanted to install a file of the same name. Instead, we + allow the proto package to own this file, and include the library's + version (now to be named Xxf86dga.h) unless we're building an old + server (indicated by _XF86DGA_SERVER_). + +commit 047a1ebbbcea3ad78a06f0fa8450fa8ba38be43d +Author: Carl Worth <[email protected]> +Date: Wed Sep 16 15:40:02 2009 -0700 + + Add back xf86dga.h (simply including the newly named xf86dgaconst.h) + + This maintains compatibility so that previous X servers, (such as + xserver 1.6 can still be built). + commit f3cfa9e3aa654305a702d97014f726ae5d900a46 Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 10:54:30 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 4742d09..4a4d97f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-xf86dga (2.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen <[email protected]> Sat, 21 Nov 2009 11:20:21 +0200 + x11proto-xf86dga (2.0.99.1-1) experimental; urgency=low * Bump debhelper compat level to 5. commit 743fb528f6ef9d29edcb841fc0effbbf9a4837c4 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 19:51:43 2009 +1000 xf86dgaproto 2.1 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 908fa12..eb75046 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86DGAProto], [2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_DEFAULT_OPTIONS commit 647fbb2493d16248d37fbd864ae48a4f18c01644 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 19:48:07 2009 +1000 Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 8c81de9..908fa12 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) + +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile xf86dgaproto.pc]) commit bbb6fdaf40b30c4d283e7cf4848d4c18f375e1c6 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 11:46:33 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 6b149e2..4742d09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-xf86dga (2.0.99.1-1) UNRELEASED; urgency=low +x11proto-xf86dga (2.0.99.1-1) experimental; urgency=low * Bump debhelper compat level to 5. * Run autoreconf at build time. @@ -12,7 +12,7 @@ x11proto-xf86dga (2.0.99.1-1) UNRELEASED; urgency=low * Break old libxxf86dga-dev. * Add copyright notices to debian/copyright [lintian] - -- Julien Cristau <[email protected]> Sun, 13 Sep 2009 20:09:59 +0200 + -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 11:46:17 +0200 x11proto-xf86dga (2.0.3-1) unstable; urgency=low commit db4cb300dec74c9198a4f04aafd20042fe2d1fd9 Author: Carl Worth <[email protected]> Date: Wed Sep 16 17:03:30 2009 -0700 Change xf86dga.h to only conditionally include server's header file. The recent re-addition of the xf86dga.h file introduced an incompatibility with a recent, but unreleased version of libXxf86dga which also wanted to install a file of the same name. Instead, we allow the proto package to own this file, and include the library's version (now to be named Xxf86dga.h) unless we're building an old server (indicated by _XF86DGA_SERVER_). diff --git a/configure.ac b/configure.ac index d517c3a..8c81de9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86DGAProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG diff --git a/xf86dga.h b/xf86dga.h index 6d39268..7b5d635 100644 --- a/xf86dga.h +++ b/xf86dga.h @@ -1,3 +1,13 @@ +#ifdef _XF86DGA_SERVER_ + #warning "xf86dga.h is obsolete and may be removed in the future." #warning "include <X11/extensions/xf86dgaconst.h> instead." #include <X11/extensions/xf86dgaconst.h> + +#else + +#warning "xf86dga.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/Xxf86dga.h> instead." +#include <X11/extensions/Xxf86dga.h> + +#endif commit 047a1ebbbcea3ad78a06f0fa8450fa8ba38be43d Author: Carl Worth <[email protected]> Date: Wed Sep 16 15:40:02 2009 -0700 Add back xf86dga.h (simply including the newly named xf86dgaconst.h) This maintains compatibility so that previous X servers, (such as xserver 1.6 can still be built). diff --git a/Makefile.am b/Makefile.am index abae9b4..babced4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ xf86dgadir = $(includedir)/X11/extensions xf86dga_HEADERS = \ + xf86dga.h \ xf86dga1const.h \ xf86dga1str.h \ xf86dga1proto.h \ diff --git a/xf86dga.h b/xf86dga.h new file mode 100644 index 0000000..6d39268 --- /dev/null +++ b/xf86dga.h @@ -0,0 +1,3 @@ +#warning "xf86dga.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/xf86dgaconst.h> instead." +#include <X11/extensions/xf86dgaconst.h> commit 4c9f87dc7d8ea4210c5872d2fd2105dbee285990 Author: Julien Cristau <[email protected]> Date: Sun Sep 13 20:30:35 2009 +0200 Add copyright notices to debian/copyright [lintian] diff --git a/debian/changelog b/debian/changelog index 81c410f..6b149e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x11proto-xf86dga (2.0.99.1-1) UNRELEASED; urgency=low * New upstream release. + Xlib headers moved to libXxf86dga * Break old libxxf86dga-dev. + * Add copyright notices to debian/copyright [lintian] -- Julien Cristau <[email protected]> Sun, 13 Sep 2009 20:09:59 +0200 diff --git a/debian/copyright b/debian/copyright index 0ddb396..fef62f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,10 @@ This package was downloaded from http://xorg.freedesktop.org/releases/individual/proto/ +Copyright (c) 1995 Jon Tombs +Copyright (c) 1995 XFree86 Inc. +Copyright (c) 1999 XFree86 Inc + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights commit 0d4aeed7bf35180e64afd855451266804a498834 Author: Julien Cristau <[email protected]> Date: Sun Sep 13 20:26:20 2009 +0200 Break old libxxf86dga-dev. diff --git a/debian/changelog b/debian/changelog index c0eff92..81c410f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x11proto-xf86dga (2.0.99.1-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. * New upstream release. + Xlib headers moved to libXxf86dga + * Break old libxxf86dga-dev. -- Julien Cristau <[email protected]> Sun, 13 Sep 2009 20:09:59 +0200 diff --git a/debian/control b/debian/control index 3229d54..5cc6010 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xf86dga.git Package: x11proto-xf86dga-dev Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev +Breaks: libxxf86dga-dev (<< 2:1.0.99.1) Description: X11 Direct Graphics Access extension wire protocol This package provides development headers describing the wire protocol for the XFree86-DGA extension, which provides direct, framebuffer-like, commit c20081a2c6820140f1a5070cbeaf7b4a14098e2e Author: Julien Cristau <[email protected]> Date: Sun Sep 13 20:24:42 2009 +0200 Bump xutils-dev build-dep for new util-macros diff --git a/debian/control b/debian/control index 62913b9..3229d54 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Andres Salomon <dilin...@debian. Build-Depends: debhelper (>= 5.0.0), automake, - xutils-dev + xutils-dev (>= 1:7.4+4) Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xf86dga Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xf86dga.git commit 43da462895dcc8e5dd40602a5a68fe20f3b246ca Author: Julien Cristau <[email protected]> Date: Sun Sep 13 20:24:02 2009 +0200 Bump changelog diff --git a/debian/changelog b/debian/changelog index 52b286d..c0eff92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-xf86dga (2.0.3-2) UNRELEASED; urgency=low +x11proto-xf86dga (2.0.99.1-1) UNRELEASED; urgency=low * Bump debhelper compat level to 5. * Run autoreconf at build time. @@ -7,6 +7,8 @@ x11proto-xf86dga (2.0.3-2) UNRELEASED; urgency=low and libxxf86dga-dev. This was only needed for upgrades from sarge. * Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N. * Bump Standards-Version to 3.8.3. + * New upstream release. + + Xlib headers moved to libXxf86dga -- Julien Cristau <[email protected]> Sun, 13 Sep 2009 20:09:59 +0200 commit f3cfa9e3aa654305a702d97014f726ae5d900a46 Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 10:54:30 2009 +1000 Bump version to 2.0.99.1 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 7333512..d517c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86DGAProto], [2.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86DGAProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit a111c2e7826df36c937b83639e929dfb50179873 Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 14:13:46 2009 +1000 Include the *const.h files from the proto files. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/xf86dga1proto.h b/xf86dga1proto.h index d0f72c8..5c53cb2 100644 --- a/xf86dga1proto.h +++ b/xf86dga1proto.h @@ -8,6 +8,8 @@ Copyright (c) 1995 XFree86 Inc. #ifndef _XF86DGAPROTO1_H_ #define _XF86DGAPROTO1_H_ +#include <X11/extensions/xf86dga1const.h> + typedef struct _XF86DGAQueryVersion { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_DGAQueryVersion */ diff --git a/xf86dgaproto.h b/xf86dgaproto.h index 8e36dce..8b7f13d 100644 --- a/xf86dgaproto.h +++ b/xf86dgaproto.h @@ -9,6 +9,7 @@ Copyright (c) 1995 XFree86 Inc. #define _XF86DGAPROTO_H_ #include <X11/extensions/xf86dga1proto.h> +#include <X11/extensions/xf86dgaconst.h> #define XF86DGANAME "XFree86-DGA" commit e02a56a6a62b03ae646937638c07fd33ac98d3ed Author: Peter Hutterer <[email protected]> Date: Wed Aug 26 16:33:48 2009 +1000 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 <[email protected]> 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 + -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
