diff options
-rw-r--r-- | man/cyrix.man | 10 | ||||
-rw-r--r-- | src/cyrix.h | 2 | ||||
-rw-r--r-- | src/cyrix_accel.c | 2 | ||||
-rw-r--r-- | src/cyrix_bank.c | 2 | ||||
-rw-r--r-- | src/cyrix_driver.c | 33 | ||||
-rw-r--r-- | src/cyrix_helper.c | 3 | ||||
-rw-r--r-- | src/cyrix_shadow.c | 2 |
7 files changed, 28 insertions, 26 deletions
diff --git a/man/cyrix.man b/man/cyrix.man index a4d0720..f8fb670 100644 --- a/man/cyrix.man +++ b/man/cyrix.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH CYRIX __drivermansuffix__ __vendorversion__ @@ -14,7 +14,7 @@ cyrix \- Cyrix video driver .fi .SH DESCRIPTION .B cyrix -is an __xservername__ driver for the Cyrix MediaGX (now Natsemi Geode) series of +is an XFree86 driver for the Cyrix MediaGX (now Natsemi Geode) series of processors when using the built in video. .SH SUPPORTED HARDWARE The @@ -28,7 +28,7 @@ The MediaGX run length compresses its shared framebuffer, for the best performance on a MediaGX machine pick backgrounds that compress well horizonally. .SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration +Please refer to XF86Config(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .PP @@ -64,12 +64,12 @@ considerable time. .PP The 5530A video overlay facility is not currently supported. .PP -__xservername__ uses the MediaGX 'SoftVGA' interface. On a small number of boards +XFree86 uses the MediaGX 'SoftVGA' interface. On a small number of boards this is buggy and may result in strange illegal instruction traps. .PP Hardware cursors are not currently supported. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: Richard Hecker, Annius Groenink, Dirk Hohndel, The GGI Project, Alan Cox. diff --git a/src/cyrix.h b/src/cyrix.h index a54ea0e..c75c222 100644 --- a/src/cyrix.h +++ b/src/cyrix.h @@ -37,7 +37,7 @@ * Dirk H. Hohndel (hohndel@suse.de), * Portions: the GGI project & confidential CYRIX databooks. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */ #ifndef _CYRIX_H_ #define _CYRIX_H_ diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c index 4b6ef8e..652c1d8 100644 --- a/src/cyrix_accel.c +++ b/src/cyrix_accel.c @@ -26,7 +26,7 @@ * Dirk H. Hohndel (hohndel@suse.de), * Portions: the GGI project & confidential CYRIX databooks. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */ #include "vgaHW.h" #include "xf86.h" diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c index 28cb0ba..e06d6dd 100644 --- a/src/cyrix_bank.c +++ b/src/cyrix_bank.c @@ -26,7 +26,7 @@ * Dirk H. Hohndel (hohndel@suse.de), * Portions: the GGI project & confidential CYRIX databooks. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */ #define PSZ 8 diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c index ad2a12e..e2a98e4 100644 --- a/src/cyrix_driver.c +++ b/src/cyrix_driver.c @@ -50,7 +50,7 @@ * (note that most of the data books have been released by * NatSemi and are downloadable for free as pdf files) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.27 2003/08/23 16:09:17 dawes Exp $ */ #include "fb.h" #include "mibank.h" @@ -99,8 +99,8 @@ static void CYRIXAdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void CYRIXFreeScreen(int scrnIndex, int flags); static int CYRIXFindIsaDevice(GDevPtr dev); -static ModeStatus CYRIXValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags); +static int CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, + int flags); /* Internally used functions */ static void CYRIXSave(ScrnInfoPtr pScrn); @@ -233,7 +233,7 @@ static XF86ModuleVersionInfo cyrixVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, CYRIX_MAJOR_VERSION, CYRIX_MINOR_VERSION, CYRIX_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -549,7 +549,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags) int videoram; int i; ClockRangePtr clockRanges; - unsigned int physbase, padsize; + CARD32 physbase, padsize; + int CYRIXisOldChipRevision; int device_step, device_revision; int vgaIOBase; unsigned char gcr; @@ -617,8 +618,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags) /* end GGI MediaGX driver based code */ if (padsize == 0) return (FALSE); - xf86ErrorF("%s: GX_BASE: 0x%x\n", CYRIX_NAME, physbase); - xf86ErrorF("%s: Scratchpad size: %d kbytes\n", CYRIX_NAME, padsize); + xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase); + xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize); /* Probe for the MediaGX processor version details. Older versions * use different op-codes for setting the organization of the @@ -634,6 +635,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags) xf86ErrorF("%s: MediaGX processor ID %d revision %d\n", CYRIX_NAME, device_step, device_revision); + CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40); + /* Some MediaGX systems have different blit buffer offsets than * is indicated by the scratchpad size. Make sure that we have * the right offsets by writing them into the corresponding CPU @@ -837,7 +840,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags) pCyrix->IOAccelAddress = 0x40008100; /* Hard coded for 1st try */ } - xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%lx\n",(unsigned long)pCyrix->IOAccelAddress); + xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%x\n",pCyrix->IOAccelAddress); /* HW bpp matches reported bpp */ pCyrix->HwBpp = pScrn->bitsPerPixel; @@ -1008,7 +1011,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) { int ret = -1; vgaHWPtr hwp; -/* vgaRegPtr vgaReg; */ + vgaRegPtr vgaReg; CYRIXPrvPtr pCyrix; CYRIXRegPtr cyrixReg; @@ -1029,7 +1032,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) return FALSE; /* Program the registers */ -/* vgaReg = &hwp->ModeReg; */ + vgaReg = &hwp->ModeReg; cyrixReg = &pCyrix->ModeReg; CyrixRestore(pScrn, cyrixReg); @@ -1046,13 +1049,13 @@ CYRIXRestore(ScrnInfoPtr pScrn) { vgaHWPtr hwp; vgaRegPtr vgaReg; - /*CYRIXPrvPtr pCyrix;*/ - /*CYRIXRegPtr cyrixReg*/; + CYRIXPrvPtr pCyrix; + CYRIXRegPtr cyrixReg; hwp = VGAHWPTR(pScrn); - /*pCyrix = CYRIXPTR(pScrn);*/ + pCyrix = CYRIXPTR(pScrn); vgaReg = &hwp->SavedReg; - /*cyrixReg = &pCyrix->SavedReg*/; + cyrixReg = &pCyrix->SavedReg; vgaHWProtect(pScrn, TRUE); @@ -1498,7 +1501,7 @@ CYRIXFreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static ModeStatus +static int CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { return(MODE_OK); diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c index 593507d..22c46a2 100644 --- a/src/cyrix_helper.c +++ b/src/cyrix_helper.c @@ -45,7 +45,6 @@ #include "vgaHW.h" #include "xf86_ansic.h" #include "compiler.h" -#include "xf86.h" #define CYRIXmarkLinesDirty { \ int k = 0; \ @@ -59,7 +58,7 @@ static void CYRIXresetVGA(ScrnInfoPtr pScrn, unsigned long vgaIOBase); void Cyrix1bppColorMap(ScrnInfoPtr pScrn) { /* use dedicated color map routines on new chipsets in 8bpp */ - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Cyrix 1BPP is only a stub for now.\n"); + ErrorF("%s: Cyrix 1BPP is only a stub for now.\n", X_PROBED); return; } diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c index 87f7709..479ad36 100644 --- a/src/cyrix_shadow.c +++ b/src/cyrix_shadow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */ /* Copyright (c) 1999, The XFree86 Project Inc. |