Code cleanups and elimination of some compiler warnings; patch courtesy of AL13N

CVS patchset: 7230
CVS date: 2004/12/12 06:55:58

4 files changed, 24 insertions, 7 deletions

diff --git a/src/video_out/vidix/drivers/cyberblade_vid.c b/src/video_out/vidix/drivers/cyberblade_vid.c
index b6d9a4ad8..0c2c6ef37 100644
--- a/src/video_out/vidix/drivers/cyberblade_vid.c
+++ b/src/video_out/vidix/drivers/cyberblade_vid.c
@@ -60,6 +60,7 @@ FILE *logfile=0;
 
 /* Helper functions for reading registers. */
 
+#if 0 /* unused */
 static int CRINW(int reg)
 {
 	int result;
@@ -67,6 +68,7 @@ static int CRINW(int reg)
 	result|=CRINB(reg+1)<<8;
 	return(result);
 }
+#endif
 
 static void CROUTW(int reg,int val)
 {
@@ -74,6 +76,7 @@ static void CROUTW(int reg,int val)
 	CROUTB(reg+1,(val>>8)&255);
 }
 
+#if 0 /* unused */
 static int SRINW(int reg)
 {
 	int result;
@@ -81,6 +84,7 @@ static int SRINW(int reg)
 	result|=SRINB(reg+1)<<8;
 	return(result);
 }
+#endif
 
 static void SROUTW(int reg,int val)
 {
@@ -88,6 +92,7 @@ static void SROUTW(int reg,int val)
 	SROUTB(reg+1,(val>>8)&255);
 }
 
+#if 0 /* unused */
 static void DumpRegisters(void)
 {
 #ifdef DEBUG_LOGFILE
@@ -109,6 +114,7 @@ static void DumpRegisters(void)
 	}
 #endif
 }
+#endif
 
 /* --- */
 
diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/src/video_out/vidix/drivers/mach64_vid.c
index 0f965234f..df1571bad 100644
--- a/src/video_out/vidix/drivers/mach64_vid.c
+++ b/src/video_out/vidix/drivers/mach64_vid.c
@@ -550,8 +550,11 @@ static void restore_regs( void )
 }
 
 static int forced_irq=INT_MAX;
+
+#ifdef MACH64_ENABLE_BM
 static int can_use_irq=0;
 static int irq_installed=0;
+
 static void init_irq(void)
 {
 	irq_installed=1;
@@ -568,6 +571,7 @@ static void init_irq(void)
 				 ,strerror(errno)
 				 ,pci_info.irq,pci_info.ipin,pci_info.gnt,pci_info.lat);
 }
+#endif
 
 int VIDIX_NAME(vixInit)(const char *args)
 {
diff --git a/src/video_out/vidix/drivers/sis_bridge.c b/src/video_out/vidix/drivers/sis_bridge.c
index 5e8701a4a..f6916ae87 100644
--- a/src/video_out/vidix/drivers/sis_bridge.c
+++ b/src/video_out/vidix/drivers/sis_bridge.c
@@ -31,6 +31,7 @@
 #include "sis_regs.h"
 #include "sis_defs.h"
 
+void sis_init_video_bridge(void);
 
 static void sis_ddc2_delay(unsigned short delaytime)
 {
@@ -71,7 +72,9 @@ static void sis_sense_30x()
     unsigned char testvga2_tempbl, testvga2_tempbh;
     unsigned char testvga2_tempcl, testvga2_tempch;
     int myflag, result = 0, i, j, haveresult;
+#if 0
     unsigned short temp;
+#endif
 
     inSISIDXREG(SISPART4, 0x0d, backupP4_0d);
     outSISIDXREG(SISPART4, 0x0d, (backupP4_0d | 0x04));
@@ -394,10 +397,14 @@ static void sis_detect_crt1()
     }
 }
 
-
+#if 0 /* not used yet */
 static void sis_detect_lcd()
 {
-    unsigned char CR32, CR36, CR37;
+    unsigned char CR32;
+#if 0
+    /* not supported yet? */
+    unsigned char CR36, CR37;
+#endif
 
     if (!(sis_vbflags & VB_VIDEOBRIDGE)) {
 	return;
@@ -412,7 +419,7 @@ static void sis_detect_lcd()
 
     /* Get other misc info about LCD - not supported */
 }
-
+#endif
 
 static void sis_detect_tv()
 {
@@ -715,7 +722,7 @@ void sis_init_video_bridge()
     sis_detect_video_bridge();
 
     sis_detect_crt1();
-    //sis_detect_lcd();
+    //sis_detect_lcd(); /* not fully ready probably */
     sis_detect_tv();
     sis_detect_crt2();
 
diff --git a/src/video_out/vidix/drivers/sis_vid.c b/src/video_out/vidix/drivers/sis_vid.c
index ba40f6b41..c3ef2bdcf 100644
--- a/src/video_out/vidix/drivers/sis_vid.c
+++ b/src/video_out/vidix/drivers/sis_vid.c
@@ -170,13 +170,13 @@ extern void sis_init_video_bridge();
 
 
 static void set_overlay(SISOverlayPtr pOverlay, int index);
-static void close_overlay();
+static void close_overlay(void);
 static void calc_scale_factor(SISOverlayPtr pOverlay,
 			      int index, int iscrt2);
 static void set_line_buf_size(SISOverlayPtr pOverlay);
 static void merge_line_buf(int enable);
 static void set_format(SISOverlayPtr pOverlay);
-static void set_colorkey();
+static void set_colorkey(void);
 
 static void set_brightness(uint8_t brightness);
 static void set_contrast(uint8_t contrast);
@@ -367,7 +367,7 @@ int vixInit(const char *args)
     inSISIDXREG(SISCR, 0x07, cr_data2);
     sis_screen_height =
 	((cr_data & 0xff) | ((uint16_t) (cr_data2 & 0x02) << 7) |
-	 ((uint16_t) (cr_data2 & 0x40) << 3) | ((uint16_t) (sr_data & 0x02)
+	 ((uint16_t) (cr_data2 & 0x40) << 3) | ((uint16_t) (cr_data & 0x02)
 						<< 9)) + 1;
 
     inSISIDXREG(SISSR, 0x0b, sr_data);