From 6e29cf8c2927f81e1e5890a46bf03182079cc062 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 5 Jun 2012 11:20:49 +0100 Subject: fbdev: add compat-api + makefile --- src/Makefile.am | 1 + src/compat-api.h | 41 +++++++++++++++++++++++++++++++++++++++++ src/fbdev.c | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 src/compat-api.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 1203177..fbe420e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,4 +29,5 @@ fbdev_drv_la_LDFLAGS = -module -avoid-version fbdev_drv_ladir = @moduledir@/drivers fbdev_drv_la_SOURCES = \ + compat-api.h \ fbdev.c 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 + */ + +/* 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/fbdev.c b/src/fbdev.c index 794adfb..52acef8 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -33,6 +33,8 @@ #include "xf86xv.h" +#include "compat-api.h" + #ifdef XSERVER_LIBPCIACCESS #include #endif -- cgit v1.2.1