Merge remote-tracking branch 'origin/master' into obsd

16 files changed, 40 insertions, 40 deletions

diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c
index 2cb1ed5..a03c754 100644
--- a/src/gfx/disp_gu1.c
+++ b/src/gfx/disp_gu1.c
@@ -789,11 +789,11 @@ gfx_set_display_offset(unsigned long offset)
     WRITE_REG32(DC_UNLOCK, DC_UNLOCK_VALUE);
 
     /* START ADDRESS EFFECTS DISPLAY COMPRESSION */
-    /* Disable compression for non-zero start addresss values.            */
-    /* Enable compression if offset is zero and comression is intended to */
-    /* be enabled from a previous call to "gfx_set_compression_enable".   */
-    /* Compression should be disabled BEFORE the offset is changed        */
-    /* and enabled AFTER the offset is changed.                           */
+    /* Disable compression for non-zero start address values.              */
+    /* Enable compression if offset is zero and compression is intended to */
+    /* be enabled from a previous call to "gfx_set_compression_enable".    */
+    /* Compression should be disabled BEFORE the offset is changed         */
+    /* and enabled AFTER the offset is changed.                            */
     if (offset == 0) {
         WRITE_REG32(DC_FB_ST_OFFSET, offset);
         if (gfx_compression_enabled) {
diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c
index f105cc1..1f0bbb6 100644
--- a/src/gfx/disp_gu2.c
+++ b/src/gfx/disp_gu2.c
@@ -613,11 +613,11 @@ gfx_set_display_offset(unsigned long offset)
     WRITE_REG32(MDC_UNLOCK, MDC_UNLOCK_VALUE);
 
     /* START ADDRESS EFFECTS DISPLAY COMPRESSION */
-    /* Disable compression for non-zero start addresss values.            */
-    /* Enable compression if offset is zero and comression is intended to */
-    /* be enabled from a previous call to "gfx_set_compression_enable".   */
-    /* Compression should be disabled BEFORE the offset is changed        */
-    /* and enabled AFTER the offset is changed.                           */
+    /* Disable compression for non-zero start address values.              */
+    /* Enable compression if offset is zero and compression is intended to */
+    /* be enabled from a previous call to "gfx_set_compression_enable".    */
+    /* Compression should be disabled BEFORE the offset is changed         */
+    /* and enabled AFTER the offset is changed.                            */
     if (offset == 0) {
         WRITE_REG32(MDC_FB_ST_OFFSET, offset);
         if (gfx_compression_enabled) {
@@ -1100,7 +1100,7 @@ int
 gfx_set_compression_enable(int enable)
 #endif
 {
-    /* SET GLOBAL VARIABLE FOR INDENDED STATE */
+    /* SET GLOBAL VARIABLE FOR INTENDED STATE */
     /* Compression can only be enabled for non-zero start address values. */
     /* Keep state to enable compression on start address changes. */
 
diff --git a/src/gfx/gfx_disp.c b/src/gfx/gfx_disp.c
index 62238b2..5124d76 100644
--- a/src/gfx/gfx_disp.c
+++ b/src/gfx/gfx_disp.c
@@ -1802,7 +1802,7 @@ gfx_get_frame_buffer_line_size(void)
 
 /*---------------------------------------------------------------------------
  * gfx_get_display_mode
- * get the curent mode set,
+ * get the current mode set,
  * return the supported mode on success, -1 on fail
  *---------------------------------------------------------------------------
  */
@@ -1824,7 +1824,7 @@ gfx_get_display_mode(int *xres, int *yres, int *bpp, int *hz)
 
 /*---------------------------------------------------------------------------
  * gfx_get_display_details
- * given the mode get's the resoultion details, width, height, freq
+ * given the mode gets the resolution details, width, height, freq
  *---------------------------------------------------------------------------
  */
 int
diff --git a/src/gfx/gfx_init.c b/src/gfx/gfx_init.c
index 648d9cb..597eccf 100644
--- a/src/gfx/gfx_init.c
+++ b/src/gfx/gfx_init.c
@@ -149,7 +149,7 @@ gfx_detect_chip(void)
 /*----------------------------------------------------------------------------
  * gfx_detect_cpu
  * 
- * This routine returns the type and revison of the CPU.  If a Geode 
+ * This routine returns the type and revision of the CPU.  If a Geode
  * processor is not present, the routine returns zero.
  *
  * The return value is as follows:
diff --git a/src/gfx/gfx_priv.h b/src/gfx/gfx_priv.h
index 6a2218e..4f63f62 100644
--- a/src/gfx/gfx_priv.h
+++ b/src/gfx/gfx_priv.h
@@ -1011,7 +1011,7 @@ int fs450_set_color(int color);
 int fs450_get_brightness(int *p_brightness);
 int fs450_set_brightness(int brightness);
 int fs450_get_contrast(int *p_contrast);
-int fs450_set_contrast(int constrast);
+int fs450_set_contrast(int contrast);
 int fs450_get_yc_filter(unsigned int *p_yc_filter);
 int fs450_set_yc_filter(unsigned int yc_filter);
 int fs450_get_aps_trigger_bits(unsigned int *p_trigger_bits);
diff --git a/src/gfx/gfx_rtns.h b/src/gfx/gfx_rtns.h
index bfcfe9f..2087f21 100644
--- a/src/gfx/gfx_rtns.h
+++ b/src/gfx/gfx_rtns.h
@@ -63,7 +63,7 @@ extern "C" {
     extern unsigned char *gfx_phys_spptr;
     extern unsigned char *gfx_phys_gpptr;
 
-/* DURANGO VARIBLES FOR RUNTIME SELECTION AND POSSIBLE VALUES */
+/* DURANGO VARIABLES FOR RUNTIME SELECTION AND POSSIBLE VALUES */
 
     extern int gfx_display_type;
 #define GFX_DISPLAY_TYPE_GU1		0x0001
@@ -603,7 +603,7 @@ extern "C" {
     int gfx_get_brightness(int *p_brightness);
     int gfx_set_brightness(int brightness);
     int gfx_get_contrast(int *p_contrast);
-    int gfx_set_contrast(int constrast);
+    int gfx_set_contrast(int contrast);
     int gfx_get_yc_filter(unsigned int *p_yc_filter);
     int gfx_set_yc_filter(unsigned int yc_filter);
     int gfx_get_aps_trigger_bits(unsigned int *p_trigger_bits);
diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c
index 15f0048..0dd7847 100644
--- a/src/gfx/gfx_vid.c
+++ b/src/gfx/gfx_vid.c
@@ -159,7 +159,7 @@ int gfx_set_screen_enable(int enable);  /* forward declaration
 #include "vid_1200.c"
 #endif
 
-/* INLUDE SUPPORT FOR REDCLOUD, IF SPECIFIED. */
+/* INCLUDE SUPPORT FOR REDCLOUD, IF SPECIFIED. */
 
 #if GFX_VIDEO_REDCLOUD
 #include "vid_rdcl.c"
diff --git a/src/gfx/msr_rdcl.c b/src/gfx/msr_rdcl.c
index 2f85e6a..1a01be7 100644
--- a/src/gfx/msr_rdcl.c
+++ b/src/gfx/msr_rdcl.c
@@ -437,8 +437,8 @@ redcloud_find_msr_device(MSR * pDev)
 /*--------------------------------------------------------------------
  * gfx_id_msr_device 
  *
- *	This routine handles reading the capabilities MSR register (typically 
- *	0x2000) and checking if the 'id' field matchs  pDev.Id.  This routine is
+ *  This routine handles reading the capabilities MSR register (typically
+ *  0x2000) and checking if the 'id' field matches pDev.Id.  This routine is
  *  used by applications/drivers that need to extend the list of known
  *  MBUS devices beyond those known by Durango.
  *
diff --git a/src/gfx/release.txt b/src/gfx/release.txt
index 805b847..25f6803 100644
--- a/src/gfx/release.txt
+++ b/src/gfx/release.txt
@@ -333,7 +333,7 @@ FUNCTIONAL CHANGES
 * Added support for 1152x864 desktop resolution on a flat panel.
 * Added 24BPP support for large display modes.
 * Modified gfx_set_video_scale such that an identity scale is now default.
-* Modifed flat panel modeset code to dynamically determine the size of the mode table.
+* Modified flat panel modeset code to dynamically determine the size of the mode table.
 * Added support for Carmel Rev D2.
 
 =============================================================================
@@ -462,7 +462,7 @@ FUNCTIONAL CHANGES
 * Added functions gfx_enable_softvga, dfx_disable_softvga. 
 * Added code optimization in rendering loops to use 32 bit writes where possible.
 * Added gfx_is_mode_supported to query if given mode supported by the h/w.
-* Added Flat panel support, realy testing with panel done only for 800x600.
+* Added Flat panel support, really testing with panel done only for 800x600.
 * Removed subtraction of 16 from gfx_set_compression_size.
 * Added version.h file to reflect the version of the durango used. 
 
@@ -475,7 +475,7 @@ FUNCTIONAL CHANGES
 -----------------------------------------------------------------------------
 * Verified Xfree86 driver version 1.1 under FreeBSD and Linux.
 * Added automatic detection of BLT buffer bases in "gfx_set_bpp" routine.
-* Fixed improper setting of VGA attrubute controller index register.
+* Fixed improper setting of VGA attribute controller index register.
 * Moved "gfx_get_display_bpp" to always be included.
 * Moved "gfx_get_hactive" and "gfx_get_vactive" to always be included.
 * Clipped video source size if off bottom or right side.
@@ -503,7 +503,7 @@ FUNCTIONAL CHANGES
 -----------------------------------------------------------------------------
 * Verified display modes and graphics rendering on SC1200.
 * Updated PLL table for SC1200 to set modes.
-* DURANGO.C FILE CHANGE!: Modifed and added compiler definitions.
+* DURANGO.C FILE CHANGE!: Modified and added compiler definitions.
 * Split gfx_disp.c file into gu1_disp.c and gu2_disp.c
 * Split gfx_rndr.c file into gu1_rndr.c and gu2_rndr.c
 * Split gfx_vid.c file into vid_5530.c, vid_1400.c, and vid_1200.c
@@ -567,7 +567,7 @@ FUNCTIONAL CHANGES
 -----------------------------------------------------------------------------
 FUNCTIONAL CHANGES
 -----------------------------------------------------------------------------
-* Added video port, video decoder, I2C, and hardware query rouines.
+* Added video port, video decoder, I2C, and hardware query routines.
 * New files: gfx_vip.c, gfx_dcdr.c, gfx_i2c.c, gfx_read.c.
 
 =============================================================================
@@ -581,7 +581,7 @@ FUNCTIONAL CHANGES
 * Added "gfx_get_vid_register_base" and "gfx_get_vip_register_base".
 * Added initial PLL table for SC1400.
 * Verified mode set and video overlay routines work correctly on SC1400.
-* Updated initilization routines.
+* Updated initialization routines.
 * Added update of graphics engine in "gfx_set_display_pitch".
 
 =============================================================================
diff --git a/src/gfx/rndr_gu1.c b/src/gfx/rndr_gu1.c
index 57fe9b1..6c16c93 100644
--- a/src/gfx/rndr_gu1.c
+++ b/src/gfx/rndr_gu1.c
@@ -407,7 +407,7 @@ gfx_set_raster_operation(unsigned char rop)
     GFXsavedRop = rop16;
 
     /* SET FLAG INDICATING ROP REQUIRES DESTINATION DATA */
-    /* True if even bits (0:2:4:6) do not equal the correspinding */
+    /* True if even bits (0:2:4:6) do not equal the corresponding */
     /* even bits (1:3:5:7). */
 
     GFXusesDstData = ((rop & 0x55) ^ ((rop >> 1) & 0x55));
diff --git a/src/gfx/rndr_gu2.c b/src/gfx/rndr_gu2.c
index a8126fb..ed327b3 100644
--- a/src/gfx/rndr_gu2.c
+++ b/src/gfx/rndr_gu2.c
@@ -137,7 +137,7 @@ gfx_set_bpp(unsigned short bpp)
 {
     GFXbpp = bpp;
 
-    /* COVERT TO BPP/FORMAT VALUE */
+    /* CONVERT TO BPP/FORMAT VALUE */
     /* Save in global to combine with ROP later. */
     /* Could write register here and then use byte access for */
     /* the ROP, but would need to set other 24 bits to make */
diff --git a/src/gfx/tv_fs450.c b/src/gfx/tv_fs450.c
index 24e7446..99194b2 100644
--- a/src/gfx/tv_fs450.c
+++ b/src/gfx/tv_fs450.c
@@ -78,8 +78,8 @@ const S_SET_DESCRIP *gcc_regs(void);
 #define	HOUSTON_IHO				0x00    /* Input Horizontal Offset                      */
 #define	HOUSTON_IVO				0x02    /* Input Vertical Offset                        */
 #define	HOUSTON_IHA				0x04    /* Input Horizontal Active Width        */
-#define	HOUSTON_VSC				0x06    /* Vertical Scaling Coeficient          */
-#define	HOUSTON_HSC				0x08    /* Horizontal Scaling Coeficient        */
+#define	HOUSTON_VSC				0x06    /* Vertical Scaling Coefficient          */
+#define	HOUSTON_HSC				0x08    /* Horizontal Scaling Coefficient        */
 #define	HOUSTON_BYP				0x0A    /* Bypass Register                                      */
 #define	HOUSTON_CR				0x0C    /* Control Register                             */
 #define	HOUSTON_SP				0x0E    /* Status                                                       */
@@ -1027,7 +1027,7 @@ gfx_set_tv_enable(int on)
 
     /*if turning off... */
     if (!on) {
-        /*reenable vga. */
+        /*re-enable vga. */
         PLAL_EnableVga();
 
         /*power down houston */
@@ -1477,13 +1477,13 @@ gfx_get_contrast(int *p_contrast)
 
 #if GFX_TV_DYNAMIC
 int
-fs450_set_contrast(int constrast)
+fs450_set_contrast(int contrast)
 #else
 int
-gfx_set_contrast(int constrast)
+gfx_set_contrast(int contrast)
 #endif
 {
-    d.contrast = range_limit(constrast, 0, 100);
+    d.contrast = range_limit(contrast, 0, 100);
 
     return write_config(REQ_BRIGHTNESS_CONTRAST);
 }
@@ -3239,7 +3239,7 @@ PLAL_SetTVTimingRegisters(const S_TIMING_SPECS * p_specs)
     reg = ((p_specs->v_sync - 1) << 16) | (p_specs->v_sync - 2);
     WriteGx(DC_FP_V_TIMING, reg);
 
-    /*timing config, reenable all dclk stuff. */
+    /*timing config, re-enable all dclk stuff. */
     reg = ReadGx(DC_TIMING_CFG);
     reg |= GX_TGEN;
     WriteGx(DC_TIMING_CFG, reg);
diff --git a/src/gfx/tv_fs450.h b/src/gfx/tv_fs450.h
index 4da7a21..1d01cff 100644
--- a/src/gfx/tv_fs450.h
+++ b/src/gfx/tv_fs450.h
@@ -131,7 +131,7 @@ extern "C" {
     /* brightness is a percentage, 0 to 100 */
 
     int FS450_get_contrast(int *p_contrast);
-    int FS450_set_contrast(int constrast);
+    int FS450_set_contrast(int contrast);
     /* contrast is a percentage, 0 to 100 */
 
 /*==========================================================================*/
diff --git a/src/gfx/vid_1200.c b/src/gfx/vid_1200.c
index abc1b54..3e6c023 100644
--- a/src/gfx/vid_1200.c
+++ b/src/gfx/vid_1200.c
@@ -1044,7 +1044,7 @@ gfx_set_video_palette_entry(unsigned long index, unsigned long palette)
 /*---------------------------------------------------------------------------
  * gfx_set_video_palette_bypass
  * 
- * This routine enables/disables the pallete RAM bypass.
+ * This routine enables/disables the palette RAM bypass.
  *---------------------------------------------------------------------------
  */
 #if GFX_VIDEO_DYNAMIC
@@ -2045,7 +2045,7 @@ gfx_get_video_src_size(void)
 
     if (width) {
         /* DETERMINE HEIGHT BY DIVIDING TOTAL SIZE BY WIDTH */
-        /* Get total size from display controller - abtracted. */
+        /* Get total size from display controller - abstracted. */
 
         height = gfx_get_display_video_size() / (width << 1);
     }
diff --git a/src/gfx/vid_5530.c b/src/gfx/vid_5530.c
index f524300..8442dfb 100644
--- a/src/gfx/vid_5530.c
+++ b/src/gfx/vid_5530.c
@@ -1086,7 +1086,7 @@ gfx_get_video_src_size(void)
 
     if (width) {
         /* DETERMINE HEIGHT BY DIVIDING TOTAL SIZE BY WIDTH */
-        /* Get total size from display controller - abtracted. */
+        /* Get total size from display controller - abstracted. */
 
         height = gfx_get_display_video_size() / (width << 1);
     }
diff --git a/src/gfx/vid_rdcl.c b/src/gfx/vid_rdcl.c
index 3ccc57a..72f45d4 100644
--- a/src/gfx/vid_rdcl.c
+++ b/src/gfx/vid_rdcl.c
@@ -1251,7 +1251,7 @@ gfx_set_video_palette_entry(unsigned long index, unsigned long palette)
 /*---------------------------------------------------------------------------
  * gfx_set_video_palette_bypass
  * 
- * This routine enables/disables the pallete RAM bypass.
+ * This routine enables/disables the palette RAM bypass.
  *---------------------------------------------------------------------------
  */
 #if GFX_VIDEO_DYNAMIC