qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update xf86-video-newport to 0.2.2

Browse Source
This commit is contained in:
matthieu 2009-06-05 20:40:49 +00:00
parent c943e54b09
commit d5f37b904b
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver/xf86-video-newport/configure.ac
View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-newport],
0.2.1,
0.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-newport)

2
driver/xf86-video-newport/man/newport.man
View File

@ -39,7 +39,7 @@ Enable or disable the HW cursor. Default: on.
.BI "Option \*qBusID\*q \*q"integer \*q
Set to 1 for the Indigo2 XL. Default: 0
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors:
Guido GÜnther \fIagx@sigxcpu.org\fP

28
driver/xf86-video-newport/src/newport_driver.c
View File

@ -1,6 +1,4 @@
/*
* Id: newport_driver.c,v 1.2 2000/11/29 20:58:10 agx Exp $
*
* Driver for the SGI Indy's Newport graphics card
*
* This driver is based on the newport.c & newport_con.c kernel code
@ -30,7 +28,6 @@
* Project.
*
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.25 2003/04/23 21:51:41 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@ -62,9 +59,9 @@
#define NEWPORT_VERSION 4000
#define NEWPORT_NAME "NEWPORT"
#define NEWPORT_DRIVER_NAME "newport"
#define NEWPORT_MAJOR_VERSION 0
#define NEWPORT_MINOR_VERSION 2
#define NEWPORT_PATCHLEVEL 0
#define NEWPORT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
#define NEWPORT_MINOR_VERSION PACKAGE_VERSION_MINOR
#define NEWPORT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/* Prototypes ------------------------------------------------------- */
@ -272,17 +269,13 @@ NewportProbe(DriverPtr drv, int flags)
int entity;
ScrnInfoPtr pScrn = NULL;
/* This is a hack because don't have the RAC info(and don't want it).
* Set it as an ISA entity to get the entity field set up right.
*/
entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE);
entity = xf86ClaimNoSlot(drv, 0, dev, TRUE);
base = (NEWPORT_BASE_ADDR0
+ busID * NEWPORT_BASE_OFFSET);
RANGE(range[0], base, base + sizeof(NewportRegs),\
ResExcMemBlock);
pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \
NULL, NULL, NULL, NULL);
/* Allocate a ScrnInfoRec */
pScrn = xf86AllocateScreen(drv, 0);
xf86AddEntityToScreen(pScrn, entity);
pScrn->driverVersion = NEWPORT_VERSION;
pScrn->driverName = NEWPORT_DRIVER_NAME;
pScrn->name = NEWPORT_NAME;
@ -593,12 +586,15 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
pNewport->NoAccel = FALSE;
if (xf86ReturnOptValBool(pNewport->Options, OPTION_NOACCEL, FALSE))
{
if (!xf86LoadSubModule(pScrn, "xaa"))
return FALSE;
xf86LoaderReqSymLists(xaaSymbols, NULL);
pNewport->NoAccel = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
}
if (!pNewport->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa"))
pNewport->NoAccel = TRUE;
else
xf86LoaderReqSymLists(xaaSymbols, NULL);
}
#if 0
if (pScrn->bitsPerPixel < 24)
{ /* not implemented yet */