summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mga.h4
-rw-r--r--src/mga_bios.c4
-rw-r--r--src/mga_dac3026.c2
-rw-r--r--src/mga_dacG.c2
-rw-r--r--src/mga_dh.c2
-rw-r--r--src/mga_dri.c2
-rw-r--r--src/mga_driver.c14
-rw-r--r--src/mga_exa.c2
-rw-r--r--src/mga_merge.c16
-rw-r--r--src/mga_sarea.h2
-rw-r--r--src/mga_vga.c4
-rw-r--r--src/mgareg_flags.h4
12 files changed, 29 insertions, 29 deletions
diff --git a/src/mga.h b/src/mga.h
index 1a7cb47..52a4eae 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -387,7 +387,7 @@ typedef enum {
} mga_host_t;
/**
- * Card information derrived from BIOS PInS data.
+ * Card information derived from BIOS PInS data.
*/
struct mga_bios_values {
/**
@@ -430,7 +430,7 @@ struct mga_bios_values {
/**
- * Attributes that of an MGA device that can be derrived purely from its
+ * Attributes that of an MGA device that can be derived purely from its
* PCI ID.
*/
struct mga_device_attributes {
diff --git a/src/mga_bios.c b/src/mga_bios.c
index f4198d0..e5aa45c 100644
--- a/src/mga_bios.c
+++ b/src/mga_bios.c
@@ -94,7 +94,7 @@ static __inline__ CARD32 get_u32( const CARD8 * data )
/**
* Parse version 0x01XX of the BIOS PInS structure.
*
- * Version 0x01XX of the BIOS PInS structure is only found in Millenium cards.
+ * Version 0x01XX of the BIOS PInS structure is only found in Millennium cards.
*
* \todo
* There used to be an "OverclockMem" option that would scale the memory clock
@@ -140,7 +140,7 @@ static void mga_parse_bios_ver_1( struct mga_bios_values * bios,
/**
* Parse version 0x02XX of the BIOS PInS structure.
*
- * Version 0x02XX of the BIOS PInS structure is only found in Millenium II
+ * Version 0x02XX of the BIOS PInS structure is only found in Millennium II
* and Mystique cards.
*/
static void mga_parse_bios_ver_2( struct mga_bios_values * bios,
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c
index 09fb548..085c772 100644
--- a/src/mga_dac3026.c
+++ b/src/mga_dac3026.c
@@ -679,7 +679,7 @@ MGA3026Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
pReg->Option &= ~0x1000;
/* must always have the pci retries on but rely on
- polling to keep them from occuring */
+ polling to keep them from occurring */
pReg->Option &= ~0x20000000;
pVga->MiscOutReg |= 0x0C;
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index 4e24595..f9858ca 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -1324,7 +1324,7 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
MGA_NOT_HAL(
/* must always have the pci retries on but rely on
- polling to keep them from occuring */
+ polling to keep them from occurring */
pReg->Option &= ~0x20000000;
switch(pLayout->bitsPerPixel)
diff --git a/src/mga_dh.c b/src/mga_dh.c
index 2b597b5..c0d7970 100644
--- a/src/mga_dh.c
+++ b/src/mga_dh.c
@@ -229,7 +229,7 @@ void MGAEnableSecondOutPut(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
/*--- Disable Pixel clock oscillations On Crtc1 */
OUTREG( MGAREG_C2CTL, ulC2CTL | MGAREG_C2CTL_PIXCLKDIS_MASK);
- /*--- Have to wait minimum time (2 acces will be ok) */
+ /*--- Have to wait minimum time (2 access will be ok) */
(void) INREG( MGAREG_Status);
(void) INREG( MGAREG_Status);
diff --git a/src/mga_dri.c b/src/mga_dri.c
index 6867d8f..3070b60 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -216,7 +216,7 @@ static void MGASwapContextShared( ScreenPtr pScreen )
* This is really only called from validate/postvalidate as we
* override the dri lock/unlock. Want to remove validate/postvalidate
* processing, but need to remove all client-side use of drawable lock
- * first (otherwise there is noone recover when a client dies holding
+ * first (otherwise there is no one recover when a client dies holding
* the drawable lock).
*
* What does this mean?
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 94183db..f4b8f12 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -535,7 +535,7 @@ static PciChipsets MGAPciChipsets[] = {
/*
* 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 case a
+ * 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.
*/
@@ -755,7 +755,7 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
/*
* For cards that can do dual head per entity, mark the entity
- * as sharable.
+ * as shareable.
*/
if (pMga->chip_attribs->dual_head_possible) {
MGAEntPtr pMgaEnt = NULL;
@@ -894,7 +894,7 @@ MGAProbe(DriverPtr drv, int flags)
/*
* For cards that can do dual head per entity, mark the entity
- * as sharable.
+ * as shareable.
*/
pEnt = xf86GetEntityInfo(usedChips[i]);
@@ -1672,7 +1672,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->AdjustFrame = MGAAdjustFrameCrtc2;
/*
* Fail initialization of second head if we are in MergeFB mode,
- * since we do it ourselfs.
+ * since we do it ourselves.
*/
if(pMgaEnt->pScrn_1 && MGAPTR(pMgaEnt->pScrn_1)->MergedFB) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -2950,13 +2950,13 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
/*
This function optimize the Priority Request control
Higher HiPriLvl will reduce drawing performance
- We need to give enough bandwith to crtc to avoid visual artifact
+ We need to give enough bandwidth to crtc to avoid visual artifact
*/
if (pMga->is_G200SE)
{
if (pMga->reg_1e24 >= 0x02)
{
- /* Calulate CRTC Priority value */
+ /* Calculate CRTC Priority value */
CARD8 ucHiPriLvl;
CARD32 ulBitsPerPixel;
CARD32 ulMemoryBandwidth;
@@ -3050,7 +3050,7 @@ void MGARestoreSecondCrtc(ScrnInfoPtr pScrn)
/* Do this branch if
* SecondOutput
* and not Unshared Primary
- * and not Merged Mode (usualy means Unshared Primary)
+ * and not Merged Mode (usually means Unshared Primary)
*/
CARD8 ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL);
diff --git a/src/mga_exa.c b/src/mga_exa.c
index 03c5229..64d1e27 100644
--- a/src/mga_exa.c
+++ b/src/mga_exa.c
@@ -13,7 +13,7 @@
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
diff --git a/src/mga_merge.c b/src/mga_merge.c
index 64c85b4..3f85865 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -37,7 +37,7 @@ StrToRanges(range* r, const char* s) {
break;
case '-':
case ' ': case 0:
- if(strnum == NULL) break; /*is extra seperator */
+ if(strnum == NULL) break; /*is extra separator */
if(strnum != NULL) sscanf(strnum,"%f",&num);
if(gotdash) /*if wasn't singlet: correct. */
r[rangenum-1].hi = num;
@@ -59,7 +59,7 @@ StrToRanges(range* r, const char* s) {
}
-/* Copys mode i, links the result to dest, and returns it.
+/* Copies mode i, links the result to dest, and returns it.
* Links i and j in Private record.
* if dest is NULL, return value is copy of i linked to itself.
*/
@@ -190,7 +190,7 @@ GenerateModeList(ScrnInfoPtr pScrn, const char* str,
strmode = str+1; /* number starts on next char */
gotdash |= (*str == '-' || *str == ',');
- if(*str != 0) break; /* if end of string, we wont get a chance to catch a char and run the
+ if(*str != 0) break; /* if end of string, we won't get a chance to catch a char and run the
default case. do it now */
default:
@@ -220,7 +220,7 @@ GenerateModeList(ScrnInfoPtr pScrn, const char* str,
}
-/* second CRTC init funcitons. Used to check monitor timings and refreshes.
+/* second CRTC init functions. Used to check monitor timings and refreshes.
* this function looses lots of maintainability points due to redundancy,
* but it still was the cleanest and least-intrusive way I found. */
@@ -257,7 +257,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
pMga->device = pMga1->device;
if (flags & PROBE_DETECT) {
- MGAProbeDDC(pScrn, pMga->pEnt->index); /*FIXME make shure this probes second monitor */
+ MGAProbeDDC(pScrn, pMga->pEnt->index); /*FIXME make sure this probes second monitor */
return TRUE;
}
@@ -703,8 +703,8 @@ MGAMergePointerMoved(SCRN_ARG_TYPE arg, int x, int y)
out.y1 = pScrn->frameY1+1;
/*
- * specify inner sliding window. beeing outsize both frames, and inside
- * the outer cliping window, causes corresponding frame to slide
+ * specify inner sliding window. being outsize both frames, and inside
+ * the outer clipping window, causes corresponding frame to slide
*/
in1 = out;
in2 = out;
@@ -849,7 +849,7 @@ MGAAdjustMergeFrames(ADJUST_FRAME_ARGS_DECL) {
BOUND(pScrn2->frameY0,y,y + VMax - MDMPTR(pScrn1)->Monitor2->VDisplay);
break;
}
- /* sanity checks. Make shure were not out of bounds */
+ /* sanity checks. Make sure were not out of bounds */
BOUND(pMga->M1frameX0,0,pScrn1->virtualX -MDMPTR(pScrn1)->Monitor1->HDisplay);
BOUND(pMga->M1frameY0,0,pScrn1->virtualY -MDMPTR(pScrn1)->Monitor1->VDisplay);
BOUND(pScrn2->frameX0,0,pScrn2->virtualX -MDMPTR(pScrn1)->Monitor2->HDisplay);
diff --git a/src/mga_sarea.h b/src/mga_sarea.h
index 16fc9ce..b07db11 100644
--- a/src/mga_sarea.h
+++ b/src/mga_sarea.h
@@ -95,7 +95,7 @@
*/
#define MGA_NR_SAREA_CLIPRECTS 8
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
* regions, subject to a minimum region size of (1<<16) == 64k.
*
* Clients may subdivide regions internally, but when sharing between
diff --git a/src/mga_vga.c b/src/mga_vga.c
index 8f52951..b187b70 100644
--- a/src/mga_vga.c
+++ b/src/mga_vga.c
@@ -360,14 +360,14 @@ MGAG200SEHWProtect(ScrnInfoPtr pScrn, Bool on)
hwp->enablePalette(hwp);
} else {
/*
- * Reenable sequencer, then turn on screen.
+ * Re-enable sequencer, then turn on screen.
*/
tmp = hwp->readSeq(hwp, 0x01);
MGAWAITVSYNC();
MGAWAITBUSY();
- hwp->writeSeq(hwp, 0x01, tmp & ~0x20); /* reenable display */
+ hwp->writeSeq(hwp, 0x01, tmp & ~0x20); /* re-enable display */
usleep(20000);
vgaHWSeqReset(hwp, FALSE); /* clear synchronousreset */
diff --git a/src/mgareg_flags.h b/src/mgareg_flags.h
index 548af86..3811eb0 100644
--- a/src/mgareg_flags.h
+++ b/src/mgareg_flags.h
@@ -23,7 +23,7 @@
#ifndef _MGAREGS_H_
#define _MGAREGS_H_
-/*************** (START) AUTOMATICLY GENERATED REGISTER FILE *****************/
+/*************** (START) AUTOMATICALLY GENERATED REGISTER FILE ***************/
/*
* Generated on Sat Nov 20 21:25:36 CST 1999
*/
@@ -924,7 +924,7 @@
-/**************** (END) AUTOMATICLY GENERATED REGISTER FILE ******************/
+/**************** (END) AUTOMATICALLY GENERATED REGISTER FILE ****************/
#endif /* _MGAREGS_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 00:46:53 +0000