summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--README.multihead2
-rw-r--r--src/CirrusClk.c2
-rw-r--r--src/alp_driver.c2
-rw-r--r--src/alp_xaa.c4
-rw-r--r--src/cir_driver.c2
-rw-r--r--src/lg_driver.c6
-rw-r--r--src/lg_hwcurs.c8
-rw-r--r--src/lg_xaa.c2
-rw-r--r--src/lg_xaa.h2
10 files changed, 16 insertions, 16 deletions
diff --git a/README.md b/README.md
index 37bd80c..9433776 100644
--- a/README.md
+++ b/README.md
@@ -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-cirrus
diff --git a/README.multihead b/README.multihead
index efe62d4..514696d 100644
--- a/README.multihead
+++ b/README.multihead
@@ -37,7 +37,7 @@ will *NOT* work with XFree86 3.3.2.
The only problem that I found so far is with
memory configuration initialization. My bios
does not initialize the secondary display adapter.
-This results in a currupted display.
+This results in a corrupted display.
Here are the options:
1. warm booting from Windows 98 may work. I have
diff --git a/src/CirrusClk.c b/src/CirrusClk.c
index a8b24ac..a6b2d63 100644
--- a/src/CirrusClk.c
+++ b/src/CirrusClk.c
@@ -11,7 +11,7 @@
*
* Minor changes and cleanup Itai Nahshon.
*
- * Made this completly chipset independent, and moved chipset dependent parts
+ * Made this completely chipset independent, and moved chipset dependent parts
* into the specific sub-drivers. Derek Fawcus <derek@spider.com>
*/
diff --git a/src/alp_driver.c b/src/alp_driver.c
index c846909..387ec1f 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -5,7 +5,7 @@
* Support for the CL-GD7548: David Monniaux
*
* This is mainly a cut & paste from the MGA driver.
- * Original autors and contributors list include:
+ * Original authors and contributors list include:
* Radoslaw Kapitan, Andrew Vanderstock, Dirk Hohndel,
* David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
* Guy DESBIEF
diff --git a/src/alp_xaa.c b/src/alp_xaa.c
index b3ddd64..ba2d6ef 100644
--- a/src/alp_xaa.c
+++ b/src/alp_xaa.c
@@ -400,7 +400,7 @@ AlpSubsequentCPUToScreenColorExpandFill(
/* source = CPU ; description of bit 2 of GR30 in the 7548 manual
says that if we do color expansion we must zero the source
- adress registers (GR2C, GR2D, GR2E) */
+ address registers (GR2C, GR2D, GR2E) */
outw(pCir->PIOReg, 0x2C);
outw(pCir->PIOReg, 0x2D);
outw(pCir->PIOReg, 0x2E);
@@ -537,7 +537,7 @@ AlpSubsequentColorExpandScanline(
/* source = CPU ; description of bit 2 of GR30 in the 7548 manual
says that if we do color expansion we must zero the source
- adress registers (GR2C, GR2D, GR2E) */
+ address registers (GR2C, GR2D, GR2E) */
outw(pCir->PIOReg, 0x2C);
outw(pCir->PIOReg, 0x2D);
outw(pCir->PIOReg, 0x2E);
diff --git a/src/cir_driver.c b/src/cir_driver.c
index fce2fac..b18a7e8 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -5,7 +5,7 @@
* Support for the CL-GD7548: David Monniaux
*
* This is mainly a cut & paste from the MGA driver.
- * Original autors and contributors list include:
+ * Original authors and contributors list include:
* Radoslaw Kapitan, Andrew Vanderstock, Dirk Hohndel,
* David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
* Guy DESBIEF
diff --git a/src/lg_driver.c b/src/lg_driver.c
index f6d721a..0a4c3b5 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -132,7 +132,7 @@ static int pix24bpp = 0;
/*
* This contains the functions needed by the server after loading the
* driver module. It must be supplied, and gets added the driver list
- * by the Module Setup funtion in the dynamic case. In the static
+ * by the Module Setup function in the dynamic case. In the static
* case a reference to this is compiled in, and this requires that the
* name of this DriverRec be an upper-case version of the driver name.
*/
@@ -186,7 +186,7 @@ LgLineDataRec LgLineData[] = {
{20, 5120, 1},
{26, 6656, 1},
/*
- * Sentinal to indicate end of table.
+ * Sentinel to indicate end of table.
*/
{-1, -1, -1}
};
@@ -1444,7 +1444,7 @@ LgModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
/*
* The 5465's DTTC records _fetches_ per line, not tiles per
- * line. Fetchs are 128-byte fetches.
+ * line. Fetches are 128-byte fetches.
*/
if (pCir->chip.lg->ModeReg.DTTC & 0x0040) {
/*
diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c
index 4012db0..20ac38a 100644
--- a/src/lg_hwcurs.c
+++ b/src/lg_hwcurs.c
@@ -166,12 +166,12 @@ static void LgLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
LgSETMODE(HOST2SCR); /* Host-to-screen blit */
LgSETROP(0x00CC); /* Source copy */
- /* First, copy our transparent cursor image to the next 1/2 tile boundry */
+ /* First, copy our transparent cursor image to the next 1/2 tile boundary */
/* Destination */
LgSETMDSTXY(pLg->HWCursorImageX+pLg->HWCursorTileWidth, pLg->HWCursorImageY);
/* Set the source pitch. 0 means that, worst case, the source is
- alligned only on a byte boundry */
+ aligned only on a byte boundary */
LgSETMPHASE1(0);
LgSETMEXTENTSNOMONOQW(pLg->HWCursorTileWidth, pLg->HWCursorTileHeight);
@@ -191,7 +191,7 @@ static void LgLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
LgSETMDSTXY(pLg->HWCursorImageX, pLg->HWCursorImageY);
/* Set the source pitch. 0 means that, worst case, the source is
- alligned only on a byte boundry */
+ aligned only on a byte boundary */
LgSETMPHASE1(0);
/* Always copy an entire cursor image to the card. */
@@ -264,7 +264,7 @@ LgFindCursorTile(ScrnInfoPtr pScrn, int *x, int *y, int *width, int *height,
if (PCI_CHIP_GD5465 == pCir->Chipset) {
/* The Where's The Cursor formula changed for the 5465. It's really
- kinda wierd now. */
+ kinda weird now. */
unsigned long page, bank;
unsigned int nX, nY;
diff --git a/src/lg_xaa.c b/src/lg_xaa.c
index 5e6e72e..2bb836d 100644
--- a/src/lg_xaa.c
+++ b/src/lg_xaa.c
@@ -248,7 +248,7 @@ LgSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir,
/* We set the rop up here because the LgSETROP macro conveniently
(really -- it is convenient!) clears the transparency bits
- in DRAWDEF. We'll set those bits appropriatly later. */
+ in DRAWDEF. We'll set those bits appropriately later. */
LgSETROP(lgRop[rop]);
if (ydir < 0)
diff --git a/src/lg_xaa.h b/src/lg_xaa.h
index 162aa5d..cd8fc93 100644
--- a/src/lg_xaa.h
+++ b/src/lg_xaa.h
@@ -14,7 +14,7 @@
* of XFree86.
*/
-/* This header file defines the necessary structures, contstants, and
+/* This header file defines the necessary structures, constants, and
variables for using the bitBLT engine on a Laguna family graphics
accelerator. */