ChangeLog | 292 ++++++++++++++++++++++++++++ configure.ac | 39 +-- debian/changelog | 8 debian/patches/02_debian_prune_nonfree.diff | 14 - man/Makefile.am | 22 -- man/rendition.man | 1 src/Makefile.am | 4 src/accelX.c | 14 - src/rendition.c | 63 +----- src/v1krisc.c | 62 ++--- src/vboard.c | 4 src/vgafont-std.data | 1 src/vgafont-vrx.data | 1 src/vgapalette.data | 1 src/vloaduc.c | 12 - src/vmodes.c | 7 src/vos.h | 12 - src/vramdac.c | 36 +-- src/vtypes.h | 5 19 files changed, 419 insertions(+), 179 deletions(-)
New commits: commit b2ab500748762a6e1d2b71a488550aadfdd6312f Author: Cyril Brulebois <[email protected]> Date: Tue May 1 18:04:35 2012 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index d57f457..e4f078e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-video-rendition (1:4.2.4-3) UNRELEASED; urgency=low +xserver-xorg-video-rendition (1:4.2.4-3) unstable; urgency=low * Merge from upstream master branch up to 7b26793ba2 to cope with the new vgaHW ABI, fixing the FTBFS against X server 1.12. * Update patch accordingly: 02_debian_prune_nonfree.diff - -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 17:53:43 +0200 + -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 18:04:33 +0200 xserver-xorg-video-rendition (1:4.2.4-2) unstable; urgency=low commit ec2d3323ae4b457d99bd49403900c877f070997f Author: Cyril Brulebois <[email protected]> Date: Tue May 1 18:02:00 2012 +0200 Update patch accordingly: 02_debian_prune_nonfree.diff diff --git a/debian/changelog b/debian/changelog index 88dffb1..d57f457 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-rendition (1:4.2.4-3) UNRELEASED; urgency=low * Merge from upstream master branch up to 7b26793ba2 to cope with the new vgaHW ABI, fixing the FTBFS against X server 1.12. + * Update patch accordingly: 02_debian_prune_nonfree.diff -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 17:53:43 +0200 diff --git a/debian/patches/02_debian_prune_nonfree.diff b/debian/patches/02_debian_prune_nonfree.diff index 577dd35..972279c 100644 --- a/debian/patches/02_debian_prune_nonfree.diff +++ b/debian/patches/02_debian_prune_nonfree.diff @@ -1,23 +1,21 @@ -$Id$ - This patch handles the Makefile.am. Obviously an autoreconf is needed while this is applied, but I'm shipping this as a patch so we can easily remember it when changing upstream versions. -Index: xf86-video-rendition-X11R7.0-4.0.1.3/src/Makefile.am -=================================================================== ---- xf86-video-rendition-X11R7.0-4.0.1.3.orig/src/Makefile.am 2006-01-12 22:55:08.000000000 -0500 -+++ xf86-video-rendition-X11R7.0-4.0.1.3/src/Makefile.am 2006-03-07 21:10:39.000000000 -0500 -@@ -59,12 +59,9 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -57,14 +57,11 @@ vtypes.h driverdir = @moduledir@ -dist_driver_DATA = \ - v10002d.uc \ - v20002d.uc -+dist_driver_DATA = ++dist_driver_DATA = EXTRA_DIST = \ + accel.h \ + accelX.c \ - README.uc \ vgafont-std.data \ vgafont-vrx.data \ commit 71f653d40c47f2b7168ac17b7dff0064a7992372 Author: Cyril Brulebois <[email protected]> Date: Tue May 1 17:54:27 2012 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 2c112c5..ac6c38d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,295 @@ +commit 7b26793ba2572c412f03e9a4acf83237fbec71bd +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 17:13:29 2011 -0500 + + Fix for new vgahw ABI + + Signed-off-by: Adam Jackson <[email protected]> + +commit b08572f7b60481eb3b7ab6058b74a56fd646d133 +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 17:11:45 2011 -0500 + + Unhook the pretense of XAA support + + This has never shipped enabled in any Xorg release. I'm pretty sure the + same is true of XFree86 4.x releases. + + Signed-off-by: Adam Jackson <[email protected]> + +commit 810c279e9106a96aa6c6d395610ade3cd1b61fba +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 19 00:31:41 2011 -0700 + + Include <unistd.h> for usleep + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 99d960880e3aedc35238e26841e13e12f317395d +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 19 00:31:05 2011 -0700 + + Build fix for ABI Version 12 + + ABI Version 12 removes support for multiple PCI domains. If you need to + use this driver on a system with more than one PCI domain, you should + either port this driver to using libpciaccess directly or stick with an + older server. + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit efcd0f31433ddbcf04ca040f8474f6cb8a080271 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 19 00:29:28 2011 -0700 + + Use unsigned long rather than deprecated IOADDRESS + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 11c189cd7b183561432736e4042f36c556de7a05 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 19 00:29:27 2011 -0700 + + Use malloc/calloc/realloc/free directly + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 541d11934b86873382e14ac3c42ad52044fb5412 +Author: Jesse Adkins <[email protected]> +Date: Tue Sep 28 13:29:51 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e017b31636fa1dd952f6b7d32cacf9ddbd2884ba +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 16:49:04 2010 -0400 + + config: add comments for main statements + +commit 896ed2af07f113326e923b9b2c9a9069975444c0 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 30b6c93f9546c917ccc25c208efa46629e6a59b0 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 14:37:41 2010 -0400 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 01701fbb98e8c9eb1a3212994993bf21d0ab08db +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 14:05:23 2010 -0400 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 7733285ce1fe060fd77cb3575acad895729930a0 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 09:27:42 2010 -0400 + + config: complete AC_INIT m4 quoting + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit f4a705078774bdde74f0d4322c304e2d23883a1e +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 5da3af011abb82f8084b233f059bb9dc9e6eac14 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 658fee588cbbbb3cc204c8b4f05a7ae3be22f0a8 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 8065ec598bd0eb538aff41dd3912b0d0caf9c06e +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit c76be66441dd76c7d130606774782132aff96f6c +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 16:15:29 2010 -0400 + + config: 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. + +commit 0bf606d19d9357ffc5ccffe90279453d39c259ac +Author: Dave Airlie <[email protected]> +Date: Mon Jul 5 14:56:30 2010 +1000 + + rendition 4.2.4 + +commit 5cdbc08be474d592bdc8a6ed4eff1e64d55098e8 +Author: Gaetan Nadon <[email protected]> +Date: Sun Jun 13 20:02:08 2010 -0400 + + README: keep the text version of README, discard the sgml version + + The linuxdoc doc tool is deprecated. + README files are exclusively text files. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit a5e5a286ca62f2d6e32c83aba02d58ae8e828a35 +Author: Gaetan Nadon <[email protected]> +Date: Sun Jun 13 19:57:01 2010 -0400 + + README: fix linuxdoc content + + defs.ent are located under X11 directory + ident tag is not a Linuxdoc tag + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 20f1bf342474973a4bb57551482f12b632fd948e +Author: Gaetan Nadon <[email protected]> +Date: Sun Jun 13 10:12:24 2010 -0400 + + COPYING: update file with Copyright notices from source code. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 432cefce7e61b8445bbac284f0342c153bdfdcc4 +Author: Adam Jackson <[email protected]> +Date: Tue May 18 13:08:36 2010 -0400 + + Remove mibank.h reference + + Signed-off-by: Adam Jackson <[email protected]> + +commit e1331ecf64d45de97abc026f0872948b1601570f +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 15 13:54:42 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1d797c290be858b124e05cf1573db0cfc55db5b3 +Author: Gaetan Nadon <[email protected]> +Date: Tue Dec 15 22:01:02 2009 -0500 + + configure.ac: remove unused sdkdir=$(pkg-config...) statement + + The sdkdir variable isn't use, so remove the statement. + + Acked-by: Dan Nicholson <[email protected]> + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 957c7dd21e57184a576f301ecafd96819e3d71d2 +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 23 09:25:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 674b9fa5f40fd99c9904a21cda8d89699d64863a +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit c3769b5a338b006074dae5f2fdac2ede21db6fd9 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit db9f696aecc5153e6266e9afb2d2520493c81d7b +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 12:54:21 2009 -0400 + + Several driver modules do not have a ChangeLog target in Makefile.am #23814 + + The git generated ChangeLog replaces the hand written one. + Update configure.ac to xorg-macros level 1.3. + Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros + Update Makefile.am to add ChangeLog target if missing + Remove ChangeLog from EXTRA_DIST or *CLEAN variables + This is a pre-req for the INSTALL_CMD + +commit 3a8fcd130e54099936a2641d4515adae3426a237 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:18 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit f480933cfcc683aba19b679a6d532828eeb2eaa9 +Author: Matt Turner <[email protected]> +Date: Sat Nov 7 00:34:00 2009 -0500 + + Use usleep instead of xf86UDelay + + Signed-off-by: Matt Turner <[email protected]> + +commit db962650a038c48b7113eedfebf011cdc4829946 +Author: Gaetan Nadon <[email protected]> +Date: Mon Sep 7 11:12:13 2009 -0400 + + xf86-video-rendition: Remove unused .cvsignore file #23776 + + Signed-off-by: Peter Hutterer <[email protected]> + commit 2d62a81b452641999207c0576a08d82aee41cf06 Author: Dave Airlie <[email protected]> Date: Mon Sep 7 14:42:11 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 778616d..88dffb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-rendition (1:4.2.4-3) UNRELEASED; urgency=low + + * Merge from upstream master branch up to 7b26793ba2 to cope with + the new vgaHW ABI, fixing the FTBFS against X server 1.12. + + -- Cyril Brulebois <[email protected]> Tue, 01 May 2012 17:53:43 +0200 + xserver-xorg-video-rendition (1:4.2.4-2) unstable; urgency=low * Switch to dh: commit 7b26793ba2572c412f03e9a4acf83237fbec71bd Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:13:29 2011 -0500 Fix for new vgahw ABI Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/rendition.c b/src/rendition.c index 3d4afef..8da5e13 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -651,6 +651,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) pvgaHW = VGAHWPTR(pScreenInfo); pvgaHW->MapSize = 0x00010000; /* Standard 64kB VGA window */ + vgaHWSetStdFuncs(pvgaHW); vgaHWGetIOBase(pvgaHW); /* Get VGA I/O base */ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 commit b08572f7b60481eb3b7ab6058b74a56fd646d133 Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:11:45 2011 -0500 Unhook the pretense of XAA support This has never shipped enabled in any Xorg release. I'm pretty sure the same is true of XFree86 4.x releases. Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 5194089..6770629 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,8 +29,6 @@ rendition_drv_la_LDFLAGS = -module -avoid-version rendition_drv_ladir = @moduledir@/drivers rendition_drv_la_SOURCES = \ - accel.h \ - accelX.c \ cmd2d.h \ commonregs.h \ cscode.h \ @@ -64,6 +62,8 @@ dist_driver_DATA = \ v20002d.uc EXTRA_DIST = \ + accel.h \ + accelX.c \ README.uc \ vgafont-std.data \ vgafont-vrx.data \ diff --git a/src/rendition.c b/src/rendition.c index 3202b49..3d4afef 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -38,14 +38,6 @@ #endif /* - * Activate acceleration code or not. - * - * WARNING BUGGY !!! - * Yes, you activate it on your own risk. - */ -#define USE_ACCEL 0 - -/* * includes */ @@ -58,7 +50,6 @@ #include "vtypes.h" #include "vboard.h" #include "vmodes.h" -#include "accel.h" #include "vramdac.h" #include "rendition_shadow.h" #include "vbe.h" @@ -662,7 +653,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) pvgaHW->MapSize = 0x00010000; /* Standard 64kB VGA window */ vgaHWGetIOBase(pvgaHW); /* Get VGA I/O base */ - pRendition->board.accel=0; #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pRendition->board.vgaio_base = pvgaHW->PIOOffset; #else @@ -868,31 +858,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG, "Software cursor selected\n"); - /* Unmapping delayed until after micrcode loading */ - /****************************************/ - /* Reserve memory and load the microcode */ - /****************************************/ -#if USE_ACCEL - if (!xf86ReturnOptValBool(pRendition->Options, OPTION_NOACCEL,0) && - !pRendition->board.shadowfb) { - /* Load XAA if needed */ - if (xf86LoadSubModule(pScreenInfo, "xaa")) { - renditionMapMem(pScreenInfo); - RENDITIONAccelPreInit (pScreenInfo); - renditionUnmapMem(pScreenInfo); - pRendition->board.accel = TRUE; - } else xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - ("XAA module not found: " - "Skipping acceleration\n")); - } - else - xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG, - ("Skipping acceleration on users request\n")); -#else - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - ("Skipping acceleration\n")); -#endif - #ifdef DEBUG ErrorF("PreInit OK...!!!!\n"); sleep(2); @@ -1070,9 +1035,6 @@ renditionCloseScreen(int scrnIndex, ScreenPtr pScreen) if (prenditionPriv->board.hwcursor_used) RenditionHWCursorRelease(pScreenInfo); - if (prenditionPriv->board.accel) - RENDITIONAccelNone(pScreenInfo); - if (pScreenInfo->vtSema) renditionLeaveGraphics(pScreenInfo); @@ -1215,10 +1177,6 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* The actual setup of the driver-specific code */ /* has to be after fbScreenInit and before cursor init */ /*********************************************************/ -#if USE_ACCEL - if (pRendition->board.accel) - RENDITIONAccelXAAInit (pScreen); -#endif /* Initialise cursor functions */ xf86SetSilkenMouse(pScreen); diff --git a/src/vtypes.h b/src/vtypes.h index e4ad468..3a701f4 100644 --- a/src/vtypes.h +++ b/src/vtypes.h @@ -132,9 +132,6 @@ struct verite_board_t { Bool init; /* */ - Bool accel; - - /* */ vu32 csucode_base; vu32 ucode_base; vu32 ucode_entry; commit 810c279e9106a96aa6c6d395610ade3cd1b61fba Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 00:31:41 2011 -0700 Include <unistd.h> for usleep Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/vmodes.c b/src/vmodes.c index 5357fa5..f2dae0b 100644 --- a/src/vmodes.c +++ b/src/vmodes.c @@ -20,6 +20,7 @@ #include "v1kregs.h" #include "v2kregs.h" +#include <unistd.h> #undef DEBUG commit 99d960880e3aedc35238e26841e13e12f317395d Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 00:31:05 2011 -0700 Build fix for ABI Version 12 ABI Version 12 removes support for multiple PCI domains. If you need to use this driver on a system with more than one PCI domain, you should either port this driver to using libpciaccess directly or stick with an older server. Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/rendition.c b/src/rendition.c index f8c1df4..3202b49 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -663,7 +663,11 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) vgaHWGetIOBase(pvgaHW); /* Get VGA I/O base */ pRendition->board.accel=0; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pRendition->board.vgaio_base = pvgaHW->PIOOffset; +#else + pRendition->board.vgaio_base = 0; +#endif pRendition->board.io_base = pRendition->board.vgaio_base #ifdef XSERVER_LIBPCIACCESS + pRendition->PciInfo->regions[1].base_addr; commit efcd0f31433ddbcf04ca040f8474f6cb8a080271 Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 00:29:28 2011 -0700 Use unsigned long rather than deprecated IOADDRESS Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/accelX.c b/src/accelX.c index a499c56..ed4964e 100644 --- a/src/accelX.c +++ b/src/accelX.c @@ -289,7 +289,7 @@ int RENDITIONInitUcode(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; if (0 == verite_getstride(pScreenInfo, NULL, &pRendition->board.mode.stride0, @@ -367,7 +367,7 @@ void RENDITIONRestoreUcode(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; vu8 memend; @@ -410,7 +410,7 @@ void RENDITIONSaveUcode(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; vu8 memend; #ifdef DEBUG @@ -445,7 +445,7 @@ void RENDITIONSyncV1000(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; int c; @@ -555,7 +555,7 @@ RENDITIONSubsequentScreenToScreenCopy(ScrnInfoPtr pScreenInfo, int w, int h) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; #ifdef DEBUG @@ -607,7 +607,7 @@ RENDITIONSubsequentSolidFillRect(ScrnInfoPtr pScreenInfo, int x, int y, int w, int h) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; #ifdef DEBUG @@ -639,7 +639,7 @@ RENDITIONSubsequentTwoPointLine(ScrnInfoPtr pScreenInfo, int bias) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob = pRendition->board.io_base; + unsigned long iob = pRendition->board.io_base; #ifdef DEBUG diff --git a/src/rendition.c b/src/rendition.c index 2d9c4c4..f8c1df4 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -1484,7 +1484,7 @@ static xf86MonPtr renditionDDC (ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob=pRendition->board.io_base; + unsigned long iob=pRendition->board.io_base; vu32 temp; xf86MonPtr MonInfo = NULL; @@ -1517,7 +1517,7 @@ static unsigned int renditionDDC1Read (ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob=pRendition->board.io_base; + unsigned long iob=pRendition->board.io_base; vu32 value = 0; /* wait for Vsync */ diff --git a/src/v1krisc.c b/src/v1krisc.c index 2554263..9b7b4e2 100644 --- a/src/v1krisc.c +++ b/src/v1krisc.c @@ -83,20 +83,20 @@ * local function prototypes */ -static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask); -static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask); +static void verite_iopoll(unsigned long port, vu32 data, vu32 mask); +static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask); -static vu32 readRF(IOADDRESS io_base, vu8 index); -static void writeRF(IOADDRESS io_base, vu8 index, vu32 data); +static vu32 readRF(unsigned long io_base, vu8 index); +static void writeRF(unsigned long io_base, vu8 index, vu32 data); -static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type); -static void risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type); +static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type); +static void risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type); #if 0 -static void risc_step(IOADDRESS io_base, vu32 count); +static void risc_step(unsigned long io_base, vu32 count); #endif -static void risc_forcestep(IOADDRESS io_base, vu32 instruction); -static void risc_continue(IOADDRESS io_base); +static void risc_forcestep(unsigned long io_base, vu32 instruction); +static void risc_continue(unsigned long io_base); @@ -113,7 +113,7 @@ void v1k_start(ScrnInfoPtr pScreenInfo, vu32 pc) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS io_base=pRendition->board.io_base; + unsigned long io_base=pRendition->board.io_base; v1k_stop(pScreenInfo); risc_forcestep(io_base, NOP_INSTR); @@ -152,7 +152,7 @@ v1k_stop(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); vu8 debugreg, statusreg; - IOADDRESS io_base=pRendition->board.io_base; + unsigned long io_base=pRendition->board.io_base; vu16 STATUS = 0x4A; /* v2x00 io register offset */ int c; @@ -207,7 +207,7 @@ v1k_flushicache(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); vu32 c, p1, p2; - IOADDRESS io_base=pRendition->board.io_base; + unsigned long io_base=pRendition->board.io_base; /* first flush store accumulation buffers so data is all in memory */ p1=risc_readmem(io_base, 0, READ_WORD); @@ -255,7 +255,7 @@ void v1k_softreset(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS io_base=pRendition->board.io_base; + unsigned long io_base=pRendition->board.io_base; verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC); verite_out8(io_base+STATEINDEX, STATEINDEX_PC); @@ -300,12 +300,12 @@ v1k_getriscprocs(verite_board_desc *boardDesc) */ /* - * static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) + * static void verite_iopoll(unsigned long port, vu32 data, vu32 mask) * * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached. */ static void -verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) +verite_iopoll(unsigned long port, vu32 data, vu32 mask) { vu32 c; @@ -320,12 +320,12 @@ verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) /* - * static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) + * static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask) * * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached. */ static void -verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) +verite_iopoll8(unsigned long port, vu8 data, vu8 mask) { vu32 c; @@ -340,12 +340,12 @@ verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) /* - * static vu32 readRF(IOADDRESS io_base, vu8 index) + * static vu32 readRF(unsigned long io_base, vu8 index) * * Reads data from register file. */ static vu32 -readRF(IOADDRESS io_base, vu8 index) +readRF(unsigned long io_base, vu8 index) { vu32 data, instr; vu8 debug, stateindex; @@ -378,12 +378,12 @@ readRF(IOADDRESS io_base, vu8 index) /* - * static void writeRF(IOADDRESS io_base, vu8 index, vu32 data) + * static void writeRF(unsigned long io_base, vu8 index, vu32 data) * * Set RF register, being careful on how to set regs below 64. */ static void -writeRF(IOADDRESS io_base, vu8 index, vu32 data) +writeRF(unsigned long io_base, vu8 index, vu32 data) { vu8 special=0; @@ -417,12 +417,12 @@ writeRF(IOADDRESS io_base, vu8 index, vu32 data) /* - * static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) + * static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type) * * NOTE: Assumes RISC is in hold mode. */ static vu32 -risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) +risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type) { vu32 data; @@ -445,12 +445,12 @@ risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) /* - * static vu32 risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) + * static vu32 risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type) * * NOTE: Assumes RISC is in hold mode. */ static void -risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) +risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type) { writeRF(io_base, RISC_RA, addr); /* point to memory */ writeRF(io_base, RISC_FP, data); /* set data */ @@ -466,12 +466,12 @@ risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) #if 0 /* - * static void risc_step(IOADDRESS io_base, vu32 count) + * static void risc_step(unsigned long io_base, vu32 count) * * Single step the RISC. NOTE: Do not force instruction into RISCIR! */ static void -risc_step(IOADDRESS io_base, vu32 count) +risc_step(unsigned long io_base, vu32 count) { vu32 c, d; vu8 debugreg; @@ -494,12 +494,12 @@ risc_step(IOADDRESS io_base, vu32 count) /* - * static void risc_forcestep(IOADDRESS io_base, vu32 instruction) + * static void risc_forcestep(unsigned long io_base, vu32 instruction) * * Single step RISC; force instruction; assumes RISC held. */ static void -risc_forcestep(IOADDRESS io_base, vu32 instruction) +risc_forcestep(unsigned long io_base, vu32 instruction) { vu32 c; vu8 debugreg, stateindex; @@ -525,12 +525,12 @@ risc_forcestep(IOADDRESS io_base, vu32 instruction) /* - * static void risc_continue(IOADDRESS io_base) + * static void risc_continue(unsigned long io_base) * * Turn off hold bit. */ static void -risc_continue(IOADDRESS io_base) +risc_continue(unsigned long io_base) { vu8 debugreg; diff --git a/src/vboard.c b/src/vboard.c index 49499e2..622715f 100644 --- a/src/vboard.c +++ b/src/vboard.c @@ -38,7 +38,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob=pRendition->board.io_base; + unsigned long iob=pRendition->board.io_base; vu8 *vmb; vu32 offset; vu8 memendian; @@ -207,7 +207,7 @@ void verite_check_csucode(ScrnInfoPtr pScreenInfo) { renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - IOADDRESS iob=pRendition->board.io_base; + unsigned long iob=pRendition->board.io_base; vu8 *vmb; vu32 offset; int c; diff --git a/src/vmodes.c b/src/vmodes.c index c0bd0df..5357fa5 100644 --- a/src/vmodes.c +++ b/src/vmodes.c @@ -201,7 +201,7 @@ struct V1000ClocksStr { * local function prototypes */ -static void set_PLL(IOADDRESS iob, vu32 value); +static void set_PLL(unsigned long iob, vu32 value); static double V1000CalcClock(double target, int *M, int *N, int *P); static double V2200CalcClock(double target, int *m, int *n, int *p); @@ -509,13 +509,13 @@ verite_getstride(ScrnInfoPtr pScreenInfo, int *width, */ /* - * void set_PLL(IOADDRESS iob, vu32 value) + * void set_PLL(unsigned long iob, vu32 value) * * Set PLL clock to desired frequency for the V1000. */ void -set_PLL(IOADDRESS iob, vu32 value) +set_PLL(unsigned long iob, vu32 value) { vu32 ulD; int b; diff --git a/src/vos.h b/src/vos.h index 7b55f77..999c870 100644 --- a/src/vos.h +++ b/src/vos.h @@ -23,18 +23,18 @@ /* * function prototypes */ -#define /*void*/ verite_out8(/*IOADDRESS*/ port, /*vu8*/ data) \ +#define /*void*/ verite_out8(/*unsigned long*/ port, /*vu8*/ data) \ outb(port, data) -#define /*void*/ verite_out16(/*IOADDRESS*/ port, /*vu16*/ data) \ +#define /*void*/ verite_out16(/*unsigned long*/ port, /*vu16*/ data) \ outw(port, data) -#define /*void*/ verite_out32(/*IOADDRESS*/ port, /*vu32*/ data) \ +#define /*void*/ verite_out32(/*unsigned long*/ port, /*vu32*/ data) \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
