summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-06-05 18:40:48 +0100
committerDave Airlie <airlied@redhat.com>2012-06-05 18:40:48 +0100
commit846257efe85d86210470164471df5db3384d8da3 (patch)
treed5b390041e4dae03bf62aa9bc5817d35ef7c8ec6
parent989cf4f1fb2ac57f38d363734b71a5cf749db146 (diff)
chips: add compat API header
-rw-r--r--src/Makefile.am3
-rw-r--r--src/compat-api.h41
-rw-r--r--src/ct_driver.h2
3 files changed, 45 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ebf7ea..b7daac0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,4 +52,5 @@ chips_drv_la_SOURCES = \
ct_pcirename.h \
ct_regs.c \
ct_shadow.c \
- ct_video.c
+ ct_video.c \
+ compat_api.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/ct_driver.h b/src/ct_driver.h
index 9033867..f07555a 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -38,6 +38,8 @@
#include <string.h>
#include <unistd.h>
+#include "compat-api.h"
+
/* Supported chipsets */
typedef enum {
CHIPS_CT65520,