Hello community, here is the log from the commit of package xf86-video-i128 for openSUSE:Factory checked in at 2012-09-20 15:47:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-i128 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-i128.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-i128", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-i128/xf86-video-i128.changes 2012-05-08 12:04:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-i128.new/xf86-video-i128.changes 2012-09-20 15:48:21.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 17 12:40:02 UTC 2012 - [email protected] + +- Update to version 1.3.6 + * convert to compat API. + * build against xaa-less server. + +------------------------------------------------------------------- Old: ---- xf86-video-i128-1.3.5.tar.bz2 New: ---- xf86-video-i128-1.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-i128.spec ++++++ --- /var/tmp/diff_new_pack.DDbfrE/_old 2012-09-20 15:48:22.000000000 +0200 +++ /var/tmp/diff_new_pack.DDbfrE/_new 2012-09-20 15:48:22.000000000 +0200 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xf86-video-i128 -Version: 1.3.5 +Version: 1.3.6 Release: 0 -License: MIT Summary: Number 9 I128 video driver for the Xorg X server -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Servers/XF86_4 +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) ++++++ xf86-video-i128-1.3.5.tar.bz2 -> xf86-video-i128-1.3.6.tar.bz2 ++++++ ++++ 26027 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/ChangeLog new/xf86-video-i128-1.3.6/ChangeLog --- old/xf86-video-i128-1.3.5/ChangeLog 2012-03-24 02:52:41.000000000 +0100 +++ new/xf86-video-i128-1.3.6/ChangeLog 2012-07-17 08:21:01.000000000 +0200 @@ -1,3 +1,29 @@ +commit da79e51c46b9394b17927a3234af90376ad69b00 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 17 16:05:09 2012 +1000 + + xf86-video-i128: bump to version 1.3.6 + + Signed-off-by: Dave Airlie <[email protected]> + +commit c829ff70025e927bdec58e270e80c7097537a567 +Author: Dave Airlie <[email protected]> +Date: Mon Jul 16 18:23:39 2012 +1000 + + i128: build against xaa-less server. + + Signed-off-by: Dave Airlie <[email protected]> + +commit 659390ecdb36bb5e65b41a867257f3b9583e45de +Author: Dave Airlie <[email protected]> +Date: Wed Jun 6 12:44:53 2012 +0100 + + i128: convert to compat API. + + convert i128 to new compat API. + + Signed-off-by: Dave Airlie <[email protected]> + commit 2228b7f80cc2f2a13dc00fd659b592407f1bbef1 Author: Alan Coopersmith <[email protected]> Date: Fri Mar 23 18:51:51 2012 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/config.h.in new/xf86-video-i128-1.3.6/config.h.in --- old/xf86-video-i128-1.3.5/config.h.in 2012-03-24 02:52:12.000000000 +0100 +++ new/xf86-video-i128-1.3.6/config.h.in 2012-07-17 08:21:01.000000000 +0200 @@ -35,6 +35,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <xaa.h> header file. */ +#undef HAVE_XAA_H + /* Have 1bpp support */ #undef HAVE_XF1BPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/configure.ac new/xf86-video-i128-1.3.6/configure.ac --- old/xf86-video-i128-1.3.5/configure.ac 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/configure.ac 2012-07-17 08:00:16.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-i128], - [1.3.5], + [1.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-i128]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -78,6 +78,25 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +AC_MSG_RESULT([$XAA]) + # Required by exa.h AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/missing new/xf86-video-i128-1.3.6/missing --- old/xf86-video-i128-1.3.5/missing 2012-03-24 02:52:13.000000000 +0100 +++ new/xf86-video-i128-1.3.6/missing 2012-06-06 13:35:53.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/Makefile.am new/xf86-video-i128-1.3.6/src/Makefile.am --- old/xf86-video-i128-1.3.5/src/Makefile.am 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/Makefile.am 2012-06-06 13:34:59.000000000 +0200 @@ -29,6 +29,7 @@ i128_drv_ladir = @moduledir@/drivers i128_drv_la_SOURCES = \ + compat-api.h \ i128accel.c \ i128dga.c \ i128exa.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/compat-api.h new/xf86-video-i128-1.3.6/src/compat-api.h --- old/xf86-video-i128-1.3.5/src/compat-api.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/compat-api.h 2012-06-06 13:37:23.000000000 +0200 @@ -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 <[email protected]> + */ + +/* 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/i128.h new/xf86-video-i128-1.3.6/src/i128.h --- old/xf86-video-i128-1.3.5/src/i128.h 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/i128.h 2012-07-17 07:21:15.000000000 +0200 @@ -14,7 +14,9 @@ #include "i128pcirename.h" #include "compiler.h" +#ifdef HAVE_XAA_H #include "xaa.h" +#endif #include "exa.h" #include "xf86Cursor.h" #include "vgaHW.h" @@ -22,6 +24,7 @@ #include "xf86DDC.h" #include "i128reg.h" +#include "compat-api.h" struct source_format { int render_format; int i128_format; @@ -114,7 +117,9 @@ int minClock; CloseScreenProcPtr CloseScreen; +#ifdef HAVE_XAA_H XAAInfoRecPtr XaaInfoRec; +#endif ExaDriverPtr ExaDriver; xf86CursorInfoPtr CursorInfoRec; I2CBusPtr I2C; @@ -133,8 +138,8 @@ /* Prototypes */ -void I128AdjustFrame(int scrnIndex, int x, int y, int flags); -Bool I128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +void I128AdjustFrame(ADJUST_FRAME_ARGS_DECL); +Bool I128SwitchMode(SWITCH_MODE_ARGS_DECL); Bool I128HWCursorInit(ScreenPtr pScreen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/i128IBMDAC.c new/xf86-video-i128-1.3.6/src/i128IBMDAC.c --- old/xf86-video-i128-1.3.5/src/i128IBMDAC.c 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/i128IBMDAC.c 2012-06-06 13:37:23.000000000 +0200 @@ -50,7 +50,7 @@ I128IBMHWCursorInit(ScrnInfoPtr pScrn) { xf86CursorInfoPtr infoPtr; - ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; + ScreenPtr pScreen = xf86ScrnToScreen(pScrn); I128Ptr pI128 = I128PTR(pScrn); if (!pI128->HWCursor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/i128_driver.c new/xf86-video-i128-1.3.6/src/i128_driver.c --- old/xf86-video-i128-1.3.5/src/i128_driver.c 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/i128_driver.c 2012-07-17 07:21:15.000000000 +0200 @@ -57,7 +57,6 @@ #include "xf86DDC.h" #include "vbe.h" -#include "xaa.h" #include "xf86cmap.h" #include "fb.h" @@ -79,19 +78,18 @@ static void I128Identify(int flags); static Bool I128Probe(DriverPtr drv, int flags); static Bool I128PreInit(ScrnInfoPtr pScrn, int flags); -static Bool I128ScreenInit(int Index, ScreenPtr pScreen, int argc, - char **argv); -static Bool I128EnterVT(int scrnIndex, int flags); -static void I128LeaveVT(int scrnIndex, int flags); -static Bool I128CloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool I128ScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool I128EnterVT(VT_FUNC_ARGS_DECL); +static void I128LeaveVT(VT_FUNC_ARGS_DECL); +static Bool I128CloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool I128SaveScreen(ScreenPtr pScreen, int mode); static void I128DumpBaseRegisters(ScrnInfoPtr pScrn); static void I128DumpIBMDACRegisters(ScrnInfoPtr pScrn, volatile CARD32 *vrbg); /* Optional functions */ -static void I128FreeScreen(int scrnIndex, int flags); -static ModeStatus I128ValidMode(int scrnIndex, DisplayModePtr mode, +static void I128FreeScreen(FREE_SCREEN_ARGS_DECL); +static ModeStatus I128ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags); static void I128DisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, @@ -1406,9 +1404,10 @@ /* Usually mandatory */ Bool -I128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +I128SwitchMode(SWITCH_MODE_ARGS_DECL) { - return I128ModeInit(xf86Screens[scrnIndex], mode); + SCRN_INFO_PTR(arg); + return I128ModeInit(pScrn, mode); } @@ -1442,7 +1441,7 @@ /* This gets called at the start of each server generation */ static Bool -I128ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +I128ScreenInit(SCREEN_INIT_ARGS_DECL) { ScrnInfoPtr pScrn; I128Ptr pI128; @@ -1454,7 +1453,7 @@ /* * First get the ScrnInfoRec */ - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pI128 = I128PTR(pScrn); @@ -1477,7 +1476,7 @@ /* Darken the screen for aesthetic reasons and set the viewport */ I128SaveScreen(pScreen, SCREEN_SAVER_ON); - pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + pScrn->AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); /* * The next step is to setup the screen's visuals, and initialise the @@ -1628,14 +1627,13 @@ */ /* Usually mandatory */ void -I128AdjustFrame(int scrnIndex, int x, int y, int flags) +I128AdjustFrame(ADJUST_FRAME_ARGS_DECL) { - ScrnInfoPtr pScrn; + SCRN_INFO_PTR(arg); int Base; I128Ptr pI128; #define I128_PAN_MASK 0x01FFFFE0 - pScrn = xf86Screens[scrnIndex]; pI128 = I128PTR(pScrn); if (pI128->ShowCache && y && pScrn->vtSema) @@ -1661,13 +1659,13 @@ /* Mandatory */ static Bool -I128EnterVT(int scrnIndex, int flags) +I128EnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); if (!I128ModeInit(pScrn, pScrn->currentMode)) return FALSE; - I128AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + I128AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); return TRUE; } @@ -1679,9 +1677,9 @@ /* Mandatory */ static void -I128LeaveVT(int scrnIndex, int flags) +I128LeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); I128Restore(pScrn); } @@ -1696,17 +1694,19 @@ /* Mandatory */ static Bool -I128CloseScreen(int scrnIndex, ScreenPtr pScreen) +I128CloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); if (pScrn->vtSema) { I128Restore(pScrn); I128UnmapMem(pScrn); } +#ifdef HAVE_XAA_H if (pI128->XaaInfoRec) XAADestroyInfoRec(pI128->XaaInfoRec); +#endif if (pI128->ExaDriver) { exaDriverFini(pScreen); free(pI128->ExaDriver); @@ -1718,7 +1718,7 @@ pScrn->vtSema = FALSE; pScreen->CloseScreen = pI128->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } @@ -1726,16 +1726,17 @@ /* Optional */ static void -I128FreeScreen(int scrnIndex, int flags) +I128FreeScreen(FREE_SCREEN_ARGS_DECL) { + SCRN_INFO_PTR(arg); /* * This only gets called when a screen is being deleted. It does not * get called routinely at the end of a server generation. */ if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) - vgaHWFreeHWRec(xf86Screens[scrnIndex]); - - I128FreeRec(xf86Screens[scrnIndex]); + vgaHWFreeHWRec(pScrn); + + I128FreeRec(pScrn); } @@ -1743,7 +1744,7 @@ /* Optional */ static ModeStatus -I128ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) +I128ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) { int lace; @@ -1775,7 +1776,7 @@ Bool on; if (pScreen != NULL) - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); on = xf86IsUnblank(mode); @@ -1945,7 +1946,7 @@ } /* Read and output monitor info using DDC2 over I2C bus */ if (pI128->I2C) { - MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pI128->I2C); + MonInfo = xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn), pI128->I2C); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "I2C Monitor info: %p\n", (void *)MonInfo); xf86PrintEDID(MonInfo); @@ -1954,7 +1955,7 @@ if (!MonInfo) { /* Read and output monitor info using DDC1 */ if (pI128->ddc1Read) { - MonInfo = xf86DoEDID_DDC1(pScrn->scrnIndex, NULL, pI128->ddc1Read ) ; + MonInfo = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), NULL, pI128->ddc1Read ) ; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n", (void *)MonInfo); xf86PrintEDID(MonInfo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/i128accel.c new/xf86-video-i128-1.3.6/src/i128accel.c --- old/xf86-video-i128-1.3.5/src/i128accel.c 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/i128accel.c 2012-07-17 07:21:15.000000000 +0200 @@ -26,8 +26,7 @@ #include "config.h" #endif -#include "xaa.h" -#include "xaalocal.h" + #include "xf86fbman.h" #include "miline.h" #include "servermd.h" @@ -40,6 +39,9 @@ #include "i128.h" #include "i128reg.h" +#ifdef HAVE_XAA_H +#include "xaalocal.h" + static void I128BitBlit(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int w, int h); static void I128SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, @@ -62,6 +64,7 @@ unsigned planemask); #endif +#endif #define ENG_PIPELINE_READY() { while (pI128->mem.rbase_a[BUSY] & BUSY_BUSY) ; } #define ENG_DONE() { while (pI128->mem.rbase_a[FLOW] & (FLOW_DEB | FLOW_MCB | FLOW_PRV)) ;} @@ -100,7 +103,7 @@ ENG_DONE(); } - +#ifdef HAVE_XAA_H static void I128BitBlit(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int w, int h) { @@ -412,11 +415,14 @@ } #endif +#endif + Bool I128XaaInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); BoxRec AvailFBArea; CARD32 buf_ctrl; @@ -519,4 +525,7 @@ } return(XAAInit(pScreen, infoPtr)); +#else + return FALSE; +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/i128dga.c new/xf86-video-i128-1.3.6/src/i128dga.c --- old/xf86-video-i128-1.3.5/src/i128dga.c 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/i128dga.c 2012-07-17 07:21:15.000000000 +0200 @@ -7,8 +7,6 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "xaa.h" -#include "xaalocal.h" #include "i128.h" #include "dgaproc.h" @@ -18,12 +16,14 @@ static Bool I128_SetMode(ScrnInfoPtr, DGAModePtr); static int I128_GetViewport(ScrnInfoPtr); static void I128_SetViewport(ScrnInfoPtr, int, int, int); +#ifdef HAVE_XAA_H static void I128_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); static void I128_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); #if 0 static void I128_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, unsigned long); #endif +#endif static DGAFunctionRec I128_DGAFuncs = { @@ -33,6 +33,7 @@ I128_SetViewport, I128_GetViewport, I128EngineDone, +#ifdef HAVE_XAA_H I128_FillRect, I128_BlitRect, #if 0 @@ -40,13 +41,16 @@ #else NULL #endif +#else + NULL, NULL, NULL +#endif }; Bool I128DGAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); DGAModePtr modes = NULL, newmodes = NULL, currentMode; DisplayModePtr pMode, firstMode; @@ -153,7 +157,7 @@ pScrn->displayWidth = OldDisplayWidth[index]; - I128SwitchMode(index, pScrn->currentMode, 0); + I128SwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); pI128->DGAactive = FALSE; } else { if(!pI128->DGAactive) { /* save the old parameters */ @@ -165,7 +169,7 @@ pScrn->displayWidth = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3); - I128SwitchMode(index, pMode->mode, 0); + I128SwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode)); } return TRUE; @@ -190,10 +194,11 @@ ){ I128Ptr pI128 = I128PTR(pScrn); - I128AdjustFrame(pScrn->pScreen->myNum, x, y, flags); + I128AdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y)); pI128->DGAViewportStatus = 0; /* I128AdjustFrame loops until finished */ } +#ifdef HAVE_XAA_H static void I128_FillRect ( ScrnInfoPtr pScrn, @@ -253,7 +258,7 @@ } } #endif - +#endif static Bool I128_OpenFramebuffer( ScrnInfoPtr pScrn, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.3.5/src/i128exa.c new/xf86-video-i128-1.3.6/src/i128exa.c --- old/xf86-video-i128-1.3.5/src/i128exa.c 2012-03-24 02:52:04.000000000 +0100 +++ new/xf86-video-i128-1.3.6/src/i128exa.c 2012-06-06 13:37:23.000000000 +0200 @@ -41,11 +41,11 @@ #include "i128reg.h" #define PI128_FROM_PIXMAP(x) \ - I128Ptr pI128 = I128PTR(xf86Screens[x->drawable.pScreen->myNum]) + I128Ptr pI128 = I128PTR(xf86ScreenToScrn(x->drawable.pScreen)) #define PI128_FROM_SCREEN(x) \ - I128Ptr pI128 = I128PTR(xf86Screens[x->myNum]) + I128Ptr pI128 = I128PTR(xf86ScreenToScrn(x)) #define PI128_FROM_PICTURE(x) \ - I128Ptr pI128 = I128PTR(xf86Screens[x->pDrawable->pScreen->myNum]) + I128Ptr pI128 = I128PTR(xf86ScreenToScrn(x->pDrawable->pScreen)) /* we might be able to do something smarter than this */ #define ENG_PIPELINE_READY() \ @@ -604,7 +604,7 @@ I128ExaInit(ScreenPtr pScreen) { ExaDriverPtr pExa; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); if (!(pExa = exaDriverAlloc())) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
