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

5 files changed, 1 insertions, 23 deletions

diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c
index a03c754..fa081eb 100644
--- a/src/gfx/disp_gu1.c
+++ b/src/gfx/disp_gu1.c
@@ -25,9 +25,6 @@
 
 void gu1_enable_compression(void);      /* private routine definition */
 void gu1_disable_compression(void);     /* private routine definition */
-void gfx_reset_video(void);     /* private routine definition */
-int gfx_set_display_control(int sync_polarities);       /* private routine
-                                                         * definition */
 int gu1_set_specified_mode(DISPLAYMODE * pMode, int bpp);
 
 /* VIDEO BUFFER SIZE */
diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c
index 1f0bbb6..8bd89e9 100644
--- a/src/gfx/disp_gu2.c
+++ b/src/gfx/disp_gu2.c
@@ -29,9 +29,6 @@
 
 void gu2_enable_compression(void);      /* private routine definition */
 void gu2_disable_compression(void);     /* private routine definition */
-int gfx_set_display_control(int sync_polarities);       /* private routine
-                                                         * definition */
-void gfx_reset_video(void);
 int gu2_set_specified_mode(DISPLAYMODE * pMode, int bpp);
 
  /*---------------------------------------------------------------------------
@@ -1260,13 +1257,12 @@ void
 gfx_set_display_video_enable(int enable)
 #endif
 {
-    unsigned long lock, gcfg, dcfg;
+    unsigned long lock, gcfg;
 
     /* READ CURRENT VALUES */
 
     lock = READ_REG32(MDC_UNLOCK);
     gcfg = READ_REG32(MDC_GENERAL_CFG);
-    dcfg = READ_REG32(MDC_DISPLAY_CFG);
 
     /* SET OR CLEAR VIDEO ENABLE IN GENERAL_CFG */
 
diff --git a/src/gfx/gfx_priv.h b/src/gfx/gfx_priv.h
index 4f63f62..7b255a5 100644
--- a/src/gfx/gfx_priv.h
+++ b/src/gfx/gfx_priv.h
@@ -77,12 +77,6 @@ unsigned long gu2_get_vip_register_base(void);
 
 #if GFX_MSR_REDCLOUD
 
-/* PRIVATE ROUTINES */
-
-void redcloud_build_mbus_tree(void);
-int redcloud_init_msr_devices(MSR aDev[], unsigned int array_size);
-DEV_STATUS redcloud_find_msr_device(MSR * pDev);
-
 /* DYNAMIC ROUTINES */
 
 #if GFX_MSR_DYNAMIC
@@ -240,11 +234,6 @@ int gfx_get_display_video_downscale_enable(void);
 
 #if GFX_DISPLAY_GU2
 
-/* PRIVATE ROUTINES */
-
-void gu2_enable_compression(void);
-void gu2_disable_compression(void);
-
 /* DYNAMIC ROUTINES */
 
 #if GFX_DISPLAY_DYNAMIC
diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c
index 0dd7847..c4215e8 100644
--- a/src/gfx/gfx_vid.c
+++ b/src/gfx/gfx_vid.c
@@ -145,8 +145,6 @@ unsigned short gfx_vid_height = 0;      /* copy from last gfx_set_video_window
 
 int gfx_alpha_select = 0;       /* currently selected alpha region          */
 
-int gfx_set_screen_enable(int enable);  /* forward declaration                           */
-
 /* INCLUDE SUPPORT FOR CS5530, IF SPECIFIED. */
 
 #if GFX_VIDEO_CS5530
diff --git a/src/gfx/vid_rdcl.c b/src/gfx/vid_rdcl.c
index 72f45d4..34a4659 100644
--- a/src/gfx/vid_rdcl.c
+++ b/src/gfx/vid_rdcl.c
@@ -256,14 +256,12 @@ gfx_set_clock_frequency(unsigned long frequency)
     Q_WORD msr_value, sys_value;
     unsigned long sys_low;
     unsigned int i, index = 0;
-    unsigned long value;
     long timeout = 1000;
     long min, diff;
 
     /* FIND THE REGISTER VALUES FOR THE DESIRED FREQUENCY */
     /* Search the table for the closest frequency (16.16 format). */
 
-    value = RCDF_PLLtable[0].pll_value;
     min = (long) RCDF_PLLtable[0].frequency - frequency;
     if (min < 0L)
         min = -min;