diff options
author | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:36:22 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:36:22 +0100 |
commit | 20fcd59d3f8d7393586d8b64bfac18adede726ca (patch) | |
tree | c83b7e6493b964430984b5a2373298d67c7c75f7 | |
parent | a78d524cfb332909dba89df5d709081515f0ed36 (diff) |
dummy: add scrn conversion api compat header.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/compat-api.h | 41 | ||||
-rw-r--r-- | src/dummy.h | 2 |
3 files changed, 44 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4bc9242..da1dd9a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,7 @@ dummy_drv_la_LIBADD = $(XORG_LIBS) dummy_drv_ladir = @moduledir@/drivers dummy_drv_la_SOURCES = \ + compat-api.h \ dummy_cursor.c \ dummy_driver.c \ dummy.h diff --git a/src/compat-api.h b/src/compat-api.h new file mode 100644 index 0000000..1bb7724 --- /dev/null +++ b/src/compat-api.h @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Red Hat, 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 to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie <airlied@redhat.com> + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#endif diff --git a/src/dummy.h b/src/dummy.h index 966ab02..24279a2 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -11,6 +11,8 @@ #endif #include <string.h> +#include "compat-api.h" + /* Supported chipsets */ typedef enum { DUMMY_CHIP |