ChangeLog | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2
debian/changelog | 13 ++
debian/control | 2
src/Makefile.am | 3
src/compat-api.h | 99 ++++++++++++++++++++
src/sisusb.h | 6 +
src/sisusb_accel.c | 2
src/sisusb_cursor.c | 6 -
src/sisusb_driver.c | 56 +++++------
src/sisusb_driver.h | 16 +--
src/sisusb_vga.c | 2
src/sisusb_video.c | 6 -
13 files changed, 416 insertions(+), 49 deletions(-)
New commits:
commit 5ea76e0c4767a4ca28301703e3a77a27a1d49308
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Sep 25 13:08:22 2013 +0200
Release to unstable.
diff --git a/debian/changelog b/debian/changelog
index d3654c5..eee30c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sisusb (1:0.9.6-2) unstable; urgency=low
+
+ * Release to unstable.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 25 Sep 2013
13:07:42 +0200
+
xserver-xorg-video-sisusb (1:0.9.6-1) experimental; urgency=low
* New upstream release.
commit 7b8c54f23258e5c9b5a06f600cf358b23d303c38
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Sep 25 13:06:31 2013 +0200
release to experimental
diff --git a/ChangeLog b/ChangeLog
index 5e1e0a2..3562c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit 293d0902705c272b83432a955fb6a3c96dd6cea7
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Sep 25 08:54:52 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
commit 894814fe2e54517c3b9a728238542a409bcb783a
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 7e88d39..d3654c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xserver-xorg-video-sisusb (1:0.9.6-1) UNRELEASED; urgency=low
+xserver-xorg-video-sisusb (1:0.9.6-1) experimental; urgency=low
* New upstream release.
+ * Grab some patches to fix building from git.
-- Maarten Lankhorst <maarten.lankho...@canonical.com> Thu, 19 Jul 2012
13:15:44 +0200
commit 293d0902705c272b83432a955fb6a3c96dd6cea7
Author: Adam Jackson <a...@redhat.com>
Date: Tue Sep 25 08:54:52 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 539b9f1..0fdc8e9 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -39,7 +39,6 @@
#include "shadowfb.h"
#include "micmap.h"
#include "mipointer.h"
-#include "mibstore.h"
#include "sisusb_regs.h"
#include "sisusb_dac.h"
@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
/* Initialize the accelerators */
SiSUSBAccelInit(pScreen);
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* NO SilkenMouse. Never. Ever. */
commit 62b81fa6209d796d7f5e8d1b360a583378d51ace
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Jul 19 13:16:16 2012 +0200
New upstream release.
diff --git a/ChangeLog b/ChangeLog
index ce5e334..5e1e0a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,247 @@
+commit 894814fe2e54517c3b9a728238542a409bcb783a
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 17 16:05:09 2012 +1000
+
+ xf86-video-sisusb: bump to version 0.9.6
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 1a278211f732a035cf08b4d2d614cb3b8919f89d
+Author: Dave Airlie <airl...@gmail.com>
+Date: Sun Jul 15 20:01:57 2012 +1000
+
+ sisub: don't require xaa
+
+ it doesn't use xaa at all.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit a5904352bd7f378cebfe1d4d20966143f656bae3
+Author: Dave Airlie <airl...@gmail.com>
+Date: Sun Jul 15 20:01:30 2012 +1000
+
+ sisusb: fix build since compat-api
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 414c3ae620f48d31d264b7de0141d5cd4b5a1893
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Jul 2 13:23:21 2012 +0100
+
+ sisusb: bump to 0.9.5 release
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit de082dae48030b8a5c1cc2474fe3008170d62eea
+Author: Dave Airlie <airl...@redhat.com>
+Date: Wed Jun 6 12:28:19 2012 +0100
+
+ sisusb: add support for compat API.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 02451944ba73887db9803f44a1826059d9105963
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Tue Nov 1 23:05:45 2011 -0700
+
+ Build fix for -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 2901c9cf5e842cef199676e76cd0ffa532a76a9b
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Tue Nov 1 22:57:33 2011 -0700
+
+ Use unsigned long rather than deprecated IOADDRESS
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 6272e69d8519c43293192b48ff39c8b3a84635d3
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Oct 7 12:45:00 2011 -0700
+
+ Fix build failures with recent server changes to swapl and swaps
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit dc6d77656d14853b462a8792007e73c5dc07a4b1
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Oct 7 12:45:50 2011 -0700
+
+ Also use calloc rather than xcalloc
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 3dc05f643235e78c2b9148c052a6bc45290fb34a
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Sep 24 14:02:12 2011 -0700
+
+ Use malloc/free rather than xalloc/xfree
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit b2fe8b0fd3b9776577a76d79a9c55ff6643040e6
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Sep 24 14:00:29 2011 -0700
+
+ Include xf86Pci.h for IOADDRESS
+
+ My previous commit incorrectly included pciaccess.h
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 91720979dc7e9fe068fd904dd40900ed1d19e03d
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Thu Sep 15 14:45:25 2011 -0700
+
+ Require libpciaccess
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 4968496bdd96d2351ea2aec05feee41b0612140c
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Thu Sep 15 14:42:48 2011 -0700
+
+ Add missing include for pciaccess.h
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 241dd519e910d8a07483dc9506ebcbc1fb9c9e0f
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Jun 4 21:00:03 2011 -0700
+
+ Convert sisusb.man from XORG_RAWCPP to using sed like other drivers
+
+ Upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 471636eca6e00de7daddfc7785ca90dba1eb0cb1
+Author: Thierry Vignaud <thierry.vign...@gmail.com>
+Date: Fri Dec 3 09:39:58 2010 +0000
+
+ Fix compilation with -Werror=format-security (bug #31540)
+
+ Not actually a security bug, but shuts gcc up at least.
+
+ Signed-off-by: Thierry Vignaud <thierry.vign...@gmail.com>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 8253e3db081656f592461a6960ce71db36b4844e
+Author: Jesse Adkins <jesserayadk...@gmail.com>
+Date: Tue Sep 28 13:29:51 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadk...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0a9d98a6effd599cffff36542c39f97728abb038
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 6a97c2386aa6c775018f5acd57b446feab6f438c
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 53b453424f95f79086233f2bc854418b7e77552a
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 2e4b19e73aba988ba58477c4b399484d40f81931
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 1f89c41d0b3a340db089c56a29ee943d66496a86
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit f47c5a6436a57c899fc30fa88450ef9c02176b0c
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 63ae8222aea5f3e2d9150b2612679c27168e06d9
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 6c4fa6e431771e379b782a70a30aeb16eb736e08
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 0ef3ef6099ca89380aa49fadea47ceba87aaac24
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit b46fe5c94c68039a748ad8772bc0bf961b3e1c64
+Author: Fernando Carrijo <fcarr...@yahoo.com.br>
+Date: Thu Jul 1 07:17:18 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarr...@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vigna...@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 43eab862e5cf0bfa9e7c8bb570651e94c067c451
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Jul 5 15:01:24 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index e9e1dd2..7e88d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sisusb (1:0.9.6-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankho...@canonical.com> Thu, 19 Jul 2012
13:15:44 +0200
+
xserver-xorg-video-sisusb (1:0.9.4-3) unstable; urgency=low
* Merge from upstream master branch up to 02451944ba to fix the
diff --git a/debian/control b/debian/control
index c24422d..fdbe35b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
xutils-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sisusb.git
commit 894814fe2e54517c3b9a728238542a409bcb783a
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-sisusb: bump to version 0.9.6
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/configure.ac b/configure.ac
index de75eda..a686034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sisusb],
- [0.9.5],
+ [0.9.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sisusb])
AC_CONFIG_SRCDIR([Makefile.am])
commit 1a278211f732a035cf08b4d2d614cb3b8919f89d
Author: Dave Airlie <airl...@gmail.com>
Date: Sun Jul 15 20:01:57 2012 +1000
sisub: don't require xaa
it doesn't use xaa at all.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/sisusb.h b/src/sisusb.h
index 77f804b..cdd13da 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -86,7 +86,7 @@
#include "xf86.h"
#include "xf86Cursor.h"
#include "xf86cmap.h"
-#include "xaa.h"
+#include "xf86fbman.h"
#define SISUSB_HaveDriverFuncs 0
commit a5904352bd7f378cebfe1d4d20966143f656bae3
Author: Dave Airlie <airl...@gmail.com>
Date: Sun Jul 15 20:01:30 2012 +1000
sisusb: fix build since compat-api
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/sisusb.h b/src/sisusb.h
index f66b701..77f804b 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -113,6 +113,8 @@
#include <X11/extensions/Xv.h>
#endif
+#include "fb.h"
+
#include "compat-api.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 208cdbe..539b9f1 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -37,7 +37,6 @@
#include "dixstruct.h"
#include "shadowfb.h"
-#include "fb.h"
#include "micmap.h"
#include "mipointer.h"
#include "mibstore.h"
commit 414c3ae620f48d31d264b7de0141d5cd4b5a1893
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Jul 2 13:23:21 2012 +0100
sisusb: bump to 0.9.5 release
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 725d6cb..de75eda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sisusb],
- [0.9.4],
+ [0.9.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sisusb])
AC_CONFIG_SRCDIR([Makefile.am])
commit de082dae48030b8a5c1cc2474fe3008170d62eea
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Jun 6 12:28:19 2012 +0100
sisusb: add support for compat API.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e1735f..1f7e4a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,4 +51,5 @@ sisusb_drv_la_SOURCES = \
sisusb_vga.c \
sisusb_video.c \
sisusb_video.h \
- sisusb_videostr.h
+ sisusb_videostr.h \
+ compat-api.h
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..6bc946f
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,99 @@
+/*
+ * 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 <airl...@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
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout,
pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define XF86_SCRN_ARG(x) (x)
+
+#endif
+
+#endif
diff --git a/src/sisusb.h b/src/sisusb.h
index 82ed509..f66b701 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -113,6 +113,8 @@
#include <X11/extensions/Xv.h>
#endif
+#include "compat-api.h"
+
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
#define _swapl(x, n) swapl(x,n)
#define _swaps(x, n) swaps(x,n)
diff --git a/src/sisusb_accel.c b/src/sisusb_accel.c
index d9c0665..c973a4c 100644
--- a/src/sisusb_accel.c
+++ b/src/sisusb_accel.c
@@ -60,7 +60,7 @@ SiSUSBInitializeAccelerator(ScrnInfoPtr pScrn)
Bool
SiSUSBAccelInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
int topFB, reservedFbSize, usableFbSize;
BoxRec Avail;
diff --git a/src/sisusb_cursor.c b/src/sisusb_cursor.c
index b5b3629..9782f9e 100644
--- a/src/sisusb_cursor.c
+++ b/src/sisusb_cursor.c
@@ -156,7 +156,7 @@ SiSUSBLoadCursorImage(ScrnInfoPtr pScrn, UChar *src)
static Bool
SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
DisplayModePtr mode = pSiSUSB->CurrentLayout.mode;
@@ -172,7 +172,7 @@ SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
static Bool
SiSUSBUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
DisplayModePtr mode = pSiSUSB->CurrentLayout.mode;
@@ -261,7 +261,7 @@ static void SiSUSBLoadCursorImageARGB(ScrnInfoPtr pScrn,
CursorPtr pCurs)
Bool
SiSUSBHWCursorInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
xf86CursorInfoPtr infoPtr;
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 032225c..208cdbe 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -1638,10 +1638,10 @@ SISUSBBridgeRestore(ScrnInfoPtr pScrn)
/* Our generic BlockHandler for Xv */
static void
-SISUSBBlockHandler(int i, pointer blockData, pointer pTimeout, pointer
pReadmask)
+SISUSBBlockHandler(BLOCKHANDLER_ARGS_DECL)
{
- ScreenPtr pScreen = screenInfo.screens[i];
- ScrnInfoPtr pScrn = xf86Screens[i];
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
if((pSiSUSB->sisusbfatalerror) && (pSiSUSB->timeout != -1)) {
@@ -1651,7 +1651,7 @@ SISUSBBlockHandler(int i, pointer blockData, pointer
pTimeout, pointer pReadmask
pSiSUSB->sisusberrorsleepcount = 0;
pSiSUSB->sisusbfatalerror = 0;
pSiSUSB->sisusbdevopen = TRUE;
- (*pScrn->SwitchMode)(pScrn->scrnIndex, pScrn->currentMode, 0);
+ (*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode));
pSiSUSB->ShBoxcount = 1;
pSiSUSB->ShXmin = pSiSUSB->ShYmin = 0;
pSiSUSB->ShXmax = pScrn->virtualX;
@@ -1669,7 +1669,7 @@ SISUSBBlockHandler(int i, pointer blockData, pointer
pTimeout, pointer pReadmask
SISUSBDoRefreshArea(pScrn);
pScreen->BlockHandler = pSiSUSB->BlockHandler;
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
pScreen->BlockHandler = SISUSBBlockHandler;
if(pSiSUSB->VideoTimerCallback) {
@@ -1686,9 +1686,9 @@ SISUSBBlockHandler(int i, pointer blockData, pointer
pTimeout, pointer pReadmask
* depth, bitsPerPixel)
*/
static Bool
-SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
int ret;
VisualPtr visual;
@@ -1784,7 +1784,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
SISUSBSaveScreen(pScreen, SCREEN_SAVER_ON);
/* Set the viewport */
- SISUSBAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ SISUSBAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0,
pScrn->frameY0));
/* Reset visual list. */
miClearVisualTypes();
@@ -2044,13 +2044,13 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
/* Usually mandatory */
Bool
-SISUSBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+SISUSBSwitchMode(SWITCH_MODE_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
if(!pSiSUSB->skipswitchcheck) {
- if(SISUSBValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) {
+ if(SISUSBValidMode(arg, mode, TRUE, 0) != MODE_OK) {
return FALSE;
}
}
@@ -2061,7 +2061,7 @@ SISUSBSwitchMode(int scrnIndex, DisplayModePtr mode, int
flags)
}
#endif
- if(!(SISUSBModeInit(xf86Screens[scrnIndex], mode))) return FALSE;
+ if(!(SISUSBModeInit(pScrn, mode))) return FALSE;
return TRUE;
}
@@ -2089,9 +2089,9 @@ SISUSBSetStartAddressCRT1(SISUSBPtr pSiSUSB, ULong base)
* Usually mandatory
*/
void
-SISUSBAdjustFrame(int scrnIndex, int x, int y, int flags)
+SISUSBAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
ULong base;
@@ -2130,9 +2130,9 @@ SISUSBAdjustFrame(int scrnIndex, int x, int y, int flags)
* Mandatory!
*/
static Bool
-SISUSBEnterVT(int scrnIndex, int flags)
+SISUSBEnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
SiSUSB_SiSFB_Lock(pScrn, TRUE);
@@ -2148,7 +2148,7 @@ SISUSBEnterVT(int scrnIndex, int flags)
return FALSE;
}
- SISUSBAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ SISUSBAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0,
pScrn->frameY0));
if(pSiSUSB->ResetXv) {
(pSiSUSB->ResetXv)(pScrn);
@@ -2163,9 +2163,9 @@ SISUSBEnterVT(int scrnIndex, int flags)
* Mandatory!
*/
static void
-SISUSBLeaveVT(int scrnIndex, int flags)
+SISUSBLeaveVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
if(pSiSUSB->CursorInfoPtr) {
@@ -2197,9 +2197,9 @@ SISUSBLeaveVT(int scrnIndex, int flags)
* Mandatory!
*/
static Bool
-SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen)
+SISUSBCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
if(pSiSUSB->SiSCtrlExtEntry) {
@@ -2273,7 +2273,7 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen)
pScreen->CloseScreen = pSiSUSB->CloseScreen;
- return(*pScreen->CloseScreen)(scrnIndex, pScreen);
+ return(*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
@@ -2281,18 +2281,19 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen)
/* Optional */
static void
-SISUSBFreeScreen(int scrnIndex, int flags)
+SISUSBFreeScreen(FREE_SCREEN_ARGS_DECL)
{
- SISUSBFreeRec(xf86Screens[scrnIndex]);
+ SCRN_INFO_PTR(arg);
+ SISUSBFreeRec(pScrn);
}
/* Checks if a mode is suitable for the selected chipset. */
static ModeStatus
-SISUSBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+SISUSBValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int
flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
if(SiSUSB_CheckModeCRT1(pScrn, mode, pSiSUSB->VBFlags,
pSiSUSB->HaveCustomModes) < 0x14)
diff --git a/src/sisusb_driver.h b/src/sisusb_driver.h
index c4bc1dd..d0002d1 100644
--- a/src/sisusb_driver.h
+++ b/src/sisusb_driver.h
@@ -71,20 +71,20 @@ static const struct _sis_vrate {
static void SISUSBIdentify(int flags);
static Bool SISUSBProbe(DriverPtr drv, int flags);
static Bool SISUSBPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool SISUSBScreenInit(int Index, ScreenPtr pScreen, int argc, char
**argv);
-static Bool SISUSBEnterVT(int scrnIndex, int flags);
-static void SISUSBLeaveVT(int scrnIndex, int flags);
-static Bool SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool SISUSBScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool SISUSBEnterVT(VT_FUNC_ARGS_DECL);
+static void SISUSBLeaveVT(VT_FUNC_ARGS_DECL);
+static Bool SISUSBCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool SISUSBSaveScreen(ScreenPtr pScreen, int mode);
-static Bool SISUSBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-static void SISUSBAdjustFrame(int scrnIndex, int x, int y, int flags);
+static Bool SISUSBSwitchMode(SWITCH_MODE_ARGS_DECL);
+static void SISUSBAdjustFrame(ADJUST_FRAME_ARGS_DECL);
#ifdef SISUSB_HAVE_DRIVER_FUNC
static Bool SISUSBDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
pointer p);
#endif
/* Optional functions */
-static void SISUSBFreeScreen(int scrnIndex, int flags);
-static ModeStatus SISUSBValidMode(int scrnIndex, DisplayModePtr mode,
+static void SISUSBFreeScreen(FREE_SCREEN_ARGS_DECL);
+static ModeStatus SISUSBValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
Bool verbose, int flags);
/* Internally used functions */
diff --git a/src/sisusb_vga.c b/src/sisusb_vga.c
index 404a2b1..1c9761d 100644
--- a/src/sisusb_vga.c
+++ b/src/sisusb_vga.c
@@ -327,7 +327,7 @@ SiSUSBVGASaveScreen(ScreenPtr pScreen, int mode)
if(pScreen == NULL) return FALSE;
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
if(pScrn->vtSema) {
SISUSBVGABlankScreen(pScrn, on);
diff --git a/src/sisusb_video.c b/src/sisusb_video.c
index 1dbf4f1..9340696 100644
--- a/src/sisusb_video.c
+++ b/src/sisusb_video.c
@@ -196,7 +196,7 @@ SISUSBResetXvGamma(ScrnInfoPtr pScrn)
void SISUSBInitVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr newAdaptor = NULL;
int num_adaptors;
@@ -372,7 +372,7 @@ set_maxencoding(SISUSBPtr pSiSUSB, SISUSBPortPrivPtr pPriv)
static XF86VideoAdaptorPtr
SISUSBSetupImageVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
XF86VideoAdaptorPtr adapt;
SISUSBPortPrivPtr pPriv;
@@ -1477,7 +1477,7 @@ SISUSBAllocateOverlayMemory(
xf86FreeOffscreenLinear(linear);
}
- pScreen = screenInfo.screens[pScrn->scrnIndex];
+ pScreen = xf86ScrnToScreen(pScrn);
new_linear = xf86AllocateOffscreenLinear(pScreen, size, 8,
NULL, NULL, NULL);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vomzl-0005y8...@vasks.debian.org
