configure.ac | 10 +++++++++- src/apm.h | 5 ++--- src/apm_driver.c | 18 +++++++++++++++--- src/apm_rush.c | 6 +++--- 4 files changed, 29 insertions(+), 10 deletions(-)
New commits: commit aa1df17848f6238def86a41eadb662b4480ee762 Author: Dave Airlie <[email protected]> Date: Mon Dec 22 14:12:50 2008 +1000 apm 1.2.1 diff --git a/configure.ac b/configure.ac index d8ca647..b15f61e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-apm], - 1.2.0, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-apm) commit ba440693cb40cb6eb414bbad86fea8d444bd0cac Author: Adam Jackson <[email protected]> Date: Fri Dec 19 10:18:44 2008 -0500 Stop using XVCALL macro diff --git a/src/apm_rush.c b/src/apm_rush.c index 74d85a3..47645d6 100644 --- a/src/apm_rush.c +++ b/src/apm_rush.c @@ -569,7 +569,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client) return (BadMatch); } - status = XVCALL(diMatchPort)(pPort, pDraw); + status = XvdiMatchPort(pPort, pDraw); if (status != Success) return status; @@ -580,7 +580,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client) client->errorValue = stuff->pixmap; return (BadPixmap); } - status = XVCALL(diMatchPort)(pPort, (DrawablePtr)pPixmap); + status = XvdiMatchPort(pPort, (DrawablePtr)pPixmap); if (status != Success) return status; pPriv = APM_GET_PIXMAP_PRIVATE(pPixmap); @@ -604,7 +604,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client) return BadMatch; pApm->PutImageStride = pPixmap->devKind; - status = XVCALL(diPutImage)(client, pDraw, pPort, pGC, + status = XvdiPutImage(client, pDraw, pPort, pGC, stuff->src_x, stuff->src_y, stuff->src_w, stuff->src_h, stuff->drw_x, stuff->drw_y, commit c0a4a2528dbaba95fec181552ccb0f00e1ede2ea Author: Adam Jackson <[email protected]> Date: Sun Nov 23 17:50:37 2008 -0500 Make ISA optional diff --git a/configure.ac b/configure.ac index 9363fca..d8ca647 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,14 @@ INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(xf86ConfigIsaEntity, + [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], + [], + [#include "xf86.h"]) +CFLAGS="$save_CFLAGS" + # Checks for libraries. SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" diff --git a/src/apm_driver.c b/src/apm_driver.c index 443c191..cbb2f43 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -82,10 +82,12 @@ static PciChipsets ApmPciChipsets[] = { { -1, -1, RES_UNDEFINED } }; +#ifdef HAVE_ISA static IsaChipsets ApmIsaChipsets[] = { { PCI_CHIP_AP6422, RES_EXCLUSIVE_VGA}, {-1, RES_UNDEFINED} }; +#endif typedef enum { OPTION_SET_MCLK, @@ -328,6 +330,7 @@ ApmAvailableOptions(int chipid, int busid) return ApmOptions; } +#ifdef HAVE_ISA static int ApmFindIsaDevice(GDevPtr dev) { @@ -376,6 +379,7 @@ ApmFindIsaDevice(GDevPtr dev) return apmChip; } +#endif static void ApmAssignFPtr(ScrnInfoPtr pScrn) @@ -447,6 +451,7 @@ ApmProbe(DriverPtr drv, int flags) } } +#ifdef HAVE_ISA /* Check for non-PCI cards */ numUsed = xf86MatchIsaInstances(APM_NAME, ApmChipsets, ApmIsaChipsets, drv, ApmFindIsaDevice, DevSections, @@ -467,6 +472,8 @@ ApmProbe(DriverPtr drv, int flags) } } } +#endif + xfree(DevSections); return foundScreen; } commit 33edd3514fbfbd8b36a8568dbe021d0df99e6743 Author: Adam Jackson <[email protected]> Date: Fri Aug 15 15:20:16 2008 -0400 Actually use the DDC results we get. diff --git a/src/apm_driver.c b/src/apm_driver.c index 9106d1f..443c191 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -975,8 +975,10 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) } if (0 && !MonInfo) MonInfo = xf86DoEDID_DDC1(pScrn->scrnIndex,vgaHWddc1SetSpeed,ddc1Read); - if (MonInfo) + if (MonInfo) { xf86PrintEDID(MonInfo); + xf86SetDDCproperties(pScrn, MonInfo); + } pScrn->monitor->DDC = MonInfo; } commit 51ac7b1d182730ab1b9aaac412ac6cc40904bce3 Author: Adam Jackson <[email protected]> Date: Fri Aug 15 13:58:29 2008 -0400 Uninclude xf86Version.h diff --git a/src/apm.h b/src/apm.h index 7c0bfda..c57e9ba 100644 --- a/src/apm.h +++ b/src/apm.h @@ -11,9 +11,6 @@ /* Everything using inb/outb, etc needs "compiler.h" */ #include "compiler.h" -/* This is used for module versioning */ -#include "xf86Version.h" - /* Drivers for PCI hardware need this */ #include "xf86PciInfo.h" commit 230858d8b3dfc18098cb89cdee3599714ac95375 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Mon Jul 21 15:38:00 2008 -0300 Protect xf86rush dependent code around #ifdef XF86RUSH Also correct an incorrect #ifndef -> #ifdef, so that the driver now doesn't have any calls to non existent symbols. Signed-off-by: Paulo Cesar Pereira de Andrade <[email protected]> diff --git a/src/apm.h b/src/apm.h index 3d500c3..7c0bfda 100644 --- a/src/apm.h +++ b/src/apm.h @@ -242,8 +242,10 @@ extern void ApmAdjustFrame(int scrnIndex, int x, int y, int flags); extern void ApmHWCursorReserveSpace(ApmPtr pApm); extern void ApmAccelReserveSpace(ApmPtr pApm); +#ifdef XF86RUSH extern int ApmPixmapIndex; #define APM_GET_PIXMAP_PRIVATE(pix)\ ((ApmPixmapPtr)(((PixmapPtr)(pix))->devPrivates[ApmPixmapIndex].ptr)) +#endif #include "apm_regs.h" diff --git a/src/apm_driver.c b/src/apm_driver.c index 49b74d3..9106d1f 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -53,9 +53,10 @@ static void ApmDisplayPowerManagementSet(ScrnInfoPtr pScrn, int flags); static void ApmProbeDDC(ScrnInfoPtr pScrn, int index); - +#ifdef XF86RUSH int ApmPixmapIndex = -1; static unsigned long ApmGeneration = 0; +#endif _X_EXPORT DriverRec APM = { APM_VERSION, @@ -1998,7 +1999,7 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) miSetPixmapDepths(); switch (pScrn->bitsPerPixel) { -#ifndef HAVE_XF1BPP +#ifdef HAVE_XF1BPP case 1: ret = xf1bppScreenInit(pScreen, FbBase, pScrn->virtualX, pScrn->virtualY, @@ -2120,6 +2121,7 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); } +#ifdef XF86RUSH if (ApmGeneration != serverGeneration) { if ((ApmPixmapIndex = AllocatePixmapPrivateIndex()) < 0) return FALSE; @@ -2128,6 +2130,7 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!AllocatePixmapPrivate(pScreen, ApmPixmapIndex, sizeof(ApmPixmapRec))) return FALSE; +#endif /* Done */ return TRUE; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
