summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--src/regsmi.h4
-rw-r--r--src/smi.h2
-rw-r--r--src/smi_501.c2
-rw-r--r--src/smi_driver.c12
-rw-r--r--src/smi_output.c2
-rw-r--r--src/smi_video.c8
7 files changed, 16 insertions, 16 deletions
diff --git a/README.md b/README.md
index 9b1f44e..efa695e 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-siliconmotion
diff --git a/src/regsmi.h b/src/regsmi.h
index 5dd0320..f9dd7d5 100644
--- a/src/regsmi.h
+++ b/src/regsmi.h
@@ -193,7 +193,7 @@ VGAOUT8(SMIPtr pSmi, int port, CARD8 data)
mem_barrier(); \
if (IS_MSOC(pSmi)) { \
/* 20:20 2D Engine FIFO Status. This bit is read-only.
- * 0: FIFO not emtpy.
+ * 0: FIFO not empty.
* 1: FIFO empty.
*/ \
while (loop-- && \
@@ -318,7 +318,7 @@ VGAOUT8(SMIPtr pSmi, int port, CARD8 data)
(SMI501_MAX_CURSOR * SMI501_MAX_CURSOR * 2)
#endif
-/* HWCursor definitons for Panel AND CRT */
+/* HWCursor definitions for Panel AND CRT */
#define SMI501_MASK_HWCENABLE 0x80000000
#define SMI501_MASK_MAXBITS 0x000007FF
#define SMI501_MASK_BOUNDARY 0x00000800
diff --git a/src/smi.h b/src/smi.h
index 2742c8d..3e33b86 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -393,7 +393,7 @@ Bool SMI_MapMem(ScrnInfoPtr pScrn);
void SMI_UnmapMem(ScrnInfoPtr pScrn);
void SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL);
Bool SMI_SwitchMode(SWITCH_MODE_ARGS_DECL);
-void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO *colors, VisualPtr pVisual);
xf86MonPtr SMI_ddc1(ScrnInfoPtr pScrn);
void SMI_PrintRegs(ScrnInfoPtr pScrn);
diff --git a/src/smi_501.c b/src/smi_501.c
index a605e0d..225e7a6 100644
--- a/src/smi_501.c
+++ b/src/smi_501.c
@@ -58,7 +58,7 @@ static void SMI501_SetClock(SMIPtr pSmi, int32_t port,
/*
- * Implemementation
+ * Implementation
*/
void
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 8949cae..f2e5841 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -108,7 +108,7 @@ int gSMIEntityIndex = -1;
/*
* 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.
*/
@@ -950,7 +950,7 @@ SMI_EnterVT(VT_FUNC_ARGS_DECL)
"Done writing mode. Register dump:\n");
SMI_PrintRegs(pScrn);
- /* Reset the grapics engine */
+ /* Reset the graphics engine */
if (!pSmi->NoAccel)
SMI_EngineReset(pScrn);
@@ -1658,7 +1658,7 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
/*
* The next step is to setup the screen's visuals, and initialise the
- * framebuffer code. In cases where the framebuffer's default choises for
+ * framebuffer code. In cases where the framebuffer's default choices for
* things like visual layouts and bits per RGB are OK, this may be as simple
* as calling the framebuffer's ScreenInit() function. If not, the visuals
* will need to be setup before calling a fb ScreenInit() function and fixed
@@ -1930,7 +1930,7 @@ SMI_SwitchMode(SWITCH_MODE_ARGS_DECL)
}
void
-SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO *colors, VisualPtr pVisual)
{
xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(pScrn);
@@ -1945,7 +1945,7 @@ SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
SMICrtcPrivatePtr crtcPriv = SMICRTC(crtcConf->crtc[crtc_idx]);
for(i=0; i<numColors; i++){
- int idx = indicies[i];
+ int idx = indices[i];
if(idx<32){
for(j=0; j<8; j++){
@@ -1965,7 +1965,7 @@ SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
SMICrtcPrivatePtr crtcPriv = SMICRTC(crtcConf->crtc[crtc_idx]);
for(i = 0; i < numColors; i++) {
- int idx = indicies[i];
+ int idx = indices[i];
crtcPriv->lut_r[idx] = colors[idx].red << 8;
crtcPriv->lut_g[idx] = colors[idx].green << 8;
diff --git a/src/smi_output.c b/src/smi_output.c
index faf6a32..9098059 100644
--- a/src/smi_output.c
+++ b/src/smi_output.c
@@ -53,7 +53,7 @@ SMI_OutputModeValid(xf86OutputPtr output, DisplayModePtr mode)
/* FIXME May also need to test for IS_MSOC(pSmi) here.
* Only accept modes matching the panel size because the panel cannot
- * be centered neither shrinked/expanded due to hardware bugs.
+ * be centered neither shrunk/expanded due to hardware bugs.
* Note that as long as plane tr/br and plane window x/y are set to 0
* and the mode height matches the panel height, it will work and
* set the mode, but at offset 0, and properly program the crt.
diff --git a/src/smi_video.c b/src/smi_video.c
index 27df68d..5a506f0 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -852,7 +852,7 @@ SMI_SetupVideo(ScreenPtr pScreen)
ptrAdaptor->nEncodings = smiPortPtr->nenc;
ptrAdaptor->pEncodings = smiPortPtr->enc;
#if 0
- /* aaa whats this? */
+ /* aaa what's this? */
for (i = 0; i < nElems(SMI_VideoEncodings); i++)
{
SMI_VideoEncodings[i].width = pSmi->lcdWidth;
@@ -921,7 +921,7 @@ SMI_SetupVideo(ScreenPtr pScreen)
xvContrast = MAKE_ATOM(XV_CONTRAST_NAME);
xvInterlaced = MAKE_ATOM(XV_INTERLACED_NAME);
- DEBUG("SAA7111 intialized\n");
+ DEBUG("SAA7111 initialized\n");
} else {
xf86DestroyI2CDevRec(&(smiPortPtr->I2CDev),FALSE);
@@ -1109,7 +1109,7 @@ SMI_PutVideo(
/* cpr00:
Bit 0 = 1: Video Capture Enable = enabled
- Bit 8 = 0: Capture Control = continous
+ Bit 8 = 0: Capture Control = continuous
Bit 9 = 0: Double Buffer Enable = s. below
Bit 10 = 0: Interlace Data Capture = s. below
Bit 13..11 = 0: Frame Skip Enable = s. below
@@ -1216,7 +1216,7 @@ SMI_PutVideo(
DEBUG("xscale==%d yscale=%d width=%d height=%d\n",
xscale, yscale, width, height);
- /* aaa whats this ----------------------v ?
+ /* aaa what's this ----------------------v ?
vid_address = (pPort->area->box.y1 * fbPitch) + ((y1 >> 16) * vid_pitch);*/
vid_address = pPort->video_offset;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 18:41:57 +0000