diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/s3.h | 4 | ||||
| -rw-r--r-- | src/s3_Ti.c | 2 | ||||
| -rw-r--r-- | src/s3_driver.c | 8 |
4 files changed, 8 insertions, 8 deletions
@@ -6,7 +6,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3 @@ -176,7 +176,7 @@ typedef struct _S3Rec { Bool (*CursorInit)(ScreenPtr pScreen); void (*LoadPalette)(ScrnInfoPtr pScrn, int numColors, - int *indicies, LOCO *colors, + int *indices, LOCO *colors, VisualPtr pVisual); Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL); @@ -244,7 +244,7 @@ void S3TiDAC_PreInit(ScrnInfoPtr pScrn); void S3TiDAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode); void S3TiDAC_Save(ScrnInfoPtr pScrn); void S3TiDAC_Restore(ScrnInfoPtr pScrn); -void S3TiLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies, LOCO *colors, +void S3TiLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual); Bool S3Ti_CursorInit(ScreenPtr pScreen); void S3OutTiIndReg(ScrnInfoPtr pScrn, CARD32 reg, unsigned char mask, diff --git a/src/s3_Ti.c b/src/s3_Ti.c index bb0ce51..5c346e7 100644 --- a/src/s3_Ti.c +++ b/src/s3_Ti.c @@ -577,7 +577,7 @@ void S3TiDAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode) } -void S3TiLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies, LOCO *colors, +void S3TiLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual) { int i; diff --git a/src/s3_driver.c b/src/s3_driver.c index 305b564..5a7cc9c 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -103,7 +103,7 @@ Bool S3CloseScreen(CLOSE_SCREEN_ARGS_DECL); Bool S3SaveScreen(ScreenPtr pScreen, int mode); static void S3FreeScreen(FREE_SCREEN_ARGS_DECL); static void S3GenericLoadPalette(ScrnInfoPtr pScrn, int numColors, - int *indicies, LOCO *colors, + int *indices, LOCO *colors, VisualPtr pVisual); static void S3Restore(ScrnInfoPtr pScrn); void S3BankZero(ScrnInfoPtr pScrn); @@ -1112,13 +1112,13 @@ Bool S3SwitchMode(SWITCH_MODE_ARGS_DECL) static void S3GenericLoadPalette(ScrnInfoPtr pScrn, int numColors, - int *indicies, LOCO *colors, + int *indices, LOCO *colors, VisualPtr pVisual) { int i, index; for (i=0; i<numColors; i++) { - index = indicies[i]; + index = indices[i]; outb(0x3c8, index); outb(0x3c9, colors[index].red); outb(0x3c9, colors[index].green); @@ -1670,7 +1670,7 @@ static Bool S3ModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) if (pS3->SlowVRAM) { /* * some Diamond Stealth 64 VRAM cards have a problem with - * VRAM timing, increas -RAS low timing from 3.5 MCLKs + * VRAM timing, increase -RAS low timing from 3.5 MCLKs * to 4.5 MCLKs */ outb(vgaCRIndex, 0x39); |